From: iaada Date: Sat, 26 Jul 2025 01:16:36 +0000 (-0500) Subject: atomize X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=69a404e2913b3991a087b36d9019e2d8f17309ae;p=space-station-14.git atomize --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 8627c703f1..55902897ba 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -65,6 +65,28 @@ - type: Item sprite: Objects/Consumable/Drinks/cola.rsi +# created when taking apart an ied +- type: entity + parent: [ BaseDrinkOpenableOpen, DrinkColaCan ] + id: DrinkColaCanEmpty + suffix: Empty + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + grindable: + reagents: + - ReagentId: Aluminium + Quantity: 4 + - ReagentId: Iron + Quantity: 1 + - type: Tag + tags: + - Cola + - DrinkCan + - Trash + - type: entity parent: DrinkCanBaseFull id: DrinkIcedTeaCan diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml deleted file mode 100644 index e4db6f4365..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans_empty.yml +++ /dev/null @@ -1,177 +0,0 @@ -# When adding new drinks also add to random spawner located in Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml -- type: entity - abstract: true - parent: [ BaseDrinkOpenableOpen, 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: 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, DrinkRootBeerCan ] - id: DrinkRootBeerCanEmpty - name: root beer can - description: Some of that tasty root beer goodness, now in a portable can! - 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