diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index 16ab842b8a..1a7f099beb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml @@ -32,6 +32,9 @@ name: space cola description: A refreshing beverage. components: + - type: Tag + tags: + - Cola - type: SolutionContainer - type: Sprite sprite: Objects/Consumable/Drinks/cola.rsi @@ -168,3 +171,38 @@ - type: Item sprite: Objects/Consumable/Drinks/energy_drink.rsi + +- type: entity + id: DrinkCanPack + parent: BaseItem + name: 6pack + components: + - type: Sprite + netsync: false + sprite: Objects/Misc/6pack.rsi + layers: + - state: plastic-thingy + - type: Item + size: 6 + - type: Storage + capacity: 30 + whitelist: + tags: + - Cola + - type: StorageFill + contents: + - id: DrinkColaCan + amount: 6 + - type: StorageCounter + countTag: Cola + - type: Appearance + visuals: + - type: StackVisualizer + composite: true + stackLayers: + - 6pack1 + - 6pack2 + - 6pack3 + - 6pack4 + - 6pack5 + - 6pack6 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9746fdd591..902b96f68f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -70,6 +70,9 @@ - type: Tag id: ConveyorAssembly +- type: Tag + id: Cola + - type: Tag id: CombatKnife diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack1.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack1.png new file mode 100644 index 0000000000..0fe6cf0633 Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack1.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack2.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack2.png new file mode 100644 index 0000000000..aba82f7bc4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack2.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack3.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack3.png new file mode 100644 index 0000000000..f49d98667a Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack3.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack4.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack4.png new file mode 100644 index 0000000000..72bb28e9ac Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack4.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack5.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack5.png new file mode 100644 index 0000000000..fdd22a512a Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack5.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/6pack6.png b/Resources/Textures/Objects/Misc/6pack.rsi/6pack6.png new file mode 100644 index 0000000000..7433425b3c Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/6pack6.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/meta.json b/Resources/Textures/Objects/Misc/6pack.rsi/meta.json new file mode 100644 index 0000000000..76280403d4 --- /dev/null +++ b/Resources/Textures/Objects/Misc/6pack.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "6pack1" + }, + { + "name": "6pack2" + }, + { + "name": "6pack3" + }, + { + "name": "6pack4" + }, + { + "name": "6pack5" + }, + { + "name": "6pack6" + }, + { + "name": "plastic-thingy" + } + ] +} diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/plastic-thingy.png b/Resources/Textures/Objects/Misc/6pack.rsi/plastic-thingy.png new file mode 100644 index 0000000000..c1ba9913b2 Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/plastic-thingy.png differ