Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add premade mercenery loadouts take 2 #1421

Closed
wants to merge 27 commits into from
Closed

Add premade mercenery loadouts take 2 #1421

wants to merge 27 commits into from

Conversation

Tryded
Copy link
Contributor

@Tryded Tryded commented Jun 21, 2024

About the PR

merc PR 2.0, the old one got nuked

Why / Balance

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

Tryded and others added 26 commits May 25, 2024 21:54
@Tryded
Merc Backpack Startergear
31a06cf
@Tryded
everything else
6f40ebc
@Tryded
Add roles
eb65a28
@Tryded
Add IDs
eac6f2d
@Tryded
Merc Hardsuit + EVA
e3711d0
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
cc028c3
@Tryded
Add Mercenary playtime
519da9e
@Tryded
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
5e9bd80 
…ryded/Delta-v-rebase into add-premade-mercenery-loadouts
@Tryded
Update identification_cards.yml
3009b53
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
4519b7a
@Tryded
fix Ids and remove playtime tracker for mercs
ac1c1da
@Tryded
forgor
c65ecdb
@Tryded
capital
aa52ab1
@Tryded
forgor sprite
30dc710
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
e62c507
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
3a37f05
@Tryded @Colin-Tel
Update Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGea…
dd5b38e 
…r/backpack.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Tryded <[email protected]>
@Tryded @Colin-Tel
Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/identificati…
bbd0503 
…on_cards.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Tryded <[email protected]>
@Tryded @Colin-Tel
Update Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helme…
546e0d7 
…ts.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Tryded <[email protected]>
@Tryded @Colin-Tel
Update Resources/Prototypes/DeltaV/Roles/Jobs/Fun/merc_startinggear.yml
3a58b8f 
Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Tryded <[email protected]>
@Tryded @Colin-Tel
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hards…
6671cdc 
…uits.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Tryded <[email protected]>
@Tryded
Delete Unused FTL
8dd203e
@Tryded
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
fc4bf12 
…ryded/Delta-v-rebase into add-premade-mercenery-loadouts
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
da93fe4
@Tryded
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
4b24f63 
…ryded/Delta-v-rebase into add-premade-mercenery-loadouts
@Tryded
Merge branch 'master' into add-premade-mercenery-loadouts
b3aac07
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Jun 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: YML Changes any yml files and removed S: Merge Conflict Fix your PR! labels Jun 21, 2024
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Jun 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 21, 2024 •
edited
Loading

RSI Diff Bot; head commit a46413f merging into 8b50f33
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vulpkanin Added
off-equipped-HELMET Added
off-inhand-left Added
off-inhand-right Added
on-equipped-HELMET-vulpkanin Added
on-equipped-HELMET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after a46413f

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Aug 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

ghost
ghost suggested changes Aug 27, 2024
View reviewed changes
Copy link

@ghost ghost left a comment •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

job-name-courier and job-description-courier already exist in the .ftl files since master was merged, also you have conflicts.

@TadJohnson00
Copy link
Contributor

Is this PR still being actively worked on or is it abandoned @Tryded ?

@TadJohnson00
Copy link
Contributor

Gonna assume this is abandonware then

LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 11, 2025
@sapphirescript @sleepyyapril
Add Marking Localization Test (DeltaV-Station#1421)
c6f5309 
# Description

Actual localization strings added in different PR.

---

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/cca4ae17-f75b-4c1a-8137-564a410e4563)

</p>
</details>

---

Co-authored-by: sleepyyapril <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Merge Conflict Fix your PR!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Tryded @TadJohnson00