From 58fb282023c21ac43712ee0221c811dc5dc31d8f Mon Sep 17 00:00:00 2001 From: Prole <172158352+Prole0@users.noreply.github.com> Date: Sun, 20 Apr 2025 13:36:22 -0700 Subject: [PATCH] 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> --- .../Consumable/Drinks/drinks_bottles.yml | 28 +++++++++--------- .../Drinks/generic_jug.rsi/icon.png | Bin 5433 -> 313 bytes .../Drinks/generic_jug.rsi/icon_open.png | Bin 0 -> 332 bytes .../Drinks/generic_jug.rsi/meta.json | 18 ++++++++++- 4 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon_open.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 70236ecc52..0a712faa09 100644 --- 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 GIT binary patch delta 287 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 b^b1pVLYVqgp^IC9zGCon^>bP0l+XkKhWdi- literal 0 HcmV?d00001 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 db0ac608ed..a4039a1dd1 100644 --- 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" + } + ] +} -- 2.51.2