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

Loadouts #1122

Merged
merged 60 commits into from
May 15, 2024
Merged

Loadouts #1122

merged 60 commits into from
May 15, 2024

Conversation

NullWanderer
Copy link
Contributor

@NullWanderer NullWanderer commented Apr 22, 2024 •
edited
Loading

About the PR

Existing loadouts reviewed:

  • TODO

Additonal changes

  • Split mail carrier and courier
  • Removed useless remaining senior role prototypes

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

metalgearsloth and others added 28 commits April 22, 2024 03:28
@metalgearsloth @NullWanderer
Partial cherry-pick: Loadouts redux (#25715)
d49eabc 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Role prototypes
ec146b6 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Loadout prototypes
c3e31ea 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Swap loneop loadout
ed30034 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Fix TryRequirementMet call
be421b3 
Signed-off-by: NullWanderer <[email protected]>
@metalgearsloth @NullWanderer
Fix starting gear (#27008)
84b0e08 
Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier.

Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is.

(cherry picked from commit 9bc3e076288c4e4ede6e757aa59ded9cef413340)
@Dutch-VanDerLinde @NullWanderer
Fix senior ID cards and other loadout shit (#27017)
b69393c 
* remove senior backpacks

* fix ID cards

* Update atmospheric_technician.yml

(cherry picked from commit e2be85bc52b51b7c736b2f0c7bfb4a2a0fc39e71)
@Doctor-Cpu @NullWanderer
Add autism pins to loadout (#27034)
694d795 
add autism pins to loadout

(cherry picked from commit d5b7e4baf2b867ea184c6566b1e00b5f1384867e)
@NullWanderer
Civilian loadout prototypes
4afcc29 
Signed-off-by: NullWanderer <[email protected]>
@metalgearsloth @NullWanderer
LobbyUI fixes (#27033)
215fced 
* LobbyUI fixes

I have no idea which were bugs prior but anyway fix stuff.

* More fixes

* Test moment

(cherry picked from commit fcd6c25242c195266c3b4c4aa2ed78922683567c)
Signed-off-by: NullWanderer <[email protected]>
@BellwetherLogic @NullWanderer
Add Nun Hood to Chaplain loadout options (#27025)
d5e2eaa 
Adds Nun Hood to starting Chaplain loadout options

(cherry picked from commit 7114b1939c82acb593dad32f8bf34d557b8e722e)
@Dutch-VanDerLinde @NullWanderer
add ancient jumpsuit to passenger loadout (#27035)
f12fd1f 
inital

(cherry picked from commit 5742dee84a04623e2b2626f49b6ab303863e2575)
@lzk228 @NullWanderer
Add jani gloves loadout (#27011)
5525623 
(cherry picked from commit e2341c0089a136deec40520595914086c428f466)
Signed-off-by: NullWanderer <[email protected]>
@ShadowCommander @NullWanderer
Fix PDA and ID card data not getting set on loadouts (#27062)
5e7224f 
(cherry picked from commit a95fc86f7a73c95383bcc41cb2cf63c4fe4ce575)
@Dutch-VanDerLinde @NullWanderer
add greysec loadout (#27023)
ba30160 
* inital

* George orwell

(cherry picked from commit 06ecf2af052b11cdc82c000be77b916109197ada)
@Pangogie @NullWanderer
Add Hardhats to Station Engineer Loadouts (#27044)
78df6d3 
* Add hardhats to loadout.

* Update Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

---------

Co-authored-by: metalgearsloth <[email protected]>
(cherry picked from commit 3c1ec9ac3435600f547c30d77512744b003a1f27)
@metalgearsloth @NullWanderer
Fix loadouts UI not refreshing on char change (#27075)
f84ff2b 
I love lobby code. Refreshing the entire jobs UI doesn't seem to cause issues. At least jobpriorityselector was my fault when I was far fucking stupider writing this shit.

(cherry picked from commit 9b1a8b07d734853c8cfcb83a6e2b7aad4e6dd764)
@metalgearsloth @NullWanderer
Fix character preview not updating on character change (#27043)
05ff1e2 
I love lobby code :3

(cherry picked from commit f9f204a6d03e08cb0d189f7d64c031a025711430)
@Dutch-VanDerLinde @NullWanderer
add roboticist gear to science loadout (#27045)
6bacc54 
* inital

* yes

* g

* death

* DEATH

(cherry picked from commit c8202dd80d0907de09f4400b297a6bb052af9d72)
Signed-off-by: NullWanderer <[email protected]>
@Vermidia @NullWanderer
Add medical gloves and sterile masks to medical loadouts (#27029)
ca847d4 
* Add medical gloves to loadouts

* Realize I don't need to duplicate them

* Re-add extra lines

* I did it wrong...

* Format it back to how it was this time for sure

* For real this time

* ...

* Add sterile masks too

* I can't spell officer apparently

* Standardize order of where gloves are

* Add Nurse Hat to doctors

* Remove duplication of gloves and masks

* Remove extra space

* Name glove protos similiar to other ones

* Remove latex gloves proto from medical (sci has it)

(cherry picked from commit 58e21a8532c402810462f924758a41f6427b081a)
Signed-off-by: NullWanderer <[email protected]>
@Blackern5000 @NullWanderer
Add rainbow jumpsuit to passenger loadout. (#27211)
d91c0cc 
* Add all colored jumpsuits to passenger loadout

* onlyrainbowiguess

(cherry picked from commit fb8dcfe6bf25f83e88a385e01284581e6c7fcf7d)
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Make remaining IPrototypes partial (#27157)
eb05117 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Paradox Anomaly fix
1b71e4a 
Signed-off-by: NullWanderer <[email protected]>
@Dutch-VanDerLinde @NullWanderer
Add winter coats and shoes to loadouts (#27022)
fb24e46 
* inital

* Update loadout-groups.ftl

* fix order

* add winter boots

* fix test fails

Signed-off-by: NullWanderer <[email protected]>
@SpeltIncorrectyl @NullWanderer
Adds security webbing and security belts to Security Officer loadout …
3fdd7e2 
…(#27189)

* added filled security webbing

* moved sec belt to loadout

* added webbing for head of security and warden

(cherry picked from commit b6d751eb70c632bcc7424cdad3b69dc7f83887b0)
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Nyano loadout - Mail Carrier
fc44e83 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Nyano loadout - Forensic Mantis
4f5aad8 
Signed-off-by: NullWanderer <[email protected]>
@NullWanderer
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024…
74002a1 
…/04/21-loadouts

# Conflicts:
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files labels Apr 22, 2024
A-z-z-y and others added 5 commits May 6, 2024 14:08
@A-z-z-y
Merge branch 'master' into 2024/04/21-loadouts
7c4d38b
@NullWanderer
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024…
8db7894 
…/04/21-loadouts
@Afrokada @NullWanderer
Glasses in loadouts (#27286)
1c6e18d 
* loadouts now have aaall the glasses

* cheap sunglasses dont exist at all

* empty commit to rerun tests, there's no way i fucked something up
@Ciac32 @NullWanderer
Fix Loadout Editor not closing when Character Editor is closed. (#27539)
00a043e 
Remove duplicate UpdateRoleRequirements call screwing up update ordering
@Vermidia @NullWanderer
Add correct lawyer bags to loadouts (#27573)
2f54f9c 
* add lawyerbackpack to locale

* lawyer backpack group

* Add bags

* add loadout group

* Be less lazy and spot formatting problems
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 7, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Mobs/Species/Harpy/displacement.rsi

State Old New Status
jumpsuit Added

Edit: diff updated after f168cde

@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 the Status: Merge Conflict Fix your PR! label May 14, 2024
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels May 14, 2024
@NullWanderer
Copy link
Contributor Author

Please quit merging master on prs that don't need it. Just because the button is there doesn't mean you need to press it. If it isn't your pr, don't touch it.

The only exception being when you want to merge something and need the latest tests ran.

@Colin-Tel
Copy link
Contributor

Please quit merging master on prs that don't need it. Just because the button is there doesn't mean you need to press it. If it isn't your pr, don't touch it.

Negative, I was attempting resolving the merge conflict. I do understand you, however. Going forward I won't be doing this for other PRs.

@NullWanderer
Copy link
Contributor Author

NullWanderer commented May 14, 2024 •
edited
Loading

Please quit merging master on prs that don't need it. Just because the button is there doesn't mean you need to press it. If it isn't your pr, don't touch it.

Negative, I was attempting resolving the merge conflict. I do understand you, however. Going forward I won't be doing this for other PRs.

Why do you need to resolve the conflict on a pr that isn't yours? Don't worry too much about it, its fine. Just don't in the future for stuff like this

@Colin-Tel
Copy link
Contributor

Why do you need to resolve the conflict on a pr that isn't yours?

Because I felt it's my fault. Like I said, I won't be doing this going forward.

@IamVelcroboy
Copy link
Member

Please quit merging master on prs that don't need it. Just because the button is there doesn't mean you need to press it. If it isn't your pr, don't touch it.

Negative, I was attempting resolving the merge conflict. I do understand you, however. Going forward I won't be doing this for other PRs.

Why do you need to resolve the conflict on a pr that isn't yours? Don't worry too much about it, its fine. Just don't in the future for stuff like this

Probably because this touches all the map files. Which, honestly, should probably be done in a separate PR because otherwise we are going to have a ton of conflicts/lost work as mappers update their maps

@IamVelcroboy
Copy link
Member

IamVelcroboy commented May 14, 2024 •
edited
Loading

My bad...I see now, it's the proto-files not the actual map files (GH on phone moment)

@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label May 14, 2024
@NullWanderer
Copy link
Contributor Author

I'll undraft when tests stop failing 100% of the time. Should be in a mostly ready state now

@NullWanderer
Remove EnsureJobRequirementsValid
7f6449b 
Its code that frequently breaks, and while I could fix it, I don't think its needed currently.
@NullWanderer
Remove incorrect values
7a0b89e
@NullWanderer
Copy link
Contributor Author

Tests pass locally, I just need to wait for actions to work again.

@NullWanderer NullWanderer marked this pull request as ready for review May 15, 2024 11:13
deltanedas
deltanedas approved these changes May 15, 2024
View reviewed changes
Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

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

mimic test fail irrelevant

@NullWanderer NullWanderer merged commit f9ec70d into master May 15, 2024
13 checks passed
@NullWanderer NullWanderer deleted the 2024/04/21-loadouts branch May 15, 2024 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy IamVelcroboy left review comments

@rosieposieeee rosieposieeee rosieposieeee left review comments

@deltanedas deltanedas deltanedas approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.