Moves Filled stuff to Catalog/Fills. (#2938)

* Moved boxes * Toolboxes * Gas Tanks * Fixed that last commit * Large gas tanks shouldn't fit on belts
2021-01-07 06:27:46 +00:00
parent 7977992e5a
commit 429851140a
10 changed files with 190 additions and 208 deletions
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
@@ -1,19 +0,0 @@
- type: entity
-  name: donkpocket box
-  parent: BoxBase
-  id: BoxDonkpocket
-  description: 'Instructions: Heat in microwave. Product will cool if not eaten within seven minutes.'
-  components:
-  - type: StorageFill
-    contents:
-      - name: FoodDonkPocket
-        amount: 6
-  - type: Sprite
-    sprite: Objects/Storage/donkpocket.rsi
-    state: icon
-  - type: Item
-    color: "#951710"
-    sprite: Objects/Storage/donkpocket.rsi
-    state: icon
-  - type: Storage
-    capacity: 30
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
@@ -1,119 +0,0 @@
- type: entity
-  name: lightbulb box
-  parent: BoxBase
-  id: BoxLightbulb
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
-  components:
-  - type: StorageFill
-    contents:
-      - name: LightBulb
-        amount: 12
-  - type: Sprite
-    layers:
-      - state: box
-      - state: light
-  - type: Item
-
- type: entity
-  name: lighttube box
-  parent: BoxBase
-  id: BoxLighttube
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
-  components:
-  - type: StorageFill
-    contents:
-      - name: LightTube
-        amount: 12
-  - type: Sprite
-    layers:
-      - state: box
-      - state: lighttube
-  - type: Item
-
- type: entity
-  name: mixed lights box
-  parent: BoxBase
-  id: BoxLightMixed
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
-  components:
-  - type: StorageFill
-    contents:
-      - name: LightTube
-        amount: 6
-      - name: LightBulb
-        amount: 6
-  - type: Sprite
-    layers:
-      - state: box
-      - state: lightmixed
-  - type: Item
-
- type: entity
-  name: pda box
-  parent: BoxBase
-  id: BoxPDA
-  description: A box of spare PDA microcomputers.
-  components:
-  - type: StorageFill
-    contents:
-      - name: AssistantPDA
-        amount: 3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: pda
-  - type: Item
-  - type: Storage
-    capacity: 30
-
- type: entity
-  name: meson box
-  parent: BoxBase
-  id: BoxMesonScanners
-  description: A box of spare meson goggles.
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingEyesGlassesMeson
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box
-      - state: meson
-  - type: Item
-  - type: Storage
-    capacity: 20
-
- type: entity
-  name: survival box
-  parent: BoxBase
-  id: BoxSurvival
-  description: It's box with basic internals inside.
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingMaskBreath
-      - name: EmergencyOxygenTankFilled
-      #- name: Injector
-  - type: Sprite
-    layers:
-      - state: box
-      - state: writing
-  - type: Item
-    size: 15
-  - type: Storage
-    capacity: 15
-    size: 15
-
- type: entity
-  name: box of hugs
-  parent: BoxSurvival
-  id: BoxHug
-  description: A special box for sensitive people.
-  components:
-  - type: Sprite
-    layers:
-      - state: box_hug
-      - state: heart
-  - type: Item
-    HeldPrefix: hug
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
@@ -1,56 +0,0 @@
- type: entity
-  name: syringe box
-  parent: BoxBase
-  id: BoxSyringe
-  description: A box full of syringes.
-  components:
-  - type: StorageFill
-    contents:
-      - name: Syringe
-        amount: 6
-  - type: Sprite
-    layers:
-      - state: box
-      - state: syringe
-
-  - type: Item
-  - type: Storage
-    capacity: 30
-
- type: entity
-  name: sterile box
-  parent: BoxBase
-  id: BoxSterile
-  description: This box contains sterile medical masks.
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingMaskSterile
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box
-      - state: sterile
-
-  - type: Item
-  - type: Storage
-    capacity: 20
-
- type: entity
-  name: latex box
-  parent: BoxBase
-  id: BoxLatex
-  description: Contains sterile latex gloves.
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHandsGlovesLatex
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box
-      - state: latex
-
-  - type: Item
-  - type: Storage
-    capacity: 20
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
@@ -1,20 +0,0 @@
- type: entity
-  name: beaker box
-  parent: BoxBase
-  id: BoxBeaker
-  description: A box full of beakers.
-  components:
-  - type: StorageFill
-    contents:
-      - name: Beaker
-        amount: 3
-      - name: LargeBeaker
-        amount: 3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: beaker
-
-  - type: Item
-  - type: Storage
-    capacity: 30
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
@@ -1,56 +0,0 @@
- type: entity
-  name: handcuff box
-  parent: BoxBase
-  id: BoxHandcuff
-  description: A box full of handcuffs.
-  components:
-  - type: StorageFill
-    contents:
-      - name: Handcuffs
-        amount: 6
-  - type: Sprite
-    layers:
-      - state: box_security
-      - state: handcuff
-
-  - type: Item
-  - type: Storage
-    capacity: 6
-
- type: entity
-  name: flashbang box
-  parent: BoxBase
-  id: BoxFlashbang
-  description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.'
-  components:
-  - type: StorageFill
-    contents:
-      - name: GrenadeFlashBang
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box_security
-      - state: flashbang
-
-  - type: Item
-  - type: Storage
-    capacity: 20
-
- type: entity
-  name: sechud box
-  parent: BoxBase
-  id: BoxSechud
-  description: A box of security glasses.
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingEyesGlassesSecurity
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box_security
-      - state: sechud
-
-  - type: Item
-  - type: Storage
-    capacity: 20
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml
--- 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
--- 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