From: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:41:23 +0000 (+0300) Subject: A beer can and a wine can (#24365) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b80b6c04b248002c8febddf8fa961a2f95451510;p=space-station-14.git A beer can and a wine can (#24365) * A beer can and a wine can * fix wrong file locations Signed-off-by: c4llv07e * Update drinks_cans.yml * A beer can and a wine can * Update drinks_cans.yml * A beer can and a wine can * replace sprites Signed-off-by: c4llv07e * Update meta.json * Update meta.json * Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json --------- Signed-off-by: c4llv07e Co-authored-by: c4llv07e Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6c8d9468a2..793121e2f2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -35,5 +35,7 @@ DrinkWhiskeyBottleFull: 5 DrinkWineBottleFull: 5 DrinkChampagneBottleFull: 2 #because the premium drink + DrinkBeerCan: 5 + DrinkWineCan: 5 emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml index 751fc08554..c8a941c128 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml @@ -38,6 +38,8 @@ - DrinkTeacup - DrinkGreenTea - DrinkWaterCup + - DrinkBeerCan + - DrinkWineCan chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index d028c46221..38ebc132c9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -461,3 +461,41 @@ sprite: Objects/Consumable/Drinks/pwrgame.rsi - type: Item sprite: Objects/Consumable/Drinks/pwrgame.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkBeerCan + name: beer can + description: Small joy, big taste, no worries! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Beer + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/beer_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/beer_can.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkWineCan + name: wine can + description: Your way to forgetting all worries and having fun! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Wine + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/wine_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/wine_can.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png new file mode 100644 index 0000000000..9974e5cc97 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png new file mode 100644 index 0000000000..ad64ae3b00 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json new file mode 100644 index 0000000000..b712e503a1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Github #DrMelon", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png new file mode 100644 index 0000000000..54d5ff6a3d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png new file mode 100644 index 0000000000..81a8cc741d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json new file mode 100644 index 0000000000..b712e503a1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Github #DrMelon", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +}