From 113cb91411acaa60ad94e8d5bb9518994f1de17e Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 19 Aug 2021 22:41:17 -0700 Subject: [PATCH] Adds a 6pack of Cola (#4499) * Adds a 6pack of Cola * Revert "Adds a 6pack of Cola" This reverts commit 99f024b94ab3c684ce62e28018bd0fe2f26a2e09. * Revert "Revert "Adds a 6pack of Cola"" This reverts commit 9e3d31e41c8ea61a962ad7d4d3c0ea7124e82653. --- .../Objects/Consumable/drinks_cans.yml | 38 ++++++++++++++++++ Resources/Prototypes/tags.yml | 3 ++ .../Objects/Misc/6pack.rsi/6pack1.png | Bin 0 -> 322 bytes .../Objects/Misc/6pack.rsi/6pack2.png | Bin 0 -> 322 bytes .../Objects/Misc/6pack.rsi/6pack3.png | Bin 0 -> 318 bytes .../Objects/Misc/6pack.rsi/6pack4.png | Bin 0 -> 140 bytes .../Objects/Misc/6pack.rsi/6pack5.png | Bin 0 -> 139 bytes .../Objects/Misc/6pack.rsi/6pack6.png | Bin 0 -> 295 bytes .../Textures/Objects/Misc/6pack.rsi/meta.json | 32 +++++++++++++++ .../Objects/Misc/6pack.rsi/plastic-thingy.png | Bin 0 -> 199 bytes 10 files changed, 73 insertions(+) create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack1.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack2.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack3.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack4.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack5.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/6pack6.png create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/6pack.rsi/plastic-thingy.png 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 0000000000000000000000000000000000000000..0fe6cf06338d6c5e76db4e5c7d0c6380f3603195 GIT binary patch literal 322 zcmV-I0lof-P)Xq9b`SUuqG4h*2ly->jLjbR0Mn=5yw-MMat=0E`ewvoQM4@Q305%hc5WS8Z&-Y`f|jTG@{Z znski*|Ns3T3_h>l2xh;WJqJw3D5%gr3P9jxW-0^29|nepJzZe_q1G0LHL8lVup7Gr zK;Wu_4V<>GsiT?YI2|BgQU+(g`uLHi4q!nS5H~VnVDRx{(Dw0TIDYy#!_%lJ`Z|Ci zH4_~4oJT(~JXQEiQ_DdBrD$u?F#=I2sr}ZMPhi@g;SXczg9kKs&?ulUU|?VX06L_8 UoL~9w?EnA(07*qoM6N<$g5M*FOaK4? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aba82f7bc49d9c69e3f5d3585cdfaad36e372300 GIT binary patch literal 322 zcmV-I0lof-P)l_K$?Zoe}+E{|6iu2{=aHt17_P**N|&J zX`o5R=>PxU|H0t%`i)@r%h_|lbc})u?V|t$US_5;F#KU)c-Yeg<{xTpVOXQ8NVccQ zN`zM(Y~ZwgO&!^mlkEWck}^2^)yIz%Ie>*!4dO;d3=BSg4B9?^498C&XLuSFMPCOn zq-KJHp7ZD@hNlXjDY6^{NGiITbc{e0N@~CLt<807*qoM6N<$g8jsW8UO$Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f49d98667aaa34c9e5ddca5b3edf6182de5d2585 GIT binary patch literal 318 zcmV-E0m1%>P)hqlA-+aY5ogd)Jp|G$jQ%tHVfgdOCv?->6(nsoSwH{@CB${gtM7n8qeVA>gTe~DWM4f;k7RP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fdd22a512a3bd2760e22455e2532da01c9fbe397 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kcif|mo{=9FyL{y7;N^@ zB#(KfZ*hCM~)@@STC4W67IpU!SwbipZKpO^K0W@N&Z{z&?8dE-SeaDlZ2+h l;VVq#n%(n(#wAowl42>9-^k^8_W_X0;OXk;vd$@?2>{OGFh&3X literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7433425b3c870716fb5e86c760bdd7615209ef08 GIT binary patch literal 295 zcmV+?0oeYDP)wG|H1A7|3Nf}55jZ<*epkP03$6OgUh#!j0kI)=$!;&6;)AO zMOO!`QB=eT652Z84+F!?)KrG6Ha1|kU3Cpjt-}DIH1K)-Muz{t|1-RtJqJw3D5%gc z8-OglVr>nkS1TxhF}ee28UL*tX#9Zqi5mGn>S0H z_b&sAGnNGT1v5B2yO9RuWO}+dhDc0JPEg=CXlqiKaB$lxUJh9ai6#HfvmN4eVEde- zz+zPN!$Ck}>VJNgMxK>Z106W7h)OXvIk;U5Qix$P$^Y*!z+z+;(WG$U0rUBW51bP| u{+ASBlI&Tn#`KV7LK(Y&%H@|Tj10a14fZX{K5`FeDTAl0pUXO@geCxJXhJdo literal 0 HcmV?d00001