Crates - 3rd times a charm (#2669)

* Sprites

* Crates

* Moved cargo_console

* Cargo Catalogs No.1

* Added some Hydroponics crates

* More crates..

* Deletes an autogen file

* snivybus

* More

* Apply suggestions from code review

* Fix wrong prototype ID

* Fix another wrong prototype ID

* Fix... MANY, MANY wrong prototype IDs

Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: Vera Aguilera Puerto <zddm@outlook.es>

Resources/Prototypes/Catalog/Cargo/cargo_armory.yml

@@ -0,0 +1,23 @@
+- type: cargoProduct
+  name: "smg crate"
+  id: cargo.armorysmg
+  description: "Contains three high-powered, semiautomatic rifles with six mags. Requires Armory access to open."
+  icon:
+    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+    state: icon
+  product: CrateArmorySMG
+  cost: 8000
+  category: Armory
+  group: market
+
+- type: cargoProduct
+  name: "shotgun crate"
+  id: cargo.armoryshotgun
+  description: "For when the enemy absolutely needs to be replaced with lead. Contains three Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
+  icon:
+    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
+    state: icon
+  product: CrateArmoryShotgun
+  cost: 8000
+  category: Armory
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_botany.yml

@@ -0,0 +1,47 @@
+- type: cargoProduct
+  name: "exotic seeds crate"
+  id: cargo.hydroponicsseedsexotic
+  description: "Any entrepreneuring botanist's dream. Contains many different exotic seeds. Requires Hydroponics access to open."
+  icon:
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    state: seed
+  product: CrateHydroponicsSeedsExotic
+  cost: 1000
+  category: Hydroponics
+  group: market
+
+- type: cargoProduct
+  name: "hydroponics crate"
+  id: cargo.hydroponics
+  description: "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
+  icon:
+    sprite: Constructible/Hydroponics/hydro_tools.rsi
+    state: hoe
+  product: CrateHydroponicsTools
+  cost: 1500
+  category: Hydroponics
+  group: market
+
+- type: cargoProduct
+  name: "seeds crate"
+  id: cargo.hydroponicsseeds
+  description: "Big things have small beginnings. Contains nine different seeds."
+  icon:
+    sprite: Objects/Specific/Hydroponics/apple.rsi
+    state: seed
+  product: CrateHydroponicsSeeds
+  cost: 1000
+  category: Hydroponics
+  group: market
+
+#- type: cargoProduct
+#  name: "hydroponics backpack crate"
+#  id: cargo.hydroponicsbackpack
+#  description: "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open."
+#  icon:
+#    sprite:
+#    state:
+#  product:
+#  cost: 1000
+#  category: Hydroponics
+#  group: market

Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml

@@ -0,0 +1,47 @@
+- type: cargoProduct
+  name: "explosive emergency crate"
+  id: cargo.emergencyexplosive
+  description: "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)"
+  icon:
+    sprite: Clothing/Head/Helmets/bombsuit.rsi
+    state: icon
+  product: CrateEmergencyExplosive
+  cost: 1500
+  category: Emergency
+  group: market
+
+- type: cargoProduct
+  name: "firefighting crate"
+  id: cargo.emergencyfire
+  description: "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!"
+  icon:
+    sprite: Objects/Misc/fire_extinguisher.rsi
+    state: fire_extinguisher_closed
+  product: CrateEmergencyFire
+  cost: 1000
+  category: Emergency
+  group: market
+
+- type: cargoProduct
+  name: "internals crate"
+  id: cargo.emergencyinternals
+  description: "Master your life energy and control your breathing with three breath masks, three emergency oxygen tanks and three large air tanks."
+  icon:
+    sprite: Clothing/Mask/breath.rsi
+    state: icon
+  product: CrateEmergencyInternals
+  cost: 1000
+  category: Emergency
+  group: market
+
+- type: cargoProduct
+  name: "radiation protection crate"
+  id: cargo.emergencyradiation
+  description: "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this."
+  icon:
+    sprite: Constructible/Misc/decals.rsi
+    state: radiation
+  product: CrateEmergencyRadiation
+  cost: 1000
+  category: Emergency
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -0,0 +1,35 @@
+- type: cargoProduct
+  name: "big band instrument collection"
+  id: cargo.funinstruments
+  description: "Get your sad station movin' and groovin' with this fine collection! Contains thirteen different instruments"
+  icon:
+    sprite: Objects/Fun/Instruments/accordion.rsi
+    state: icon
+  product: CrateFunInstruments
+  cost: 5000
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  name: "art supplies"
+  id: cargo.funartsupplies
+  description: "Make some happy little accidents with lots of crayons!"
+  icon:
+    sprite: Objects/Misc/crayons.rsi
+    state: crayonbox
+  product: CrateFunArtSupplies
+  cost: 1000
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  name: "plushie crate"
+  id: cargo.funplushies
+  description: "A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT"
+  icon:
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_h
+  product: CrateFunPlushie
+  cost: 5000
+  category: Fun
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -0,0 +1,71 @@
+- type: cargoProduct
+  name: "armor crate"
+  id: cargo.securityarmor
+  description: "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
+  icon:
+    sprite: Clothing/OuterClothing/Vests/oldarmor.rsi
+    state: armor
+  product: CrateSecurityArmor
+  cost: 1500
+  category: Security
+  group: market
+
+- type: cargoProduct
+  name: "helmet crate"
+  id: cargo.securityhelmet
+  description: "Contains three standard-issue brain buckets. Requires Security access to open."
+  icon:
+    sprite: Clothing/Head/Helmets/security.rsi
+    state: icon
+  product: CrateSecurityHelmet
+  cost: 1000
+  category: Security
+  group: market
+
+- type: cargoProduct
+  name: "non-lethals crate"
+  id: cargo.securitynonlethal
+  description: "Stamina-draining disabler weapons. Requires Security access to open."
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/taser.rsi
+    state: icon
+  product: CrateSecurityNonlethal
+  cost: 1500
+  category: Security
+  group: market
+
+- type: cargoProduct
+  name: "Lasers Crate"
+  id: cargo.securitylaser
+  description: "Contains three lethal, high-energy laser guns. Requires Security access to open."
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
+    state: icon
+  product: CrateSecurityLaser
+  cost: 2000
+  category: Security
+  group: market
+
+- type: cargoProduct
+  name: "riot crate"
+  id: cargo.securityriot
+  description: "Contains two sets of heavy body armor and helmets and 2 shotguns with 6 rounds of beanbag shells each. Requires Armory access to open."
+  icon:
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
+    state: icon
+  product: CrateSecurityRiot
+  cost: 10000
+  category: Security
+  group: market
+
+- type: cargoProduct
+  name: "security supplies crate"
+  id: cargo.securitysupplies
+  description: "Contains various supplies for the station's Security team. Requires Security access to open."
+  icon:
+    sprite: Objects/Storage/boxes.rsi
+    state: box_security
+  product: CrateSecuritySupplies
+  cost: 1500
+  category: Security
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -0,0 +1,23 @@
+- type: cargoProduct
+  name: "janitorial supplies crate"
+  id: cargo.servicejanitorial
+  description: "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, a single mop and bucket, spray cleaner, and soap."
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    state: cleaner
+  product: CrateServiceJanitorialSupplies
+  cost: 1000
+  category: Service
+  group: market
+
+- type: cargoProduct
+  name: "replacement lights crate"
+  id: cargo.servicelightsreplacement
+  description: "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs."
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceReplacementLights
+  cost: 1000
+  category: Service
+  group: market

Resources/Prototypes/Catalog/Fills/crate.yml

@@ -1,95 +0,0 @@
-- type: entity
-  id: CrateFlashlights
-  parent: CrateGeneric
-  name: flashlight crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - name: FlashlightLantern
-        amount: 5
-
-- type: entity
-  id: CrateLightBulb
-  parent: CrateGeneric
-  name: light bulb crate (x10)
-  components:
-  - type: StorageFill
-    contents:
-      - name: LightBulb
-        amount: 10
-
-- type: entity
-  id: CrateFireExtinguisher
-  parent: CrateGeneric
-  name: fire extinguisher crate (x3)
-  components:
-  - type: StorageFill
-    contents:
-      - name: FireExtinguisher
-        amount: 3
-
-- type: entity
-  id: CratePen
-  parent: CrateGeneric
-  name: pen  crate (x10)
-  components:
-  - type: StorageFill
-    contents:
-      - name: Pen
-        amount: 10
-
-- type: entity
-  id: CrateBikeHorn
-  parent: CrateGeneric
-  name: bike horn crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - name: BikeHorn
-        amount: 5
-
-- type: entity
-  id: CrateCleaver
-  parent: CrateGeneric
-  name: cleaver crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - name: ButchCleaver
-        amount: 5
-
-- type: entity
-  id: CrateFuelTank
-  parent: CrateGeneric
-  name: fuel tank
-  components:
-  - type: StorageFill
-    contents:
-      - name: WeldingFuelTank
-
-- type: entity
-  id: CrateMedicalScanner
-  parent: CrateGeneric
-  name: medical scanner
-  components:
-  - type: StorageFill
-    contents:
-      - name: MedicalScanner
-
-- type: entity
-  id: CrateGlass
-  parent: CrateGeneric
-  name: glass sheet crate (x50)
-  components:
-  - type: StorageFill
-    contents:
-      - name: GlassStack
-
-- type: entity
-  id: CrateCable
-  parent: CrateGeneric
-  name: cable coil crate (x50)
-  components:
-  - type: StorageFill
-    contents:
-      - name: ApcExtensionCableStack1

Resources/Prototypes/Catalog/cargo_products.yml

@@ -1,143 +0,0 @@
-- type: cargoProduct
-  name: "dice"
-  id: cargo.dice
-  description: "Some dice"
-  icon:
-    sprite: Objects/Fun/dice.rsi
-    state: d2020
-  product: d20
-  cost: 20
-  category: Other
-  group: market
-
-- type: cargoProduct
-  name: "medkit"
-  id: cargo.Medkit
-  description: "Everything you need to patch someone up."
-  icon:
-    sprite: Objects/Specific/Medical/medical.rsi
-    state: medkit_r
-  product: Medkit
-  cost: 200
-  category: Medical
-  group: market
-
-- type: cargoProduct
-  name: "flashlight"
-  id: cargo.flashlight
-  description: "Shine a light in the dark."
-  icon:
-    sprite: Objects/Tools/flashlight.rsi
-    state: lantern_off
-  product: CrateFlashlights
-  cost: 3000
-  category: Engineering
-  group: market
-
-- type: cargoProduct
-  name: "light bulb"
-  id: cargo.lightbulb
-  description: "Light up a room, anywhere, anytime. Electricity not included."
-  icon:
-    sprite: Objects/Power/light_tube.rsi
-    state: normal
-  product: CrateLightBulb
-  cost: 200
-  category: Engineering
-  group: market
-
-- type: cargoProduct
-  name: "fire extinguisher"
-  id: cargo.fireextinguisher
-  description: "Puts out fires. Or propels you in space."
-  icon:
-    sprite: Objects/Misc/fire_extinguisher.rsi
-    state: fire_extinguisher_closed
-  product: CrateFireExtinguisher
-  cost: 300
-  category: Other
-  group: market
-
-- type: cargoProduct
-  name: "pen"
-  id: cargo.pen
-  description: "Expels ink. Use it to write, or stab someone."
-  icon:
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen
-  product: CratePen
-  cost: 10
-  category: Other
-  group: market
-
-- type: cargoProduct
-  name: "bike horn"
-  id: cargo.bikehorn
-  description: "HONK!"
-  icon:
-    sprite: Objects/Fun/bikehorn.rsi
-    state: icon
-  product: CrateBikeHorn
-  cost: 300
-  category: Other
-  group: market
-
-- type: cargoProduct
-  name: "cleaver"
-  id: cargo.cleaver
-  description: "That's not a knife, THAT'S a knife."
-  icon:
-    sprite: Objects/Weapons/Melee/cleaver.rsi
-    state: butch
-  product: CrateCleaver
-  cost: 300
-  category: Other
-  group: blackmarket
-
-- type: cargoProduct
-  name: "fuel tank"
-  id: cargo.fueltank
-  description: "Movable fuel tank for welders. No boom boom."
-  icon:
-    sprite: Constructible/Misc/tanks.rsi
-    state: fueltank
-  product: CrateFuelTank
-  cost: 200
-  category: Engineering
-  group: market
-
-- type: cargoProduct
-  name: "medical scanner"
-  id: cargo.medscanner
-  description: "Scans patients. First we stick this probe..."
-  icon:
-    sprite: Constructible/Power/medical_scanner.rsi
-    state: scanner_open
-  product: CrateMedicalScanner
-  cost: 400
-  category: Medical
-  group: market
-
-- type: cargoProduct
-  name: "glass crate"
-  id: cargo.glass
-  description: "50 sheets of glass."
-  icon:
-    sprite: Objects/Materials/sheets.rsi
-    state: glass
-  product: CrateGlass
-  cost: 50
-  category: Engineering
-  group: market
-
-- type: cargoProduct
-  name: "cable crate"
-  id: cargo.cable
-  description: "50 coils of cable."
-  icon:
-    sprite: Objects/Tools/cables.rsi
-    state: coilall-30
-  product: CrateCable
-  cost: 50
-  category: Engineering
-  group: market

Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml

@@ -0,0 +1,58 @@
+- type: entity
+  id: ComputerSupplyOrdering
+  parent: ComputerBase
+  name: Cargo ordering computer
+  description: Used to order supplies, approve requests, and control the shuttle.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: supply
+  - type: CargoConsole
+  - type: CargoOrderDatabase
+  - type: GalacticMarket
+    static: true
+    products:
+      - cargo.emergencyexplosive
+      - cargo.emergencyfire
+      - cargo.emergencyinternals
+      - cargo.emergencyradiation
+      - cargo.armorysmg
+      - cargo.armoryshotgun
+      - cargo.securityarmor
+      - cargo.securityriot
+      - cargo.securitylaser
+      - cargo.securityhelmet
+      - cargo.securitysupplies
+      - cargo.securitynonlethal
+      - cargo.hydroponics
+      - cargo.hydroponicsseeds
+      - cargo.hydroponicsseedsexotic
+      - cargo.servicejanitorial
+      - cargo.servicelightsreplacement
+      - cargo.funplushies
+      - cargo.funartsupplies
+      - cargo.funinstruments
+  - type: UserInterface
+    interfaces:
+    - key: enum.CargoConsoleUiKey.Key
+      type: CargoConsoleBoundUserInterface
+  - type: Computer
+    board: SupplyComputerCircuitboard
+
+- type: entity
+  id: ComputerSupplyRequest
+  parent: ComputerSupplyOrdering
+  name: cargo request computer
+  description: Used to request supplies from cargo.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: request
+  - type: CargoConsole
+    requestOnly: true
+  - type: Computer
+    board: SupplyRequestComputerCircuitboard

Resources/Prototypes/Entities/Constructible/Power/computers.yml

@@ -139,57 +139,6 @@
       key: power_key
       screen: power_monitor
 
-- type: entity
-  id: ComputerSupplyOrdering
-  parent: ComputerBase
-  name: Cargo ordering computer
-  description: Used to order supplies, approve requests, and control the shuttle.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: supply
-  - type: CargoConsole
-  - type: CargoOrderDatabase
-  - type: GalacticMarket
-    static: true
-    products:
-      - cargo.dice
-      - cargo.Medkit
-      - cargo.flashlight
-      - cargo.lightblub
-      - cargo.fireextinguisher
-      - cargo.pen
-      - cargo.bikehorn
-      - cargo.cleaver
-      - cargo.fueltank
-      - cargo.medscanner
-      - cargo.glass
-      - cargo.cable
-  - type: UserInterface
-    interfaces:
-    - key: enum.CargoConsoleUiKey.Key
-      type: CargoConsoleBoundUserInterface
-  - type: Computer
-    board: SupplyComputerCircuitboard
-
-- type: entity
-  id: ComputerSupplyRequest
-  parent: ComputerSupplyOrdering
-  name: cargo request computer
-  description: Used to request supplies from cargo.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: request
-  - type: CargoConsole
-    requestOnly: true
-  - type: Computer
-    board: SupplyRequestComputerCircuitboard
-
 - type: entity
   id: ComputerMedicalRecords
   parent: ComputerBase

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_armory.yml

@@ -0,0 +1,25 @@
+- type: entity
+  id: CrateArmorySMG
+  name: smg crate
+  parent: CrateWeaponSecure
+  description: "Contains three high-powered, semiautomatic rifles with six mags. Requires Armory access to open."
+  components:
+  - type: StorageFill
+    contents:
+      - name: SmgC20r
+        amount: 3
+      - name: MagazinePistolSmg
+        amount: 6
+
+- type: entity
+  id: CrateArmoryShotgun
+  name: shotgun crate
+  parent: CrateWeaponSecure
+  description: "For when the enemy absolutely needs to be replaced with lead. Contains three Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
+  components:
+  - type: StorageFill
+    contents:
+      - name: ShotgunGladstone
+        amount: 3
+      - name: ShellShotgun
+        amount: 18

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml

@@ -0,0 +1,86 @@
+- type: entity
+  id: CrateHydroponicsSeedsExotic
+  name: exotic seeds crate
+  parent: CrateHydroSecure
+  description: "Any entrepreneuring botanist's dream. Contains many different exotic seeds. Requires Hydroponics access to open."
+  components:
+  - type: StorageFill
+    contents:
+      - name: BananaSeeds
+        amount: 2
+      - name: EggySeeds
+        amount: 2
+      - name: TowercapSeeds
+        amount: 2
+#      - name: NettleSeeds
+#        amount: 2
+#      - name: RainbowBunchSeeds
+#        amount: 2
+#      - name: StrangeSeeds
+#        amount: 2
+#      - name: BunchaOfMyceliumSeeds
+#        amount: 2
+
+- type: entity
+  id: CrateHydroponicsTools
+  name: hydroponics equipment crate
+  parent: CrateHydroponics
+  description: "Supplies for growing a great garden! Contains some spray bottles of plant chemicals, a hatchet, a mini-hoe, scythe, as well as a pair of leather gloves and a botanist's apron."
+  components:
+  - type: StorageFill
+    contents:
+      - name: MiniHoe
+        amount: 1
+      - name: PlantBGoneSpray
+        amount: 1
+      - name: WeedSpray
+        amount: 1
+      - name: PestSpray
+        amount: 1
+      - name: Scythe
+        amount: 1
+      - name: Hatchet
+        amount: 1
+      - name: ClothingOuterApronBotanist
+        amount: 1
+      - name: ClothingHandsGlovesLeather
+        amount: 1
+
+- type: entity
+  id: CrateHydroponicsSeeds
+  name: seeds crate
+  parent: CrateHydroponics
+  description: "Big things have small beginnings. Contains nine different seeds."
+  components:
+  - type: StorageFill
+    contents:
+#      - name: ChiliSeeds
+#        amount: 1
+#      - name: CottonSeeds
+#        amount: 1
+#      - name: BerrySeeds
+#        amount: 1
+      - name: CornSeeds
+        amount: 1
+      - name: EggplantSeeds
+        amount: 1
+      - name: TomatoSeeds
+        amount: 1
+#      - name: SoybeanSeeds
+#        amount: 1
+      - name: WheatSeeds
+        amount: 1
+#      - name: RiceSeeds
+#        amount: 1
+      - name: CarrotSeeds
+        amount: 1
+#      - name: SunflowerSeeds
+#        amount: 1
+      - name: ChanterelleSeeds
+        amount: 1
+      - name: PotatoSeeds
+        amount: 1
+      - name: SugarcaneSeeds
+        amount: 1
+      - name: LemonSeeds
+        amount: 1

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_emergency.yml

@@ -0,0 +1,73 @@
+- type: entity
+  id: CrateEmergencyExplosive
+  name: bomb suit crate
+  parent: CrateSecgear
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHeadHelmetBombSuit
+        amount: 1
+      - name: ClothingMaskGas
+        amount: 1
+      - name: Screwdriver
+        amount: 1
+      - name: Wirecutter
+        amount: 1
+      - name: Multitool
+        amount: 1
+      - name: ClothingOuterSuitBomb
+        amount: 1
+
+- type: entity
+  id: CrateEmergencyFire
+  name: firefighting crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: FlashlightLantern
+        amount: 2
+      - name: FireExtinguisher
+        amount: 2
+      - name: ClothingHeadHatHardhatRed
+        amount: 2
+      - name: ClothingMaskGas
+        amount: 2
+      - name: ClothingOuterSuitFire
+        amount: 2
+      - name: RedOxygenTank
+        amount: 2
+
+- type: entity
+  id: CrateEmergencyInternals
+  name: internals crate
+  parent: CrateInternals
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingMaskGas
+        amount: 3
+      - name: ClothingMaskBreath
+        amount: 3
+      - name: OxygenTankFilled
+        amount: 3
+      - name: EmergencyOxygenTankFilled
+        amount: 3
+
+- type: entity
+  id: CrateEmergencyRadiation
+  name: radiation protection crate
+  parent: CrateRadiation
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingOuterSuitRad
+        amount: 2
+      - name: ClothingHeadHatHoodRad
+        amount: 2
+#     - name: GeigerCounter
+#        amount: 2
+      - name: DrinkVodkaBottleFull
+        amount: 1
+      - name: DrinkShotGlass
+        amount: 2

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engineering.yml

@@ -0,0 +1,45 @@
+- type: entity
+  id: CrateEngineeringGear
+  name: engineering gear crate
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingBeltUtility
+        amount: 2
+      - name: ClothingEyesGlassesMeson
+        amount: 2
+      - name: ClothingHeadHatHardhatYellow
+        amount: 2
+      - name: ClothingHeadHatWeldingMaskFlame # Replace with regular welding mask when we have it.
+        amount: 2
+      - name: ClothingOuterVestHazard
+        amount: 3
+      - name: ClothingHandsGlovesColorYellow
+        amount: 2
+
+- type: entity
+  id: CrateEngineeringToolbox
+  name: toolbox crate
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - name: ToolboxMechanical
+        amount: 2
+      - name: ToolboxElectricalFilled
+        amount: 2
+
+#- type: entity
+#  id: CrateEngineeringPowercell
+#  name:  ame crate
+#  parent: CrateElectrical
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: PowerCellLargeStandard
+#        amount: 3
+#      - name: PowerCellMediumStandard
+#        amount: 3
+#      - name: PowerCellSmallAutorecharge
+#        amount: 3

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engines.yml

@@ -0,0 +1,23 @@
+- type: entity
+  id: CrateEngineeringAME
+  name:  ame crate
+  parent: CrateRadiation
+  components:
+  - type: StorageFill
+    contents:
+      - name: Multitool
+        amount: 1
+      - name: AMEPart
+        amount: 9
+      - name: AMEJar
+        amount: 1
+
+- type: entity
+  id: CrateEngineeringGenerator
+  name: generator crate
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - name: DebugGenerator
+        amount: 1

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_food.yml

@@ -0,0 +1 @@
+# Bro what do I PUT here

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_fun.yml

@@ -0,0 +1,70 @@
+- type: entity
+  id: CrateFunPlushie
+  name: plushie crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: PlushieBee
+        amount: 1
+      - name: PlushieNar
+        amount: 1
+      - name: PlushieCarp
+        amount: 1
+      - name: PlushieNuke
+        amount: 1
+      - name: PlushieSmug
+        amount: 1
+      - name: PlushieSlime
+        amount: 1
+      - name: PlushieSnake
+        amount: 1
+      - name: PlushieLizard
+        amount: 1
+
+- type: entity
+  id: CrateFunInstruments
+  name: big band instrument collection
+  description: Get your sad station movin' and groovin' with this fine collection! Contains thirteen different instruments.
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: SynthesizerInstrument
+        amount: 1
+      - name: AcousticGuitarInstrument
+        amount: 1
+      - name: ViolinInstrument
+        amount: 1
+      - name: TrumpetInstrument
+        amount: 1
+      - name: ElectricGuitarInstrument
+        amount: 1
+      - name: AccordionInstrument
+        amount: 1
+      - name: HarmonicaInstrument
+        amount: 1
+      - name: RecorderInstrument
+        amount: 1
+      - name: TromboneInstrument
+        amount: 1
+      - name: SaxophoneInstrument
+        amount: 1
+      - name: GlockenspielInstrument
+        amount: 1
+      - name: BanjoInstrument
+        amount: 1
+      - name: BikeHornInstrument
+        amount: 1
+
+- type: entity
+  id: CrateFunArtSupplies
+  name: art supplies
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: CrayonBoxFilled
+        amount: 1
+      - name: CrayonWhite
+        amount: 1

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_materials.yml

@@ -0,0 +1,91 @@
+- type: entity
+  id: CrateMaterialsGlass
+  name:  glass crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: GlassStack
+        amount: 1
+
+- type: entity
+  id: CrateMaterialsMetal
+  name:  metals crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: MetalStack
+        amount: 1
+
+- type: entity
+  id: CrateMaterialsWood
+  name:  wood crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: WoodPlank
+        amount: 15
+
+- type: entity
+  id: CrateMaterialsFuelTank
+  name:  fueltank crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: WeldingFuelTank
+        amount: 1
+
+#- type: entity
+#  id: CrateMaterialsHFuelTank
+#  name:  fueltank crate
+#  parent: CrateGenericonimo
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: WeldingFuelTank
+#        amount: 1
+
+- type: entity
+  id: CrateMaterialsWaterTank
+  name:  watertank crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: WaterTankFull
+        amount: 1
+
+#- type: entity
+#  id: CrateMaterialsHWaterTank
+#  name:  watertank crate
+#  parent: CrateGenericonimo
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: WaterTankFull
+#        amount: 1
+
+# Unimplemented Materials
+
+#- type: entity
+#  id: CrateMaterialsPlastic
+#  name:  plastics crate
+#  parent: CrateGenericonimo
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: PlasticStack
+#        amount: 1
+
+#- type: entity
+#  id: CrateMaterialsPlasteel
+#  name: plasteel crate
+#  parent: CrateGenericonimo
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: PlasteelStack
+#        amount: 1

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml

@@ -0,0 +1,67 @@
+- type: entity
+  id: CrateMedicalDefib
+  name:  defibrillator crate
+  parent: CrateMedical
+  components:
+  - type: StorageFill
+#    contents:
+#      - name: Defibrillator
+#        amount: 1
+
+- type: entity
+  id: CrateMedicalSupplies
+  name: medical supplies crate
+  parent: CrateMedical
+  components:
+  - type: StorageFill
+    contents:
+      - name: MedkitFilled
+        amount: 2
+      - name: Gauze
+        amount: 2
+
+- type: entity
+  id: CrateMedicalSurgery
+  name: surgical supplies crate
+  parent: CrateSurgery
+  components:
+  - type: StorageFill
+    contents:
+      - name: Scalpel
+        amount: 1
+      - name: Retractor
+        amount: 1
+      - name: Cautery
+        amount: 1
+      - name: Drill
+        amount: 1
+      - name: BoneSaw
+        amount: 1
+      - name: Hemostat
+        amount: 1
+      - name: ClothingMaskSterile
+        amount: 1
+      - name: PlushieSmug
+        amount: 1
+
+- type: entity
+  id: CrateMedicalScrubs
+  name: medical scrubs crate
+  parent: CrateMedical
+  components:
+  - type: StorageFill
+    contents:
+      - name: UniformScrubsColorGreen
+        amount: 1
+      - name: UniformScrubsColorPurple
+        amount: 1
+      - name: UniformScrubsColorBlue
+        amount: 1
+      - name: HatBandBlue
+        amount: 1
+      - name: HatBandRed
+        amount: 1
+      - name: HatBandGreen
+        amount: 1
+      - name: ClothingMaskSterile
+        amount: 3

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_npc

@@ -0,0 +1,69 @@
+- type: entity
+  id: CrateNPCGoat
+  name: goat crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: GoatMob_Content
+        amount: 1
+
+- type: entity
+  id: CrateNPCButterflies
+  name: crate of butterflies
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: ButterflyMob_Content
+        amount: 10
+
+- type: entity
+  id: CrateNPCCorgi
+  name: corgi crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: CorgiMob_Content
+        amount: 1
+
+- type: entity
+  id: CrateNPCCat
+  name: cat crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: CatMob_Content
+        amount: 1
+
+- type: entity
+  id: CrateNPCSnake
+  name: snake crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: SnakeMob_Content
+        amount: 3
+
+- type: entity
+  id: CrateNPCMonkeyCube
+  name: monkey cube crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: FoodContainerMonkeyCubeBox
+        amount: 1
+
+- type: entity
+  id: CrateNPCParrot
+  name: parrot crate
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: ParrotMob_Content
+        amount: 3

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_science.yml

@@ -0,0 +1 @@
+# Bro what do I PUT here

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_security.yml

@@ -0,0 +1,84 @@
+- type: entity
+  id: CrateSecurityArmor
+  name: armor crate
+  parent: CrateSecgear
+  description: "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingOuterArmorBulletproof
+        amount: 3
+
+- type: entity
+  id: CrateSecurityHelmet
+  name: helmet crate
+  parent: CrateSecgear
+  description: "Contains three standard-issue brain buckets. Requires Security access to open."
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHeadHelmetHelmet
+        amount: 3
+
+- type: entity
+  id: CrateSecurityNonlethal
+  name: nonlethals crate
+  parent: CrateSecgear
+  components:
+  - type: StorageFill
+    contents:
+      - name: TaserGun
+        amount: 3
+      - name: Stunbaton
+        amount: 3
+      - name: BoxFlashbang
+        amount: 1
+      - name: Flash
+        amount: 3
+#      - Pepperspray
+#      - GrenadeTeargas
+
+- type: entity
+  id: CrateSecurityLaser
+  name: lasers crate
+  parent: CrateSecgear
+  components:
+  - type: StorageFill
+    contents:
+      - name: LaserGun
+        amount: 3
+
+- type: entity
+  id: CrateSecurityRiot
+  name: swat crate
+  parent: CrateSecgear
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingOuterArmorRiot
+        amount: 2
+      - name: ClothingHeadHelmetRiot
+        amount: 2
+      - name: ShotgunGladstone
+        amount: 2
+      - name: ShellShotgunBeanbag
+        amount: 12
+#      - ShieldRiot
+#      - SecGasmask
+
+- type: entity
+  id: CrateSecuritySupplies
+  name: security supplies crate
+  parent: CrateSecgear
+  components:
+  - type: StorageFill
+    contents:
+      - name: BoxHandcuff
+        amount: 1
+      - name: BoxSechud
+        amount: 1
+#      - SecBelt
+#      - SecGasmask
+#      - SpacelawBook
+
+# Cosmetic Crates

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml

@@ -0,0 +1,33 @@
+- type: entity
+  id: CrateServiceJanitorialSupplies
+  name: janitorial supplies crate
+  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag.
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - name: MopItem
+        amount: 1
+      - name: MopBucket
+        amount: 1
+      - name: Bucket
+        amount: 3
+      - name: WetFloorSign
+        amount: 2
+      - name: Soap
+        amount: 1
+      - name: SprayBottleSpaceCleaner
+        amount: 2
+
+- type: entity
+  id: CrateServiceReplacementLights
+  name: replacement lights crate
+  description: May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs.
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: BoxLighttube
+        amount: 5
+      - name: BoxLightbulb
+        amount: 5

Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml

@@ -1,15 +1,19 @@
-- type: entity
+- type: entity
   id: CrateGeneric
+  abstract: true
   name: crate
   description: A large container for items.
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Structures/Crates/generic.rsi
+    sprite: Constructible/Storage/Crates/generic.rsi
     layers:
     - state: crate
     - state: crate_door
       map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -17,7 +21,7 @@
     anchored: false
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.4, -0.4, 0.4, 0.4"
+      bounds: "-0.4, -0.4, 0.29, 0.4"
       mask:
       - Impassable
       - MobImpassable
@@ -28,8 +32,8 @@
       - MobImpassable
       - SmallImpassable
   - type: EntityStorage
-    capacity: 60
-    CanWeldShut: false
+    Capacity: 500
+    CanWeldShut: true
   - type: PlaceableSurface
   - type: Destructible
     deadThreshold: 100
@@ -41,4 +45,5 @@
       state_open: crate_open
       state_closed: crate_door
   - type: LoopingSound
+  - type: Anchorable
   - type: Pullable

Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml

@@ -0,0 +1,529 @@
+- type: entity
+  id: CrateGenericonimo
+  name: crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/generic.rsi
+    layers:
+    - state: crate
+    - state: crate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/generic.rsi
+    state: crate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: crate_open
+      state_closed: crate_door
+
+- type: entity
+  id: CratePlastic
+  name: plastic crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/plastic.rsi
+    layers:
+    - state: plasticcrate
+    - state: plasticcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/plastic.rsi
+    state: plasticcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: plasticcrate_open
+      state_closed: plasticcrate_door
+
+- type: entity
+  id: CrateFreezer
+  name: freezer
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/freezer.rsi
+    layers:
+    - state: freezer
+    - state: freezer_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/freezer.rsi
+    state: freezer_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: freezer_open
+      state_closed: freezer_door
+
+- type: entity
+  id: CrateHydroponics
+  name: hydroponics crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/hydro.rsi
+    layers:
+    - state: hydrocrate
+    - state: hydrocrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/hydro.rsi
+    state: hydrocrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: hydrocrate_open
+      state_closed: hydrocrate_door
+
+- type: entity
+  id: CrateMedical
+  name: medical crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/medical.rsi
+    layers:
+    - state: medicalcrate
+    - state: medicalcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/medical.rsi
+    state: medicalcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: medicalcrate_open
+      state_closed: medicalcrate_door
+
+- type: entity
+  id: CrateRadiation
+  name: radiation gear crate
+  description: Is not actually lead lined. Do not store your plutonium in this.
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/radiation.rsi
+    layers:
+    - state: radiationcrate
+    - state: radiationcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/radiation.rsi
+    state: radiationcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: radiationcrate_open
+      state_closed: radiationcrate_door
+
+- type: entity
+  id: CrateInternals
+  name: oxygen crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/o2.rsi
+    layers:
+    - state: o2crate
+    - state: o2crate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/o2.rsi
+    state: o2crate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: o2crate_open
+      state_closed: o2crate_door
+
+- type: entity
+  id: CrateElectrical
+  name: electrical crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/electricalcrate.rsi
+    layers:
+    - state: electricalcrate
+    - state: electricalcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/electricalcrate.rsi
+    state: electricalcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: electricalcrate_open
+      state_closed: electricalcrate_door
+
+- type: entity
+  id: CrateEngineering
+  name: engineering crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/engicrate.rsi
+    layers:
+    - state: engicrate
+    - state: engicrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/engicrate.rsi
+    state: engicrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: engicrate_open
+      state_closed: engicrate_door
+
+- type: entity
+  id: CrateScience
+  name: science crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/scicrate.rsi
+    layers:
+    - state: scicrate
+    - state: scicrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/scicrate.rsi
+    state: scicrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: scicrate_open
+      state_closed: scicrate_door
+
+- type: entity
+  id: CrateSurgery
+  name: surgery crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/surgerycrate.rsi
+    layers:
+    - state: surgerycrate
+    - state: surgerycrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/surgerycrate.rsi
+    state: surgerycrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: surgerycrate_open
+      state_closed: surgerycrate_door
+
+# Secure Crates
+
+- type: entity
+  id: CrateSecgear
+  name: secgear crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/sec_gear.rsi
+    layers:
+    - state: secgearcrate
+    - state: secgearcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/sec_gear.rsi
+    state: secgearcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: secgearcrate_open
+      state_closed: secgearcrate_door
+
+- type: entity
+  id: CrateEngineeringSecure
+  name: secure engineering crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/engicrate_secure.rsi
+    layers:
+    - state: engicratesecure
+    - state: engicratesecure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/engicrate_secure.rsi
+    state: engicratesecure_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: engicratesecure_open
+      state_closed: engicratesecure_door
+
+- type: entity
+  id: CrateMedicalSecure
+  name: secure medical crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi
+    layers:
+    - state: medicalcratesecure
+    - state: medicalcratesecure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi
+    state: medicalcratesecure_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: medicalcratesecure_open
+      state_closed: medicalcratesecure_door
+
+- type: entity
+  id: CratePrivateSecure
+  name: private crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/privatecrate_secure.rsi
+    layers:
+    - state: privatecrate
+    - state: privatecrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/privatecrate_secure.rsi
+    state: privatecrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: privatecrate_open
+      state_closed: privatecrate_door
+
+- type: entity
+  id: CrateScienceSecure
+  name: secure science crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/scicrate_secure.rsi
+    layers:
+    - state: scicratesecure
+    - state: scicratesecure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/scicrate_secure.rsi
+    state: scicratesecure_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: scicratesecure_open
+      state_closed: scicratesecure_door
+
+- type: entity
+  id: CratePhoron
+  name: phoron crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/phoron.rsi
+    layers:
+    - state: phoroncrate
+    - state: phoroncrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/phoron.rsi
+    state: phoroncrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: phoroncrate_open
+      state_closed: phoroncrate_door
+
+- type: entity
+  id: CrateSecure
+  name: secure crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/secure.rsi
+    layers:
+    - state: securecrate
+    - state: securecrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/secure.rsi
+    state: securecrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: securecrate_open
+      state_closed: securecrate_door
+
+- type: entity
+  id: CrateHydroSecure
+  name: secure hydroponics crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/hydro_secure.rsi
+    layers:
+    - state: hydrocratesecure
+    - state: hydrocratesecure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/hydro_secure.rsi
+    state: hydrocratesecure_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: hydrocratesecure_open
+      state_closed: hydrocratesecure_door
+
+- type: entity
+  id: CrateWeaponSecure
+  name: secure weapon crate
+  parent: CrateGeneric
+  components:
+  - type: AccessReader
+  - type: SecureEntityStorage
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/weapon.rsi
+    layers:
+    - state: weaponcrate
+    - state: weaponcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+  - type: Icon
+    sprite: Constructible/Storage/Crates/weapon.rsi
+    state: weaponcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: weaponcrate_open
+      state_closed: weaponcrate_door
+
+#### REMOVE THIS SWEPT!!
+
+- type: entity
+  id: CrateLightBulb
+  name: plastic crate
+  parent: CrateGeneric
+  components:
+  - type: Sprite
+    sprite: Constructible/Storage/Crates/plastic.rsi
+    layers:
+    - state: plasticcrate
+    - state: plasticcrate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Storage/Crates/plastic.rsi
+    state: plasticcrate_icon
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: plasticcrate_open
+      state_closed: plasticcrate_door

Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml

@@ -1,108 +0,0 @@
-- type: entity
-  id: CratePlastic
-  parent: CrateGeneric
-  name: plastic crate
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/plastic.rsi
-    layers:
-    - state: plasticcrate
-    - state: plasticcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: plasticcrate_open
-      state_closed: plasticcrate_door
-
-
-- type: entity
-  id: CrateFreezer
-  parent: CrateGeneric
-  name: freezer
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/freezer.rsi
-    layers:
-    - state: freezer
-    - state: freezer_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: freezer_open
-      state_closed: freezer_door
-
-
-- type: entity
-  id: CrateHydroponics
-  parent: CrateGeneric
-  name: hydroponics crate
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/hydro.rsi
-    layers:
-    - state: hydrocrate
-    - state: hydrocrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: hydrocrate_open
-      state_closed: hydrocrate_door
-
-
-- type: entity
-  id: CrateMedical
-  parent: CrateGeneric
-  name: medical crate
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/medical.rsi
-    layers:
-    - state: medicalcrate
-    - state: medicalcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: medicalcrate_open
-      state_closed: medicalcrate_door
-
-
-- type: entity
-  id: CrateRadiation
-  name: radiation gear crate
-  parent: CrateGeneric
-  description: Is not actually lead lined. Do not store your plutonium in this.
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/radiation.rsi
-    layers:
-    - state: radiationcrate
-    - state: radiationcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: radiationcrate_open
-      state_closed: radiationcrate_door
-
-
-- type: entity
-  id: CrateInternals
-  parent: CrateGeneric
-  name: internals crate
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Crates/o2.rsi
-    layers:
-    - state: o2crate
-    - state: o2crate_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: o2crate_open
-      state_closed: o2crate_door
-

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -60,6 +60,21 @@
   - type: UseDelay
     delay: 1.0
 
+- type: entity
+  name: giant smug plushie
+  parent: BaseItem
+  id: PlushieSmug
+  description: Its smug aura compells you to perform surgery with a slightly higher degree of skill.
+  components:
+  - type: Toys
+  - type: LoopingSound
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: giantsmugplushie
+  - type: ItemCooldown
+  - type: UseDelay
+    delay: 1.0
+
 - type: entity
   name: carp plushie
   parent: BaseItem

Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "electricalcrate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "electricalcrate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "electricalcrate_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "electricalcrate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "engicrate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "engicrate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "engicrate_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "engicrate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "engicratesecure",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "engicratesecure_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "engicratesecure_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "unlocked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "off",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "locked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "engicratesecure_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/freezer.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "freezer",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "freezer_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "freezer_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "freezer_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/generic.rsi/meta.json

@@ -1,26 +1,32 @@
 {
     "version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "lock_locked",
+            "name": "crate",
             "select": [],
             "flags": {},
             "directions": 1
         },
         {
-            "name": "lock_off",
+            "name": "crate_door",
             "select": [],
             "flags": {},
             "directions": 1
         },
         {
-            "name": "lock_unlocked",
+            "name": "crate_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
             "select": [],
             "flags": {},
             "directions": 1
@@ -31,6 +37,12 @@
             "flags": {},
             "directions": 1,
             "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "crate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
         }
     ]
 }

Resources/Textures/Constructible/Storage/Crates/hydro.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "hydrocrate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "hydrocrate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "hydrocrate_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "hydrocrate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "hydrocratesecure",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "hydrocratesecure_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "hydrocratesecure_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "unlocked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "off",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "locked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "hydrocratesecure_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/medical.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "medicalcrate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "medicalcrate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "medicalcrate_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "medicalcrate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "medicalcratesecure",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "medicalcratesecure_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "medicalcratesecure_icon",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "unlocked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "off",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "locked",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "sparking",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
+        },
+        {
+            "name": "medicalcratesecure_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}