From 7f96244ec54e5e3757361310e1b81d5bf0722fa6 Mon Sep 17 00:00:00 2001 From: iaada Date: Thu, 24 Jul 2025 22:05:25 -0500 Subject: [PATCH] drink cans --- .../Objects/Consumable/Drinks/drinks_cans.yml | 54 +----- .../Consumable/Drinks/drinks_cans_empty.yml | 179 ++++++++++++++++++ 2 files changed, 187 insertions(+), 46 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index d933cbcd1b..46425f9afa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -1,8 +1,8 @@ # When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_soda.yml - type: entity + abstract: true parent: BaseItem id: DrinkCanBaseFull - abstract: true components: - type: Drink - type: Openable @@ -76,6 +76,8 @@ - DrinkCan - type: DnaSubstanceTrace +## + - type: entity parent: DrinkCanBaseFull id: DrinkColaCan @@ -99,43 +101,11 @@ tags: - Cola - DrinkCan - - Recyclable - type: Sprite sprite: Objects/Consumable/Drinks/cola.rsi - type: Item sprite: Objects/Consumable/Drinks/cola.rsi -# created when taking apart an ied -- type: entity - parent: DrinkColaCan - id: DrinkColaCanEmpty - suffix: empty - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 - - type: Openable - opened: true - - type: Sprite - sprite: Objects/Consumable/Drinks/cola.rsi - layers: - - state: icon_open - - type: Item - sprite: Objects/Consumable/Drinks/cola.rsi - - type: Tag - tags: - - Cola - - DrinkCan - - Recyclable - - Trash - - type: entity parent: DrinkCanBaseFull id: DrinkIcedTeaCan @@ -291,6 +261,7 @@ - type: Tag tags: - Beer + - DrinkCan - type: entity parent: DrinkCanBaseFull @@ -311,9 +282,10 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/sodawater.rsi + - type: Item + sprite: Objects/Consumable/Drinks/sodawater.rsi - type: entity parent: DrinkCanBaseFull @@ -430,9 +402,10 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/tonic.rsi + - type: Item + sprite: Objects/Consumable/Drinks/tonic.rsi - type: entity parent: DrinkCanBaseFull @@ -477,7 +450,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/changelingsting.rsi - type: Item @@ -502,7 +474,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/dr_gibb.rsi - type: Item @@ -531,10 +502,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Tag - tags: - - DrinkCan - - Recyclable - type: Sprite sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: Item @@ -559,7 +526,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/energy_drink.rsi - type: Item @@ -637,7 +603,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/shamblersjuice.rsi - type: Item @@ -662,7 +627,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/pwrgame.rsi - type: Item @@ -687,7 +651,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/beer_can.rsi - type: Item @@ -715,7 +678,6 @@ Quantity: 4 - ReagentId: Iron Quantity: 1 - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/wine_can.rsi - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml new file mode 100644 index 0000000000..69876527d4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml @@ -0,0 +1,179 @@ +# When adding new drinks also add to random spawner located in Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +- type: entity + abstract: true + parent: DrinkCanBaseFull + id: DrinkCanBaseEmpty + suffix: empty + components: + - type: Sprite + layers: + - state: icon_open + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + grindable: + reagents: + - ReagentId: Aluminium + Quantity: 4 + - ReagentId: Iron + Quantity: 1 + - type: Openable + opened: true + - type: Tag + tags: + - DrinkCan + - Trash + +## + +# created when taking apart an ied +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkColaCan ] + id: DrinkColaCanEmpty + name: Space Cola can + description: A sweet, carbonated soft drink. + components: + - type: Tag + tags: + - DrinkCan + - Trash + - Cola + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkIcedTeaCan ] + id: DrinkIcedTeaCanEmpty + name: iced tea can + description: A refreshing can of iced tea. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkLemonLimeCan ] + id: DrinkLemonLimeCanEmpty + name: Smite can + description: You wanted ORANGE. It gave you Lemon-Lime. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkLemonLimeCranberryCan ] + id: DrinkLemonLimeCranberryCanEmpty + name: Smite Cranberry can + description: Y'all want a Smite Cranberry? Beloved by administrators everywhere. Drink in moderation. A limited run for the holidays! + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkGrapeCan ] + id: DrinkGrapeCanEmpty + name: grape soda can + description: Sweetened drink with a grape flavor and a deep purple color. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkGrapeCan ] + id: DrinkGrapeCanEmpty + name: grape soda can + description: Sweetened drink with a grape flavor and a deep purple color. + components: + - type: Tag + tags: + - DrinkCan + - Trash + - Beer + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkSodaWaterCan ] + id: DrinkSodaWaterCanEmpty + name: soda water can + description: Soda water. Why not make a scotch and soda? + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkSpaceMountainWindCan ] + id: DrinkSpaceMountainWindCanEmpty + name: Space Solar Wind can + description: Blows right through you like a solar wind. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkSpaceUpCan ] + id: DrinkSpaceUpCanEmpty + name: Space-Up can + description: Tastes like a hull breach in your mouth. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkSolDryCan ] + id: DrinkSolDryCanEmpty + name: Sol Dry can + description: Sweet ginger soda from outer space! + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkStarkistCan ] + id: DrinkStarkistCanEmpty + name: Starkist can + description: The taste of a star in liquid form. And, a bit of tuna...? + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkTonicWaterCan ] + id: DrinkTonicWaterCanEmpty + name: tonic water can + description: Quinine tastes funny, but at least it'll keep that Space Malaria away. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkFourteenLokoCan ] + id: DrinkFourteenLokoCanEmpty + name: Fourteen Loko can + description: The MBO has advised crew members that consumption of Fourteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkChangelingStingCan ] + id: DrinkChangelingStingCanEmpty + name: Changeling Sting can + description: You take a tiny sip and feel a burning sensation... + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkDrGibbCan ] + id: DrinkDrGibbCanEmpty + name: Dr. Gibb can + description: A delicious blend of 42 different flavours. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkNukieCan ] + id: DrinkNukieCanEmpty + name: Blood-red Brew can + description: A home-brewed drink made from the crazed minds at the Syndicate. Not recommended by doctors. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkEnergyDrinkCan ] + id: DrinkEnergyDrinkCanEmpty + name: Red Bool can + description: A can of Red Bool, with enough caffeine to kill a horse. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkShamblersJuiceCan ] + id: DrinkShamblersJuiceCanEmpty + name: Shambler's Juice can + description: ~Shake me up some of that Shambler's Juice!~ + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkPwrGameCan ] + id: DrinkPwrGameCanEmpty + name: PWR Game can + description: The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to. + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkBeerCan ] + id: DrinkBeerCanEmpty + name: beer can + description: Small joy, big taste, no worries! + components: + - type: Tag + tags: + - DrinkCan + - Trash + - Beer + +- type: entity + parent: [ DrinkCanBaseEmpty, DrinkWineCan ] + id: DrinkWineCanEmpty + name: wine can + description: Your way to forgetting all worries and having fun! + components: + - type: Tag + tags: + - DrinkCan + - Trash + - Wine -- 2.51.2