The Beverage Jug Can Now Look Open (#36070)

* GenJug-Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Guh

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Support For the Rest

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* New Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Newest Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 70236ecc525dfaa97298a7ad69ab7a474c68ff60..0a712faa090afdc04932ce0e8af4c30ac920bf5e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -771,7 +771,7 @@
 #boring jugs some more sprites are made
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkSugarJug
   name: sugar jug
   suffix: For Drinks, Full
@@ -789,7 +789,7 @@
     currentLabel: reagent-name-sugar
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkLemonLimeJug
   name: Smite jug
   description: A dual citrus sensation.
@@ -806,7 +806,7 @@
     currentLabel: reagent-name-lemon-lime
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkMeadJug
   name: mead jug
   description: Storing mead in a plastic jug should be a crime.
@@ -823,7 +823,7 @@
     currentLabel: reagent-name-mead
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkIceJug
   name: ice jug
   description: Stubborn water. Pretty cool.
@@ -840,7 +840,7 @@
     currentLabel: reagent-name-ice
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkCoconutWaterJug
   name: coconut water jug
   description: It's on the inside of the coconut that counts.
@@ -857,7 +857,7 @@
     currentLabel: reagent-name-coconut-water
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkCoffeeJug
   name: coffee jug
   description: Wake up juice, of the heated kind.
@@ -874,7 +874,7 @@
     currentLabel: reagent-name-coffee
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkTeaJug
   name: tea jug
   description: The drink of choice for the Bri'ish and hipsters.
@@ -891,7 +891,7 @@
     currentLabel: reagent-name-tea
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkGreenTeaJug
   name: green tea jug
   description: It's like tea... but green! great for settling the stomach.
@@ -908,7 +908,7 @@
     currentLabel: reagent-name-green-tea
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkIcedTeaJug
   name: iced tea jug
   description: For when the regular tea is too hot for you. Boohoo.
@@ -925,7 +925,7 @@
     currentLabel: reagent-name-iced-tea
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkDrGibbJug
   name: Dr. Gibb jug
   description: 42 different flavours... in a jug!
@@ -942,7 +942,7 @@
     currentLabel: reagent-name-dr-gibb
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkRootBeerJug
   name: root beer jug
   description: This drink makes Australians giggle.
@@ -959,7 +959,7 @@
     currentLabel: reagent-name-root-beer
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkWaterMelonJuiceJug
   name: watermelon juice jug
   description: May include leftover seeds.
@@ -976,7 +976,7 @@
     currentLabel: reagent-name-juice-watermelon
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkEnergyDrinkJug
   name: Red Bool jug
   description: A jug of Red Bool, with enough caffeine to kill a whole station.
@@ -993,7 +993,7 @@
     currentLabel: reagent-name-energy-drink
 
 - type: entity
-  parent: DrinkBottlePlasticBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: CustomDrinkJug
   name: beverage jug
   description: A jug for storing custom made drinks.

diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png
index 2cafc197fd3e170d984710508233adf973f37fe6..b225942035984743b6e57134fdf262170c6a2e40 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..d5ea96b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon_open.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..a4039a1dd1d96680f5fb9a25ced72101ce447496 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
@@ -1 +1,17 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open modified from icon by Prole0 (GitHub)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}