From 6be60b9bd7103f21c71da81d993092d80897ee11 Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 10 Dec 2024 02:40:35 +0100 Subject: [PATCH] small tweaks - mostly just fixes to maps (saunas, adding some beanbags) - new big bottle --- .../code/modules/food_and_drinks/bigbottle.dm | 10 +- .../code/modules/vending/gatocola.dm | 1 + GainStation13/icons/obj/food/bigbottle.dmi | Bin 1624 -> 2222 bytes _maps/map_files/BoxStation/BoxStation.dmm | 98 ++++++++++-------- _maps/map_files/gs13/Fast_Food.dmm | 2 +- 5 files changed, 65 insertions(+), 46 deletions(-) diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm index 9f2afacc3f..9417f1b588 100644 --- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -9,7 +9,7 @@ name = "Bottle" desc = "You shouldn't see this." icon = 'GainStation13/icons/obj/food/bigbottle.dmi' - icon_state = "bigbottle" + icon_state = "bigbottle_default" list_reagents = list(/datum/reagent/consumable/space_cola = 25) custom_materials = list(/datum/material/plastic=200) foodtype = SUGAR @@ -34,6 +34,14 @@ icon_state = "bigbottle_spr" list_reagents = list(/datum/reagent/consumable/space_up = 60, /datum/reagent/consumable/sodawater = 20) +/obj/item/reagent_containers/food/drinks/bigbottle/fizz + name = "Fizz-Wizz Bottle" + desc = "A big bottle of Fizz-Wizz - for all your chuggin' needs." + icon_state = "bigbottle_fizz" + list_reagents = list(/datum/reagent/consumable/space_cola = 50, /datum/reagent/consumable/fizulphite = 30) + + +//code for overlays /obj/item/reagent_containers/food/drinks/bigbottle/on_reagent_change() cut_overlays() var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent") diff --git a/GainStation13/code/modules/vending/gatocola.dm b/GainStation13/code/modules/vending/gatocola.dm index 9d20200bd3..f0788942a2 100644 --- a/GainStation13/code/modules/vending/gatocola.dm +++ b/GainStation13/code/modules/vending/gatocola.dm @@ -14,6 +14,7 @@ /obj/item/reagent_containers/food/drinks/bigbottle/starkist = 6, /obj/item/reagent_containers/food/drinks/bigbottle/cola = 6, /obj/item/reagent_containers/food/drinks/bigbottle/spaceup = 6, + /obj/item/reagent_containers/food/drinks/bigbottle/fizz = 3, ) contraband = list( /obj/item/organ/ears/cat = 2, diff --git a/GainStation13/icons/obj/food/bigbottle.dmi b/GainStation13/icons/obj/food/bigbottle.dmi index b0c72004559841f751594a90e8bdd3113ac4b826..1bf0a3cdfd4f0823323447641f3cdc1dfacdf632 100644 GIT binary patch literal 2222 zcmbtWi8s{k7ysHPk)33zY}ukrWx_jy!C2}|_MH+TB6~6niBMG5ETJqj_QtNkL?yei zjMCU%YQ{_>)Vwmb-?!iS{Rh8uo_jy{x%WQzoO{maKIf)d|BVvlKgJILfS`rBi4BMt zP`n_#pq`G2u>b)VW9JlZ;uGc_>K_vBAAB1CqKk4yU-RETBhE8^aXT$#&9p9C%h|FV zM$^uADzPxkdPZnnoQVnv@~5ml2wVCV;$I&mguk_Y7}-3ZfMHvQ{M)K1EgVt{gZj0U z)tT5Noj4&=D{nx0)FyI@Riw5Y*nBb(^Q=h?%hR^&b5^Yl*^l~E_9M>WUj3(ty&*33 z#~Fh!%`2!k?po$X;A@|Ky^@cdw0hz`giu>AG2eC7D*ymKqJ@c(U33w%DA-))rfh!? zPNT-XS>f!H37Cw!ba>h!`!8ni0z_84f+?yQ6H+;4*Q)Xss>uGwQvu zzqa1&{8f2xYc0W8OaIqxz|<4V0inuu9H+dA3dZB{q5u)E`2vm(u&K3I$R}+2N(?N4b&13K*_qFOZHf*;W1&MRL<7>vCv4Cuf2+ zzN3S5^R*KI$o60J^Gm|jMfmFo*r31uQqBYj?b89K{{Cu~R#w+qTu2lO?J&2o1#agR zn@zXUF|7RU(EM8j+r7!gQvqdVaDbN6@Jz3hu2gb&X$`)v`Qx zo^oJpv7K98V=Iq3TaOP#z_gy;f(}@tBYv66l(w{pXzD{{(%<86i>1FO;-P*)LE>}3 z>ukiTM4jh;x#OL^96X%F*6=~6G4kd_8$2Ve2;Jp|5YhY9PiicNVky^r!?ZmOHMQ#GaXJ4{POba_}PN&TZvz;0cd zfu^Usmn6qxW#j&J6rZBKhlA2MSShxHU_ix|!)nk1(1s2=uVT8KfFx_u^E=H8KhSpR z^2yjm3=J*4=4;K&3@h~5J3Ka&oa2l<6s>djV38#-rFR4 zh4fN4rtbSVoB0*?_8KqHXt3%Ugm`Vdm}aghA$)J;XEa@8|KG;N{aY~~Y}h2MIy-VQ z3Z7Xd-$OxYwI56ha&?nPcfQvU8)H^%i5F)Kf`8RFJXPPAp@)8|iB>#(cR zllBMUeVBT-AlKk(I-F;U+@HVHAS+5O{ZDOb2vrv0w=^DE;6Q)=o&TJ zvp|BO>T0O{w!w>-M;RI3ad2e*uAT3{x8U@T9sbCK>tYTD~d*We#iUOtW?GWO(Fkv9cSfsL! znXfK{0!M7T}htlZK{XsA11@U7oA+o+YpWB+{mmd;=!S#?S&E%)OE;wgP5?Ka~PK+MrVII7M3 zaTai`J6CT+$6k=n91F-fHnP06({+6xHSlH+rXNW+}v4>?6^d z!L?pI=6#{C%eU#`+-g7}@yFIZ=;JntjAeouwCwvu%>4F-goH$=f0!(_4vQtGOKFd; z$1}+Jy6?^~xB~xT-<3zi5mtj+%s5V>n?4hQOwP>WK7t|ZDWhhNp=ZEyP>p%GUD&u{~7*lcGKb)I0?NK04cyWB>D zEiEp0FtJm4&2Yn+S$IjmZKiEJMRFL?6IVW`tEZRY7h$up8||g|kMCef*ho_nX&{dRkEWzmPxHsj zF^SYy>^8VFMj6-2xVH zL%QfrIIuKMG5jyh`n08j!wU)u!l$bgfhB7$;Unk&FUU~hT3Nn6P_DR*TV(xGdMlw0 z_E)8v?#C54az%ZkwN_pxRU9vJ!Ujpw|>E#}WiWX7}@QYD$zWo`>MYT$&R znmIPlBVL3nRi#i};|TM#Vj1%pzH#X;K|?B#gcLM{9dP)pizg^l2pxb62w-9Qw@JOR HSK@yF<;ype literal 1624 zcmbuAdpOez7{`A|%U$A-JE??asL4umZHjDl7LLi}zRX+_quj>KB`qonB{`-rtdx+s zL~e2uJ$ena@I4e@0 zU$tYqsDHW>b3`PCacGYyhk#3dk+|?ETo?fWh())17}D(!Wt#!3)l5W_vuD-|{~YCR z)+XuC<-<~S83qa)@s#S!h$dB6x%|xv1S(}3>B8v(lp0gGi=Trcb$KI^(<}^P&EGs# zx1`|ZJ^g{q`p(qMr<`(GCG~fC{?PHYly_7ih1tbkpOVV%w8>U16MC5-JD(Wmg)-Kq zLuL_@7g_6a+s-B*RDP}~2>_DBlMc3MVv*pUZSa_zTGtiS#sW4CBOPn*f32XmR)^5WaZEZE4~OA;ogU(131&$&!O6)gU^VCS2*e-yhv);~yAT4q9^cB!YBIb%Y+1>kXW%N>MyJXy z%Qn9Vv667($n{}{C*}Ias&$CL=iy&jjZBoL;vcJMTs6Q}c*@z>h*qw`c?Mm%?XY3DnOX-jpH@P9f`ktG^=Q44|^vj26e`fG5 zesmwWVWv|ycJ~m8?I9I$o-!(EMQqbDC348hWz`hT|FlT-v z(@TB#&e38ogLMx1-IIKBji1SESYC(xh`dl7tG?UHmt^?f&lc7wb;6>^!8F`xmr$L6 z7kl{ZV|v%T7K2RgqNDlR09UX{!xi)pt`L{ICRQMamvZQ@UdhN%F&hIq03aduy?0UI z9@>r7DbpOFZjKKt)b%Z4V@GqTO2bRwdY~myG4VC??Y^6Sh6$_Jee?Fg)=Ua}>D->) zeA*b2Gzm|?F;j^*w@Ul#zPH81R`!rDG#_KTr4l5x#?~zrds}=!f)7gTvg zKD~CTbsu*E=gyb^CK#+Am+Io1Axmm2qGTMT$>;WJQ#lDSJ@lXL;0I_=5O7CQ|0i^R zL?JUk0{x7Y*?Hn=_mo;>g9_RxlqV3tVYu9GGvH0d#gc#+a8xA|t#iZWdh*|zi~Hhv zHdSL*EZjIPtU)r^Q=$a*=Dii`G0(?x9wXn86b(_z$_^Cs@!^62P=7LjGORNCP}8#T z#sWqdQZ={f???=dndeSanBoCH({;R|86Nl#&TgOjzIyF;|D7*8G;Z|ISmZcuE1+GL z_8P2nF;Kd&%RtfG#`LOI&4iz6DI6Jm0qvIO5VNGZ5D0yfjiC;jhkuUO`bp4SgYc>v2e6{@-dz3*(a+a$WWE|V$ zSp1c>(>2hd>rNAoOb;uUC`bZ`Jv?vjzn*Ehf_w>ss$Wu@93Q&!q4B-RcOoE*NA&p7 zO(CLamHkX|G7#^%R9h&tlGja>(@m=(r7w{Y_Dznlt_o63r;9128NB03YS8};PiG-~ zj2eL2vmPacQ)lkJQ=IGkzDnQ^^(llKmj@;!F~p+^4Ppw6S~Io~*Tm;f#znV_-1)i= p_!1KUvt#fiwJ#FsqI