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

Add the Ability to Tie Jumpsuit Jackets around Waist #375

Merged
merged 14 commits into from
Oct 1, 2024
Merged

Add the Ability to Tie Jumpsuit Jackets around Waist #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
85e8fd7
inital
Dutch-VanDerLinde Aug 19, 2024
ae565d1
Merge branch 'space-wizards:master' into jackets
Dutch-VanDerLinde Aug 19, 2024
58b4c87
testfa
Dutch-VanDerLinde Aug 19, 2024
3cd6793
Merge branch 'jackets' of https://github.com/Dutch-VanDerLinde/space-…
Dutch-VanDerLinde Aug 19, 2024
55630b8
New Sec sprite
Dutch-VanDerLinde Aug 20, 2024
e8f8450
Update atmos
Dutch-VanDerLinde Aug 21, 2024
721d6d1
Merge branch 'space-wizards:master' into jackets
Dutch-VanDerLinde Aug 23, 2024
6977b29
Add ability to tie jumpsuits around waist!
AirFryerBuyOneGetOneFree2 Sep 29, 2024
a175899
Fix it :) (added back a jumpsuit, oops)
AirFryerBuyOneGetOneFree2 Sep 29, 2024
f3b1174
Fixed preexisting tied sprites + base HoP outfit
Pinkbat5 Sep 30, 2024
f6424ba
Added a kajillion more jumpsuits
Pinkbat5 Sep 30, 2024
4f58f50
Added chaplain + small sprite fixes + added credits
Pinkbat5 Sep 30, 2024
6f1da52
Merge pull request #14 from Pinkbat5/boy-next-maints
AirFryerBuyOneGetOneFree Sep 30, 2024
766e24b
Merge branch 'master' into Dutch-VanDerLinde-jackets
formlessnameless Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/foldable/components/foldable-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ fold-flip-verb = Flip

fold-zip-verb = Zip up
fold-unzip-verb = Unzip

fold-verb-clothing-jacket = Take off jacket
unfold-verb-clothing-jacket = Put on jacket
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,14 @@
- type: Clothing
slots: [innerclothing]
femaleMask: UniformTop

- type: entity
abstract: true
id: ClothingUniformFoldableBase
components:
- type: Foldable
canFoldInsideContainer: true
unfoldVerbText: unfold-verb-clothing-jacket
foldVerbText: fold-verb-clothing-jacket
- type: FoldableClothing
foldedEquippedPrefix: folded
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@

# Rainbow Jumpsuit
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, ClothingUniformFoldableBase ]
id: ClothingUniformColorRainbow
name: rainbow jumpsuit
description: A multi-colored jumpsuit!
Expand Down
Loading
Loading