From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Mon, 8 Jan 2024 06:27:40 +0000 (+1100)
Subject: Dehydrated cube box overhaul (#23685)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2cf4ba8a4758e0fe46986b15759524a96b171c77;p=space-station-14.git

Dehydrated cube box overhaul (#23685)

* add

* yes

* fix
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index eb5d5cd76e..6ef0ab4e21 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -121,8 +121,8 @@
 - type: cargoProduct
   id: LivestockMonkeyCube
   icon:
-    sprite: Mobs/Animals/monkey.rsi
-    state: monkey
+    sprite: Objects/Misc/monkeycube.rsi
+    state: box
   product: CrateNPCMonkeyCube
   cost: 2000
   category: Livestock
@@ -131,8 +131,8 @@
 - type: cargoProduct
   id: LivestockKoboldCube
   icon:
-    sprite: Mobs/Animals/kobold.rsi
-    state: kobold
+    sprite: Objects/Misc/monkeycube.rsi
+    state: box_kobold
   product: CrateNPCKoboldCube
   cost: 2000
   category: Livestock
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index f31e2ff071..ddb7710267 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -33,7 +33,7 @@
   - type: StorageFill
     contents:
       - id: CrowbarRed
-      - id: MonkeyCubeBox
+      - id: VariantCubeBox
       - id: BoxMousetrap
         amount: 2
       - id: SprayBottleWater
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index f76b640ec7..c662ef5adc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -12,7 +12,7 @@
     FoodCondimentBottleBBQ: 1
     FoodCondimentBottleVinegar: 2
     ReagentContainerOliveoil: 2
-    MonkeyCubeBox: 1
+    VariantCubeBox: 1
     FoodContainerEgg: 1
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index acb04c2234..1490af88ca 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -8,6 +8,9 @@
     contents:
       - id: MonkeyCubeWrapped
         amount: 6
+  - type: Storage
+    grid:
+    - 0,0,2,1
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: box
@@ -34,7 +37,7 @@
     - MonkeyCube
 
 - type: entity
-  parent: BoxCardboard
+  parent: MonkeyCubeBox
   name: kobold cube box
   id: KoboldCubeBox
   description: Condensed kobolds in a cube. Just add water!
@@ -45,17 +48,31 @@
         amount: 6
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
-    state: box
+    state: box_kobold
 
 - type: entity
-  parent: BaseItem
+  parent: MonkeyCubeBox
+  name: variant cube box
+  id: VariantCubeBox
+  description: Both kobold cubes and monkey cubes. Just add water!
+  components:
+  - type: StorageFill
+    contents:
+      - id: KoboldCubeWrapped
+        amount: 3
+      - id: MonkeyCubeWrapped
+        amount: 3
+  - type: Sprite
+    sprite: Objects/Misc/monkeycube.rsi
+    state: box_variant
+
+- type: entity
+  parent: MonkeyCubeWrapped
   name: kobold cube
   suffix: Wrapped
   id: KoboldCubeWrapped
   description: Unwrap this to get a kobold cube.
   components:
-  - type: Item
-    size: Tiny
   - type: SpawnItemsOnUse
     items:
       - id: KoboldCube
@@ -63,13 +80,10 @@
       path: /Audio/Effects/unwrap.ogg
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
-    state: wrapper
-  - type: Tag
-    tags:
-    - MonkeyCube
+    state: wrapper_kobold
 
 - type: entity
-  parent: BoxCardboard
+  parent: MonkeyCubeBox
   name: monkey cube box
   suffix: Syndicate
   id: SyndicateSpongeBox
@@ -88,7 +102,7 @@
     state: box
 
 - type: entity
-  parent: BaseItem
+  parent: MonkeyCubeWrapped
   name: monkey cube
   suffix: Wrapped, Syndicate
   id: SyndicateSpongeWrapped
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png
new file mode 100644
index 0000000000..94f5f80e00
Binary files /dev/null and b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png differ
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png
new file mode 100644
index 0000000000..ae9830f19f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png differ
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
index e990b48b2f..8520a51e1b 100644
--- a/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. box_kobold, box_variant and wrapper_kobold are edited versions of the raw sprites by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,11 +10,20 @@
     {
       "name": "box"
     },
+    {
+      "name": "box_kobold"
+    },
+    {
+      "name": "box_variant"
+    },
     {
       "name": "cube"
     },
     {
       "name": "wrapper"
+    },
+    {
+      "name": "wrapper_kobold"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_kobold.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_kobold.png
new file mode 100644
index 0000000000..06b3ece147
Binary files /dev/null and b/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_kobold.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index d54dbd6eab..8de131d87b 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -127,3 +127,7 @@ SpawnPointAssistant: SpawnPointPassenger
 # 2024-01-05
 DrinkGoldschlagerBottleFull: DrinkGildlagerBottleFull
 DrinkGoldschlagerGlass: DrinkGildlagerGlass
+
+# 2024-01-07
+MonkeyCubeBox: VariantCubeBox
+