From 660d3783aa958884774c81d63d7f66f88093ae34 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 24 Apr 2024 22:45:23 +0300 Subject: [PATCH 1/2] Clothes Fixes (Minor) --- .../_NF/Entities/Clothing/Head/hardsuit-helmets.yml | 2 ++ .../_NF/Entities/Clothing/Masks/masks.yml | 4 ++++ ...equipped-OUTERCLOTHING.png => equipped-BELT.png} | Bin .../_NF/Clothing/Belt/arcadia.rsi/meta.json | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) rename Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/{equipped-OUTERCLOTHING.png => equipped-BELT.png} (100%) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index b0ab3a29e5c..51252fdf9e3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index f69be10d0ff..d62a6215dc1 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -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 diff --git a/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/equipped-BELT.png diff --git a/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/meta.json index 0490a574c94..b7ca3a67b3d 100644 --- a/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Belt/arcadia.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-OUTERCLOTHING", + "name": "equipped-BELT", "directions": 4 }, { From a17a7d050ef814c8d1e85b79ea60b870b5dc4f04 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 24 Apr 2024 23:52:00 +0300 Subject: [PATCH 2/2] suitstorage units, more clothes in vendomats --- .../VendingMachines/Inventories/theater.yml | 7 +++ .../Catalog/Fills/Lockers/suit_storage.yml | 43 +++++++++++++++++-- .../Fills/Lockers/suit_storage_wallmount.yml | 12 +++++- .../Clothing/Head/softsuit-helmets.yml | 2 + 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 59ab4c91d16..04235e7e373 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index a2f50543550..eb892764bfa 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -1,5 +1,5 @@ #SOFTSUITS -#Paramedic's hardsuit +#Paramedic's voidsuit - type: entity id: SuitStorageParamedic parent: SuitStorageBase @@ -10,7 +10,6 @@ # - id: NitrogenTankFilled # - id: OxygenTankFilled - id: AirTankFilled - - id: ClothingHeadHelmetVoidParamed - id: ClothingOuterHardsuitVoidParamed - id: ClothingMaskBreathMedical - id: JetpackMiniFilled @@ -18,6 +17,25 @@ - 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 @@ -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 @@ -245,4 +282,4 @@ - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader - access: [["Security"]] \ No newline at end of file + access: [["Security"]] diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml index 66f836e5061..0170715fbde 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml @@ -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 @@ -15,6 +20,11 @@ id: SuitStorageWallmountMercenary parent: [SuitStorageWallmount, SuitStorageMercenary] +#SCAF hardsuit +- type: entity + id: SuitStorageWallmountScaf + parent: [SuitStorageWallmount, SuitStorageScaf] + #Pilot hardsuit - type: entity id: SuitStorageWallmountPilot diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml index 2f5ac8ca070..e956ba59399 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml @@ -12,6 +12,7 @@ - type: Tag tags: - HelmetEVA + - HidesHair - WhitelistChameleon - type: entity @@ -28,4 +29,5 @@ - type: Tag tags: - HelmetEVA + - HidesHair - WhitelistChameleon