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

Clothing Additions By DakoDemon #136

Merged
merged 30 commits into from
Aug 23, 2024
Merged

Clothing Additions By DakoDemon #136

merged 30 commits into from
Aug 23, 2024

Conversation

ShatteredSwords
Copy link
Contributor

@ShatteredSwords ShatteredSwords commented Aug 22, 2024 •
edited
Loading

Description

Added in some more departmental socks, and a few other requested outfits. Did a few bug fixes. - DakoDemon

(I helped solve the merge conflicts by cherry-picking each of these commits and manually going through! Hope I didn't fuck anything up!) -Kota aka ShatteredSwords

Changelog

🆑 DakoDemon

  • add: Added a few more outfits
  • fix: Fixed the skirt issue for harpies
  • fix: Fixed Sec armor values
  • tweak: The Autodrobe Restock is now 2000 (from 1730)

@DakoDemon @ShatteredSwords
Merge branch 'dev-enviro' of https://github.com/DakoDemon/floofstation1…
466b184 
… into Clothing-Additions
@DakoDemon @ShatteredSwords
- Added Coder, Bee, Coder-Valid socks ect to loadouts, lathe, & vendors
974eca7 
- Added Pink Hoodie to Loadouts
- Added in more Departmental socks, warmers, & thongs
- Added various stats to the respective department pieces
- Added requested Outwear, Overalls

Signed-off-by: Dakota Haven <[email protected]>
@DakoDemon @ShatteredSwords
- Added Sex Comp Uniform to BoxingDrobe
7202368 
- Added Mantis, and Courier socks ect
- Added the skirt tag, thongs can be worn by harpies (Someone already did, but didn't want to accidentally revert any changes)
- Added Cyberjackets

Signed-off-by: Dakota Haven <[email protected]>
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 22, 2024 •
edited
Loading

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

Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengisocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengithong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengiwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepisocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepithong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepiwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepisocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepithong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepiwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarriersocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarrierthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarrierwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogisocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogithong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogiwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/chemistsocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/chemistthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Medical/chemistwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/cmosocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/cmothong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Medical/cmowarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/paramedsocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Medical/paramedthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Medical/paramedwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Security/detectsocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Security/detectthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Security/detectwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Security/hossocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Security/hosthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Security/hoswarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/bartendersocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/bartenderthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Service/bartenderwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/chefsocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/chefthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Service/chefwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/musiciansocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/musicianthong.rsi

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

Resources/Textures/Floof/Clothing/Departmental/Service/musicianwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Service/universalservicejumpsuit.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/Misc/robooveralls.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi

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

Resources/Textures/Floof/Clothing/Uniforms/musicianking.rsi

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

Resources/Textures/Floof/Clothing/Uniforms/musiciankingblack.rsi

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

Edit: diff updated after b167639

@ShatteredSwords
Copy link
Contributor Author

Alright time to see what I did wrong :P

Memeji
Memeji reviewed Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@Memeji Memeji left a comment

Choose a reason for hiding this comment

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

Seems good from what I see.
Only thing I'm wondering about is commenting out the old socks.
Also I believe a fix was applied for Sec values already while I was asleep.

@ShatteredSwords
Copy link
Contributor Author

Seems good from what I see. Only thing I'm wondering about is commenting out the old socks. Also I believe a fix was applied for Sec values already while I was asleep.

Making the coder and bee socks cheaper because Dako put them in their own PR as a cheaper loadout, so keeping the other loadout would make it redundant

@ShatteredSwords
Copy link
Contributor Author

ShatteredSwords commented Aug 22, 2024 •
edited
Loading

Also I believe a fix was applied for Sec values already while I was asleep.

These ones still have a slight armor value as far as I can tell, if you want them coded out I could probably remove them just fine. (the armor values not the socks)

@Memeji Memeji self-requested a review August 22, 2024 23:46
Memeji
Memeji approved these changes Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@Memeji Memeji left a comment

Choose a reason for hiding this comment

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

Thanks for the info, overall looks good.

FoxxoTrystan
FoxxoTrystan requested changes Aug 23, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Those clothing must NOT replace security, protective, job equipement and so should in any cases not have speed boosts or armor or special effects, keep them simple.

If someone need to have more project if handling something dangerous they should get protective gear for that moment.

Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml Outdated Show resolved Hide resolved
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes Priority: 2-Medium Needs to be resolved at some point and removed Status: Needs Review Someone please review this labels Aug 23, 2024
ShatteredSwords and others added 5 commits August 22, 2024 20:37
@ShatteredSwords @FoxxoTrystan
o7
ea304c0 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
636aa6e 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
3293298 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
7800b32 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
aa88e30 
Co-authored-by: FoxxoTrystan <[email protected]>
ShatteredSwords and others added 3 commits August 22, 2024 20:39
@ShatteredSwords @FoxxoTrystan
o7
556e3f3 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
0a41131 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
5a014e1 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords
Copy link
Contributor Author

I'm gonna resolve these on PC so I don't have to handle a dying phone while merging the suggestions lol

ShatteredSwords and others added 14 commits August 22, 2024 21:07
@ShatteredSwords @FoxxoTrystan
o7
986df86 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
737acbc 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
2da0919 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
a7a1d81 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
c2b1330 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
83b2d46 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
bb53a46 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
aefecb4 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
1776d20 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
9184f90 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
o7
43786d2 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords @FoxxoTrystan
Alright, the o7 meme has gone on long enough
e9dba8b 
Co-authored-by: FoxxoTrystan <[email protected]>
@ShatteredSwords
Merge branch 'Fansana:master' into DakoFix
4a8f663
@ShatteredSwords
I'm assuming this works
b167639
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Aug 23, 2024
@ShatteredSwords
Copy link
Contributor Author

So turns out github will test every single commit before testing the whole thing together. I ate all of the actions tests. Do not do what I did and learn the hard way, any contributor that may read this.

@Memeji Memeji self-requested a review August 23, 2024 02:03
@Memeji Memeji merged commit 27ad371 into Fansana:master Aug 23, 2024
15 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 23, 2024
@Floof-Station-Bot
Automatic Changelog Update (#136)
2fbea60
@ShatteredSwords ShatteredSwords deleted the DakoFix branch August 23, 2024 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

@Memeji Memeji Memeji approved these changes

Assignees

@ShatteredSwords ShatteredSwords

Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ShatteredSwords @Memeji @FoxxoTrystan @DakoDemon