]> git.smokeofanarchy.ru Git - space-station-14.git/commit
A beer can and a wine can (#24365)
authorRumiTiger <154005209+RumiTiger@users.noreply.github.com>
Thu, 1 Feb 2024 06:41:23 +0000 (09:41 +0300)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 06:41:23 +0000 (17:41 +1100)
commitb80b6c04b248002c8febddf8fa961a2f95451510
treed7f8c5749e66d7bdf1982e841c61c71fe35c9bc1
parent50e58ca8055a1837e258eff8e0d803f08ae104d7
A beer can and a wine can (#24365)

* A beer can and a wine can

* fix wrong file locations

Signed-off-by: c4llv07e <kseandi@gmail.com>
* 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 <kseandi@gmail.com>
* 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 <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json [new file with mode: 0644]