From bd773aef3bbe8e5804758ae706d02d3dafae5587 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Fri, 28 Feb 2020 05:58:43 -0800
Subject: [PATCH] Fix CargoProducts (#750)

---
 Resources/Prototypes/Cargo/products.yml       |   8 +-
 .../Entities/buildings/computers.yml          |  11 +-
 .../buildings/storage/crate_types.yml         | 124 +++++++++---------
 3 files changed, 78 insertions(+), 65 deletions(-)

diff --git a/Resources/Prototypes/Cargo/products.yml b/Resources/Prototypes/Cargo/products.yml
index db4cae1029..8871008d50 100644
--- a/Resources/Prototypes/Cargo/products.yml
+++ b/Resources/Prototypes/Cargo/products.yml
@@ -70,7 +70,9 @@
   name: "Bike Horn"
   id: cargo.bikehorn
   description: HONK!
-  icon: Objects/Fun/bikehorn.rsi
+  icon:
+    sprite: Objects/Fun/bikehorn.rsi
+    state: icon
   product: crate_bikehorn
   cost: 300
   category: Other
@@ -102,7 +104,9 @@
   name: "Medical Scanner"
   id: cargo.medscanner
   description: Scans patients. First we stick this probe...
-  icon: Buildings/medical_scanner.rsi
+  icon:
+    sprite: Buildings/medical_scanner.rsi
+    state: scanner_open
   product: crate_medscanner
   cost: 400
   category: Medical
diff --git a/Resources/Prototypes/Entities/buildings/computers.yml b/Resources/Prototypes/Entities/buildings/computers.yml
index ec0609296e..fff70844a8 100644
--- a/Resources/Prototypes/Entities/buildings/computers.yml
+++ b/Resources/Prototypes/Entities/buildings/computers.yml
@@ -83,8 +83,17 @@
     static: true
     products:
       - cargo.dice
-      - cargo.flashlight
       - 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
diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
index 6e571c5e11..737e723379 100644
--- a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
+++ b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
@@ -124,119 +124,119 @@
   name: Flashlight Crate (x5)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Flashlight
-        - Flashlight
-        - Flashlight
-        - Flashlight
-        - Flashlight
+  - type: StorageFill
+    contents:
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
 
 - type: entity
   id: crate_light_bulb
   name: Light Bulb Crate (x10)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
-        - Light Bulb
+  - type: StorageFill
+    contents:
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
 
 - type: entity
   id: crate_fire_extinguisher
   name: Fire Extinguisher Crate (x3)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Fire Extinguisher
-        - Fire Extinguisher
-        - Fire Extinguisher
+  - type: StorageFill
+    contents:
+      - fire_extinguisher
+      - fire_extinguisher
+      - fire_extinguisher
 
 - type: entity
   id: crate_pen
   name: Pen Crate (x10)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
-        - Pen
+  - type: StorageFill
+    contents:
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
 
 - type: entity
   id: crate_bikehorn
   name: Bike Horn Crate (x5)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Bike Horn
-        - Bike Horn
-        - Bike Horn
-        - Bike Horn
-        - Bike Horn
+  - type: StorageFill
+    contents:
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
 
 - type: entity
   id: crate_cleaver
   name: Cleaver Crate (x5)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Cleaver
-        - Cleaver
-        - Cleaver
-        - Cleaver
-        - Cleaver
+  - type: StorageFill
+    contents:
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
 
 - type: entity
   id: crate_fueltank
   name: Fuel Tank
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Fuel Tank
+  - type: StorageFill
+    contents:
+      - weldtank
 
 - type: entity
   id: crate_medscanner
   name: Medical Scanner
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - Medical Scanner
+  - type: StorageFill
+    contents:
+      - medical_scanner
 
 - type: entity
   id: crate_glass
   name: Glass Sheet Crate (x50)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - GlassStack
+  - type: StorageFill
+    contents:
+      - GlassStack
 
 - type: entity
   id: crate_cable
   name: Cable Coil Crate (x50)
   parent: crate_generic
   components:
-    - type: StorageFill
-      contents:
-        - CableStack
+  - type: StorageFill
+    contents:
+      - CableStack