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.

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

Clothes Fixes and QoL (Minor) #1273

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@
ClothingEyesEyepatch: 2
ClothingShoesBootsLaceup: 2
FoamCutlass: 2
ClothingHeadSafari: 2 # Frontier
ClothingUniformJumpsuitSafari: 2 # Frontier
ClothingUniformRandomArmless: 6 # Frontier
ClothingUniformRandomStandard: 6 # Frontier
ClothingUniformRandomBra: 6 # Frontier
ClothingUniformRandomShorts: 6 # Frontier
ClothingUniformRandomShirt: 6 # Frontier
ClothingHandsGlovesBoxingRed: 2
ClothingHandsGlovesBoxingBlue: 2
ClothingHandsGlovesBoxingYellow: 2
Expand Down
43 changes: 40 additions & 3 deletions Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#SOFTSUITS
#Paramedic's hardsuit
#Paramedic's voidsuit
- type: entity
id: SuitStorageParamedic
parent: SuitStorageBase
Expand All @@ -10,14 +10,32 @@
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingHeadHelmetVoidParamed
- id: ClothingOuterHardsuitVoidParamed
- id: ClothingMaskBreathMedical
- id: JetpackMiniFilled
- id: HandheldGPSBasic
- type: AccessReader
# access: [["Medical"]]

#Hydroponics EVA
- type: entity
id: SuitStorageHydro
parent: SuitStorageBase
suffix: Hydroponics
components:
- type: StorageFill
contents:
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingOuterEVASuitHydro
- id: ClothingMaskBreath
- id: JetpackMiniFilled
- id: HandheldGPSBasic
# - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
- type: AccessReader
# access: [[ "Hydroponics" ]]

#HARDSUITS
#Quartermaster hardsuit
- type: entity
Expand Down Expand Up @@ -57,6 +75,25 @@
- type: AccessReader
access: [["Captain"], ["Mercenary"]]

#SCAF hardsuit
- type: entity
id: SuitStorageScaf
parent: SuitStorageBase
suffix: SCAF
components:
- type: StorageFill
contents:
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingOuterHardsuitScaf
- id: ClothingMaskGasMercenary
- id: JetpackMiniFilled
- id: HandheldGPSBasic
# - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
- type: AccessReader
access: [["Captain"], ["Mercenary"]]

#Pilot hardsuit
- type: entity
id: SuitStoragePilot
Expand Down Expand Up @@ -245,4 +282,4 @@
- id: HandheldGPSBasic
- id: ClothingShoesBootsMagNfsd # Frontier
- type: AccessReader
access: [["Security"]]
access: [["Security"]]
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#SOFTSUITS
#Paramedic's hardsuit
#Paramedic's Voidsuit
- type: entity
id: SuitStorageWallmountParamedic
parent: [SuitStorageWallmount, SuitStorageParamedic]

#Hydroponics EVA
- type: entity
id: SuitStorageWallmountHydro
parent: [SuitStorageWallmount, SuitStorageHydro]

#HARDSUITS
#Quartermaster hardsuit
- type: entity
Expand All @@ -15,6 +20,11 @@
id: SuitStorageWallmountMercenary
parent: [SuitStorageWallmount, SuitStorageMercenary]

#SCAF hardsuit
- type: entity
id: SuitStorageWallmountScaf
parent: [SuitStorageWallmount, SuitStorageScaf]

#Pilot hardsuit
- type: entity
id: SuitStorageWallmountPilot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
name: pilot hardsuit helmet
description: Light hardsuit helmet for pilots.
components:
- type: BreathMask
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/pilot.rsi
- type: Clothing
Expand Down Expand Up @@ -69,6 +70,7 @@
name: experimental salvager helmet
description: A predication of decay washes over your mind.
components:
- type: BreathMask
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/maxim_prototype.rsi
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- type: Tag
tags:
- HelmetEVA
- HidesHair
- WhitelistChameleon

- type: entity
Expand All @@ -28,4 +29,5 @@
- type: Tag
tags:
- HelmetEVA
- HidesHair
- WhitelistChameleon
4 changes: 4 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
sprite: _NF/Clothing/Masks/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Masks/arcadia.rsi
- type: Tag
tags:
- ClothMade
- HidesHair

- type: entity
parent: ClothingMaskBase
Expand Down
2 changes: 1 addition & 1 deletion Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"name": "equipped-BELT",
"directions": 4
},
{
Expand Down
Loading