From ddc192ac1ace6c3fad02f2a4e9e7464cf180c88d Mon Sep 17 00:00:00 2001 From: iaada Date: Fri, 25 Jul 2025 20:12:19 -0500 Subject: [PATCH] cleanup pass --- .../Drinks/drinks_bottles_glass.yml | 2 + .../Objects/Consumable/Drinks/drinks_cans.yml | 57 +------------------ .../Objects/Consumable/Drinks/drinks_cups.yml | 4 +- .../Consumable/Drinks/drinks_flasks.yml | 38 +++++-------- .../Consumable/Drinks/drinks_special.yml | 53 +++++++++++++++++ 5 files changed, 73 insertions(+), 81 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml index b8e7b5c4ef..61d97558a4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml @@ -386,6 +386,8 @@ - Wine - DrinkBottle +# Extra large bottles + - type: entity parent: [DrinkVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index a81f8a35c8..8627c703f1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -1,7 +1,7 @@ # 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: [ DrinkBase, BaseDrinkOpenable ] + parent: [ DrinkMetalBase, BaseDrinkOpenable, DrinkVisualsOpenable ] id: DrinkCanBaseFull components: - type: SolutionContainerManager @@ -490,59 +490,6 @@ - type: Item sprite: Objects/Consumable/Drinks/energy_drink.rsi -- type: entity - id: DrinkCanPack - parent: BaseStorageItem - name: 6pack - components: - - type: Sprite - sprite: Objects/Misc/6pack.rsi - layers: - - state: plastic-thingy - - state: 6pack1 - map: ["6pack1"] - visible: false - - state: 6pack2 - map: ["6pack2"] - visible: false - - state: 6pack3 - map: ["6pack3"] - visible: false - - state: 6pack4 - map: ["6pack4"] - visible: false - - state: 6pack5 - map: ["6pack5"] - visible: false - - state: 6pack6 - map: ["6pack6"] - visible: false - - type: Item - size: Normal - - type: Storage - grid: - - 0,0,2,3 - whitelist: - tags: - - Cola - hideStackVisualsWhenClosed: false - - type: StorageFill - contents: - - id: DrinkColaCan - amount: 6 - - type: ItemCounter - count: - tags: [Cola] - composite: true - layerStates: - - 6pack1 - - 6pack2 - - 6pack3 - - 6pack4 - - 6pack5 - - 6pack6 - - type: Appearance - - type: entity parent: DrinkCanBaseFull id: DrinkShamblersJuiceCan @@ -617,6 +564,7 @@ - type: Tag tags: - Beer + - DrinkCan - type: entity parent: DrinkCanBaseFull @@ -644,3 +592,4 @@ - type: Tag tags: - Wine + - DrinkCan diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 21902e4fd4..a74f61824a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -79,10 +79,10 @@ fillBaseName: icon- - type: entity - name: coupe glass - description: A classic thin neck coupe glass, the icon of fragile labels on crates around the galaxy. parent: DrinkGlassBase id: DrinkGlassCoupeShaped + name: coupe glass + description: A classic thin neck coupe glass, the icon of fragile labels on crates around the galaxy. components: - type: Sprite sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 9e1b100dbf..ed623f15ca 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -1,7 +1,7 @@ - type: entity + abstract: true parent: DrinkBase id: FlaskBase - abstract: true components: - type: SolutionContainerManager solutions: @@ -15,22 +15,6 @@ Steel: 300 - type: FitsInDispenser solution: drink - -- type: entity - id: DrinkFlaskVisualsOpenable - abstract: true - components: - - type: GenericVisualizer - visuals: - enum.OpenableVisuals.Opened: - enum.OpenableVisuals.Layer: - True: {state: "icon_open"} - False: {state: "icon"} - - type: Appearance - - type: Sprite - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - type: Openable sound: collection: flaskOpenSounds @@ -41,7 +25,7 @@ # Flasks - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkShinyFlask name: shiny flask description: A shiny metal flask. It appears to have a Greek symbol inscribed on it. @@ -50,7 +34,7 @@ sprite: Objects/Consumable/Drinks/shinyflask.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkMREFlask suffix: Full name: MRE flask @@ -68,7 +52,7 @@ solution: drink - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkDetFlask name: inspector's flask description: A metal flask with a leather band and golden badge belonging to the inspector. @@ -77,7 +61,7 @@ sprite: Objects/Consumable/Drinks/detflask.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkHosFlask name: hos's flask description: A metal flask, fit for a hard working HoS. @@ -86,7 +70,7 @@ sprite: Objects/Consumable/Drinks/hosflask.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkFlask name: captain's flask description: A metal flask belonging to the captain. @@ -95,7 +79,7 @@ sprite: Objects/Consumable/Drinks/flask.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkFlaskBar name: bar flask description: A metal flask often given out by the bartender on loan. Don't forget to return it! @@ -113,7 +97,7 @@ sprite: Objects/Consumable/Drinks/flask_old.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkLithiumFlask name: lithium flask description: A flask with a Lithium Atom symbol on it. @@ -122,10 +106,14 @@ sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: entity - parent: [FlaskBase, DrinkFlaskVisualsOpenable] + parent: [FlaskBase, DrinkVisualsOpenable] id: DrinkVacuumFlask name: vacuum flask description: Keeping your drinks at the perfect temperature since 1892. components: - type: Sprite sprite: Objects/Consumable/Drinks/vacuumflask.rsi + - type: Tool + qualities: + - Rolling # Perfectly cylindrical flask + speedModifier: 0.75 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 6dd0103914..12e3422e34 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -60,6 +60,59 @@ - type: Sprite sprite: Objects/Consumable/Drinks/teapot.rsi +- type: entity + id: DrinkCanPack + parent: BaseStorageItem + name: 6pack + components: + - type: Sprite + sprite: Objects/Misc/6pack.rsi + layers: + - state: plastic-thingy + - state: 6pack1 + map: ["6pack1"] + visible: false + - state: 6pack2 + map: ["6pack2"] + visible: false + - state: 6pack3 + map: ["6pack3"] + visible: false + - state: 6pack4 + map: ["6pack4"] + visible: false + - state: 6pack5 + map: ["6pack5"] + visible: false + - state: 6pack6 + map: ["6pack6"] + visible: false + - type: Item + size: Normal + - type: Storage + grid: + - 0,0,2,3 + whitelist: + tags: + - Cola + hideStackVisualsWhenClosed: false + - type: StorageFill + contents: + - id: DrinkColaCan + amount: 6 + - type: ItemCounter + count: + tags: [Cola] + composite: true + layerStates: + - 6pack1 + - 6pack2 + - 6pack3 + - 6pack4 + - 6pack5 + - 6pack6 + - type: Appearance + # Bartender tools - type: entity -- 2.51.2