From 429851140a083c43b8df002da40c615e53616763 Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 7 Jan 2021 06:27:46 +0000 Subject: [PATCH] Moves Filled stuff to Catalog/Fills. (#2938) * Moved boxes * Toolboxes * Gas Tanks * Fixed that last commit * Large gas tanks shouldn't fit on belts --- .../Fills/Boxes/food.yml} | 0 .../Fills/Boxes/general.yml} | 0 .../Fills/Boxes/medical.yml} | 0 .../Fills/Boxes/science.yml} | 0 .../Fills/Boxes/security.yml} | 0 .../Prototypes/Catalog/Fills/gas_tanks.yml | 121 +++++++++++++++ .../Prototypes/Catalog/Fills/toolboxes.yml | 69 +++++++++ .../{Boxes/boxbase.yml => Misc/box.yml} | 0 .../Entities/Objects/Tools/gas_tanks.yml | 138 ------------------ .../Entities/Objects/Tools/toolbox.yml | 70 --------- 10 files changed, 190 insertions(+), 208 deletions(-) rename Resources/Prototypes/{Entities/Objects/Boxes/boxes_food.yml => Catalog/Fills/Boxes/food.yml} (100%) rename Resources/Prototypes/{Entities/Objects/Boxes/boxes_general.yml => Catalog/Fills/Boxes/general.yml} (100%) rename Resources/Prototypes/{Entities/Objects/Boxes/boxes_medical.yml => Catalog/Fills/Boxes/medical.yml} (100%) rename Resources/Prototypes/{Entities/Objects/Boxes/boxes_science.yml => Catalog/Fills/Boxes/science.yml} (100%) rename Resources/Prototypes/{Entities/Objects/Boxes/boxes_security.yml => Catalog/Fills/Boxes/security.yml} (100%) create mode 100644 Resources/Prototypes/Catalog/Fills/gas_tanks.yml create mode 100644 Resources/Prototypes/Catalog/Fills/toolboxes.yml rename Resources/Prototypes/Entities/Objects/{Boxes/boxbase.yml => Misc/box.yml} (100%) diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml b/Resources/Prototypes/Catalog/Fills/Boxes/food.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/food.yml diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/general.yml diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/medical.yml diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/science.yml diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml new file mode 100644 index 0000000000..2d88feee39 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml @@ -0,0 +1,121 @@ +- type: entity + id: OxygenTankFilled + parent: OxygenTank + name: oxygen tank + description: A tank of oxygen. + suffix: Filled + components: + - type: GasTank + outputPressure: 21.27825 + air: + volume: 70 + moles: + - 22.6293856 # oxygen + temperature: 293.15 + +- type: entity + id: YellowOxygenTankFilled + parent: OxygenTankFilled + name: oxygen tank + description: A tank of oxygen. This one is in yellow. + suffix: Filled + components: + - type: Sprite + sprite: Objects/Tanks/yellow.rsi + - type: Clothing + sprite: Objects/Tanks/yellow.rsi + +- type: entity + id: RedOxygenTankFilled + parent: OxygenTankFilled + name: oxygen tank + description: A tank of oxygen. This one is in yellow. + suffix: Filled + components: + - type: Sprite + sprite: Objects/Tanks/red.rsi + - type: Clothing + sprite: Objects/Tanks/red.rsi + +- type: entity + id: EmergencyOxygenTankFilled + parent: EmergencyOxygenTank + name: emergency oxygen tank + description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. + suffix: Filled + components: + - type: GasTank + outputPressure: 21.27825 + air: + volume: 2 + moles: + - 0.323460326 # oxygen + temperature: 293.15 + +- type: entity + id: ExtendedEmergencyOxygenTankFilled + parent: ExtendedEmergencyOxygenTank + name: extended-capacity emergency oxygen tank + description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. + suffix: Filled + components: + - type: GasTank + outputPressure: 21.27825 + air: + volume: 6 + moles: + - 0.969830813 # oxygen + temperature: 293.15 + +- type: entity + id: DoubleEmergencyOxygenTankFilled + parent: DoubleEmergencyOxygenTank + name: double emergency oxygen tank + description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. + suffix: Filled + components: + - type: GasTank + outputPressure: 21.27825 + air: + volume: 10 + moles: + - 1.61721219 # oxygen + temperature: 293.15 + +- type: entity + id: AirTankFilled + parent: GasTankBase + name: air tank + description: Mixed anyone? + suffix: Filled + components: + - type: Sprite + sprite: Objects/Tanks/generic.rsi + - type: GasTank + outputPressure: 101.325 + air: + volume: 70 + moles: + - 4.75217098 # oxygen + - 17.8772147 # nitrogen + temperature: 293.15 + - type: Clothing + sprite: Objects/Tanks/generic.rsi + +- type: entity + id: PhoronTankFilled + parent: PhoronTank + name: phoron tank + suffix: Filled + description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." + components: + - type: GasTank + outputPressure: 101.325 + air: + volume: 70 + moles: + - 0 + - 0 + - 0 + - 11.3146928 # phoron + temperature: 293.15 diff --git a/Resources/Prototypes/Catalog/Fills/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/toolboxes.yml new file mode 100644 index 0000000000..d666245826 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/toolboxes.yml @@ -0,0 +1,69 @@ +- type: entity + id: ToolboxEmergencyFilled + name: emergency toolbox + parent: ToolboxEmergency + suffix: Filled + components: + - type: StorageFill + contents: + - name: ClothingMaskBreath + amount: 2 + - name: FoodChocolateBar + - name: FlashlightLantern + amount: 2 + - name: HarmonicaInstrument + prob: 0.15 + orGroup: HarmonicaOrChocolate + - name: FoodChocolateBar + orGroup: HarmonicaOrChocolate + +- type: entity + id: ToolboxElectricalFilled + name: electrical toolbox + suffix: Filled + parent: ToolboxElectrical + components: + - type: StorageFill + contents: + - name: Screwdriver + - name: Crowbar + - name: Wirecutter + - name: ApcExtensionCableStack + - name: MVWireStack + - name: ClothingHandsGlovesColorYellow + prob: 0.05 + orGroup: GlovesOrWires + - name: HVWireStack + orGroup: GlovesOrWires + +- type: entity + id: ToolboxSyndicateFilled + name: suspicious toolbox + suffix: Filled + parent: ToolboxSyndicate + components: + - type: StorageFill + contents: + - name: Screwdriver + - name: Wrench + - name: Welder + - name: Crowbar + - name: Multitool + - name: Wirecutter + - name: ClothingHandsGlovesCombat + +- type: entity + id: ToolboxGoldFilled + name: golden toolbox + parent: ToolboxGolden + suffix: Filled + components: + - type: StorageFill + contents: + - name: GoldStack + amount: 5 + - name: DrinkGoldenCup + prob: 0.05 + orGroup: CupOrGold + - name: GoldStack + orGroup: CupOrGold diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml rename to Resources/Prototypes/Entities/Objects/Misc/box.yml diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 26e3cc5788..6b219b7c63 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -15,9 +15,6 @@ - type: Clothing sprite: Objects/Tanks/generic.rsi QuickEquip: false - Slots: - - Back - - Belt - type: GasTank - type: ItemActions actions: @@ -41,22 +38,6 @@ sprite: Objects/Tanks/oxygen.rsi Slots: - Back - - Belt - -- type: entity - id: OxygenTankFilled - parent: OxygenTank - name: oxygen tank - description: A tank of oxygen. - suffix: Filled - components: - - type: GasTank - outputPressure: 21.27825 - air: - volume: 70 - moles: - - 22.6293856 # oxygen - temperature: 293.15 - type: entity id: YellowOxygenTank @@ -71,22 +52,6 @@ sprite: Objects/Tanks/yellow.rsi Slots: - Back - - Belt - -- type: entity - id: YellowOxygenTankFilled - parent: OxygenTankFilled - name: oxygen tank - description: A tank of oxygen. This one is in yellow. - suffix: Filled - components: - - type: Sprite - sprite: Objects/Tanks/yellow.rsi - - type: Clothing - sprite: Objects/Tanks/yellow.rsi - Slots: - - Back - - Belt - type: entity id: RedOxygenTank @@ -101,22 +66,6 @@ sprite: Objects/Tanks/red.rsi Slots: - Back - - Belt - -- type: entity - id: RedOxygenTankFilled - parent: OxygenTankFilled - name: oxygen tank - description: A tank of oxygen. This one is in yellow. - suffix: Filled - components: - - type: Sprite - sprite: Objects/Tanks/red.rsi - - type: Clothing - sprite: Objects/Tanks/red.rsi - Slots: - - Back - - Belt - type: entity id: EmergencyOxygenTank @@ -138,21 +87,6 @@ - Pocket - Belt -- type: entity - id: EmergencyOxygenTankFilled - parent: EmergencyOxygenTank - name: emergency oxygen tank - description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. - suffix: Filled - components: - - type: GasTank - outputPressure: 21.27825 - air: - volume: 2 - moles: - - 0.323460326 # oxygen - temperature: 293.15 - - type: entity id: ExtendedEmergencyOxygenTank parent: EmergencyOxygenTank @@ -173,21 +107,6 @@ - Pocket - Belt -- type: entity - id: ExtendedEmergencyOxygenTankFilled - parent: ExtendedEmergencyOxygenTank - name: extended-capacity emergency oxygen tank - description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. - suffix: Filled - components: - - type: GasTank - outputPressure: 21.27825 - air: - volume: 6 - moles: - - 0.969830813 # oxygen - temperature: 293.15 - - type: entity id: DoubleEmergencyOxygenTank parent: ExtendedEmergencyOxygenTank @@ -208,21 +127,6 @@ - Pocket - Belt -- type: entity - id: DoubleEmergencyOxygenTankFilled - parent: DoubleEmergencyOxygenTank - name: double emergency oxygen tank - description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. - suffix: Filled - components: - - type: GasTank - outputPressure: 21.27825 - air: - volume: 10 - moles: - - 1.61721219 # oxygen - temperature: 293.15 - - type: entity id: AirTank parent: GasTankBase @@ -241,30 +145,6 @@ sprite: Objects/Tanks/generic.rsi Slots: - Back - - Belt - -- type: entity - id: AirTankFilled - parent: GasTankBase - name: air tank - description: Mixed anyone? - suffix: Filled - components: - - type: Sprite - sprite: Objects/Tanks/generic.rsi - - type: GasTank - outputPressure: 101.325 - air: - volume: 70 - moles: - - 4.75217098 # oxygen - - 17.8772147 # nitrogen - temperature: 293.15 - - type: Clothing - sprite: Objects/Tanks/generic.rsi - Slots: - - Back - - Belt - type: entity id: PhoronTank @@ -284,21 +164,3 @@ sprite: Objects/Tanks/phoron.rsi Slots: - Belt - -- type: entity - id: PhoronTankFilled - parent: PhoronTank - name: phoron tank - suffix: Filled - description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." - components: - - type: GasTank - outputPressure: 101.325 - air: - volume: 70 - moles: - - 0 - - 0 - - 0 - - 11.3146928 # phoron - temperature: 293.15 diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 282b5d590f..ec91c98612 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -24,25 +24,6 @@ - type: Item sprite: Objects/Tools/Toolboxes/toolbox_red.rsi -- type: entity - id: ToolboxEmergencyFilled - name: emergency toolbox - parent: ToolboxEmergency - suffix: Filled - components: - - type: StorageFill - contents: - - name: ClothingMaskBreath - amount: 2 - - name: FoodChocolateBar - - name: FlashlightLantern - amount: 2 - - name: HarmonicaInstrument - prob: 0.15 - orGroup: HarmonicaOrChocolate - - name: FoodChocolateBar - orGroup: HarmonicaOrChocolate - - type: entity name: mechanical toolbox parent: ToolboxBase @@ -67,25 +48,6 @@ - type: Item sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi -- type: entity - id: ToolboxElectricalFilled - name: electrical toolbox - suffix: Filled - parent: ToolboxElectrical - components: - - type: StorageFill - contents: - - name: Screwdriver - - name: Crowbar - - name: Wirecutter - - name: ApcExtensionCableStack - - name: MVWireStack - - name: ClothingHandsGlovesColorYellow - prob: 0.05 - orGroup: GlovesOrWires - - name: HVWireStack - orGroup: GlovesOrWires - - type: entity name: artistic toolbox parent: ToolboxBase @@ -112,22 +74,6 @@ - type: MeleeWeapon damage: 15 -- type: entity - id: ToolboxSyndicateFilled - name: suspicious toolbox - suffix: Filled - parent: ToolboxSyndicate - components: - - type: StorageFill - contents: - - name: Screwdriver - - name: Wrench - - name: Welder - - name: Crowbar - - name: Multitool - - name: Wirecutter - - name: ClothingHandsGlovesCombat - - type: entity name: golden toolbox parent: ToolboxBase @@ -139,19 +85,3 @@ state: icon - type: Item sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi - -- type: entity - id: ToolboxGoldFilled - name: golden toolbox - parent: ToolboxGolden - suffix: Filled - components: - - type: StorageFill - contents: - - name: GoldStack - amount: 5 - - name: DrinkGoldenCup - prob: 0.05 - orGroup: CupOrGold - - name: GoldStack - orGroup: CupOrGold