From a167d6e4332ddd2d1fa2bbc05ff51720d15b8b6a Mon Sep 17 00:00:00 2001
From: evilew <mipsio117@gmail.com>
Date: Mon, 9 Dec 2024 21:27:38 +0100
Subject: [PATCH] finishing up big bottles

- sprites and properties of bottles were fixed
---
 .../code/modules/food_and_drinks/bigbottle.dm |  13 ++++++-------
 GainStation13/icons/obj/food/bigbottle.dmi    | Bin 1584 -> 1624 bytes
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm
index fb2ce63445..9f2afacc3f 100644
--- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm
+++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm
@@ -13,35 +13,34 @@
 	list_reagents = list(/datum/reagent/consumable/space_cola = 25)
 	custom_materials = list(/datum/material/plastic=200)
 	foodtype = SUGAR
+	isGlass = FALSE
+	volume = 100
 
 /obj/item/reagent_containers/food/drinks/bigbottle/starkist
 	name = "StarKist Bottle"
 	desc = "A big bottle of Sunkist - for all your chuggin' needs."
 	icon_state = "bigbottle_fan"
-	list_reagents = list(/datum/reagent/consumable/space_cola = 40, /datum/reagent/consumable/orangejuice = 40)
-	foodtype = SUGAR
+	list_reagents = list(/datum/reagent/consumable/sodawater = 20, /datum/reagent/consumable/orangejuice = 60)
 
 /obj/item/reagent_containers/food/drinks/bigbottle/cola
 	name = "GT-Cola Bottle"
 	desc = "A big bottle of GT-Cola - for all your chuggin' needs."
 	icon_state = "bigbottle_cola"
 	list_reagents = list(/datum/reagent/consumable/space_cola = 80)
-	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/bigbottle/spaceup
 	name = "Space-Up! Bottle"
 	desc = "A big bottle of Space-Up! - for all your chuggin' needs."
 	icon_state = "bigbottle_spr"
-	list_reagents = list(/datum/reagent/consumable/space_up = 80)
-	foodtype = SUGAR
+	list_reagents = list(/datum/reagent/consumable/space_up = 60, /datum/reagent/consumable/sodawater = 20)
 
-/obj/item/reagent_containers/food/drinks/bigbottle/update_icon()
+/obj/item/reagent_containers/food/drinks/bigbottle/on_reagent_change()
   cut_overlays()
   var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent")
   if(reagents.reagent_list.len)
     var/datum/reagent/R = reagents.get_master_reagent()
     if(!renamedByPlayer)
-      name = "bottle of" + R.name
+      name = "bottle of " + R.name
       desc = R.glass_desc
 
     var/percent = round((reagents.total_volume / volume) * 100)
diff --git a/GainStation13/icons/obj/food/bigbottle.dmi b/GainStation13/icons/obj/food/bigbottle.dmi
index 4c6dea78675dab050d72e0bb80f2a3760fb6a9ab..b0c72004559841f751594a90e8bdd3113ac4b826 100644
GIT binary patch
delta 1439
zcmb7Ddo<Gv0RFM7g?Z$0y)BO<S%#V{nrD<}-9^`AOdiX;N{nL25M`(+)WR`^8Knm@
zk5(R2Chu2h<uT^!Ht*MU?jQYi|GD4!zH`2FzVrR_o%2;e1|gYj67jT+C7M{ke`Far
z;-=WT69N`*7H=L@H$VP{rje43v*tqx!VWPPy2B4rf>ZoC(viBwr80YN@{zC7MQg?m
zRrp3!rRO_XSwAbR7DFVdC8pe^-R!KqoUboF)ciy8vDtyM{tXK4<3%@6@N9a(7WK=H
zxp}Nh%&UOtXeEdmY5J*gSicV_HQIVPy|FWvlZG7x15Yv2VbSZ?DZ#bRn_Rj|J+fw^
z0gKu})`t6EE9jlIUi9G@CLK#agfB4*m^DI;CfkW=CMV`{{i3wn=Q`9~=QpAnTG7kP
zuJdzq6>QDmrlxQDCm(NLk_V=y7Veyxw#dG)h@gdjo&}Ra$38fzWMIprT>Gqoa5yte
zc^@L^<?s}XMRYqa4jXbT@Qd{UMf~uF@1=Husa+}F@Ki7P#1R1*0#Ad|6vz{&VrSW$
z=4Q(w#&9A=08@EVMt0McLw=1b?w+Xt-?U7!(y+T+h*{cA@DdOytST=jgt)4Cl-><{
z2q%T~y(Tnq((85a_nVaW@v8A<eR^j~u0a~!1et=|h9o*M{o@jyBb88M;6>CTr;h2W
zD*fjg8ea+YNxc}_+KQB`z<UH-zv^{X6Yx55w59rcV=<vGA>0h!M>^+ncoDSvabNT*
zs<F6NXd<CD&is*^&G!=F>Z!Ly=u6B%S&|D6FLDjJ6@#R!9z@l?O8#2nkh5~Y^E?+D
zsz#ipD&;y~3A(~>s@q1s{dh=cpdabLtz&vBEA1PmdTMVDkv~1pB{O{WXF_vWl7o^0
zVXU%}DK1g>v#%wxPV|&<fsH|!o~%GQgdkM(@=IzfPpz6vZl$BS>c9kln}#Rlb%b0e
zF1L=Yz>h6u(cirj7pGvhx}g9768g!W=eq~DW1%Ig-IVRoeyN(yC2aI?Hbtg?3HBOj
zBuSG#FhA<t_0^4A%fRL6AUE{$+4PAHb}ntiC2<^;nmJugFfvX4>#>*d*v_3^93mHE
zxg#GSFvr#`QN4@@Twq5?V$jCkL%O@w@|3S1?5o^I?P1xx(%<<#uSZ2&xrQ!<Rb>(4
zHe%%S2h=G;aZw%g^%mF@v<Db?AfmaBI2fMK^aG(^a?;+PdeQz(@k*^cS}%B#&qpEg
z+3kivTiNA8zbIHlITH=dbj(QjTXkM1cG99^#FT>{rG?gtkODnGg|2O%O*zjdy-j!+
zNmhI$TqgaFzmT{01PlOoB>=9v6?y}V#<@0QWJs@qkwq7a6dc8y7%MX%0KNvB1YJV{
z@E<(4=iAS<+xNR3EbLXu?3y;tvi~iQc1_H)r^ZoR#z$6L+Q`D-h8l@6kpCm5;gMC;
zaMF#FR6}KwqEnAiDP6`Mr64Dn65N@rm`C$#nS@71M*0g@E<H5W$iXyC4l`a<SBFnD
z{6TMW9G_cK$L}lUqubmqSr-udv+O(XvHk9`zx(#gjL6<%-G<d}Kxa>od$;1bc|?X}
zfycP>YBI!d6fFI24{2A@T5{myS<4l3;<ha@9PY}769Z9@VL$fN;Fw&Yln7v_HR(0+
z?`$g0U|dL#!a`ELZILq<5z9_^5DuR|uECA0588cL$$GrKws6PQs(gW|<o;xd{mG2P
z)FrZ=b-iu0vy^DP6E&sy*5t`}MZ_<Xe!2f?CZTg-BNRVZt<4AliZcE1ll1KSpKBr9
z-cG5o!=?Ul@zuf+`Pxx=dQG=>>~0J5PRB&H?C!I;3E+rvfT0;GUU31G>Z1rsT~oma
W+Gt#Srga3^#c5k-n@TJ1#D4&U7qgE5

delta 1398
zcmZvcc`(}v6vtzKC2b{WX<f}aQ*>1~ttF#~svc}m8<IMcQW`@Xm31f4RtT!4q^Lw$
zt?jWP?kJ74)l#}>Qd0Lix@f4QakDnve|C1dZ$5A4&3p4^-hAJ@_a4H9WOdNaIXawh
zk7doWT#4Fe)Lx<Bbgfb?14HHkH5U9;YL@N^L$D#FHj3C*X~e8c<*Dez?}YzK*iB#7
z5*F$?yOx>2>3&-HP=EU!RccuRDZ%|>s+y09sw3|m5A12f7;0~Czf<t(qlaV#s0^7U
zHutUl*~RaJZS;!8&$=ViX;y#{%pxhjo=jVn2va$$1t&pv)D<-|)5N(bQ{3K7X(B(+
z!4&|tzdUHm+awgPcTG-uzZH?T{HxPCl%>*I=xXVL<znnWe{*qyzOx@rDQT>&c>^fB
z93cxBwG|n4asg2ps~1NxAc0U=->=yX-_Osa7n0XUz3U@sqAL=y7O=Qx9}*p{Q0oPi
zQC)qkZBp^@tPhJo2?Wp!5y<Oyx=Au3kk(xL`8)hua_q4o$S*2Q4=O0yR<^d~8<;cm
z>HHeGwZxKrX%52?&2Ne4H%22gvd^|Ky{0@U!9X&RaCy;Zgq)Kzsq0W0ZspPR=m<&B
zr%qdOJ47n=;w+;v9IPxHpUKz|YGwtZYD_uJI$qH}DCt?hFOD}+`rg9!WEAj#Dpgcc
z9&qETJhvM5;VS`xkh~yd^tBkSH#lg%8@nBB1KlCF`6=D{Dt_<;4D@ZkL@WvpjN{n-
z){qF>$JViG5yflG-YPCBa#_ix-5uz+U)YSBjxxdZtPTws=zMPM<P;9x8L+Afr#`va
z@N%&CcJ1t-Wqk++<1{JCNJgOoNMO&^gKT+9xby5)w!n10_TfWI^tn?BW^FCzB_fC=
zLXp+JqdFy~4%Fi{lIFUc_P)J62m9!45jj4lCb+PyYNV)WD{`Ciri(_KnUc=Ss=Y)h
z7$i8~_LoJ%oQL;feX9vhT8gS)I(ax@3&*dU7*B5ElNEO=v@YOgv<-7a#?+r*S~!yt
z8R#G&&ySyL!!dvM2U4G3k&Sj4Z@h#fi3ZPd^mF<IQ}7rm1z)#x*SA*e$|*mDZ^o*t
z`M&WgiM?cqG!CQP!#XZu9(PXvsQi2(_6^QBbQ$Wfo9^5)j%dB>66b+$kk54*01>nq
z`K^O3A?regiO+PbY4o1g6Xr(?pzeoAqfeirIOeY>YM8y#Uv|ww=oYXJ&R%<Zui^k>
zNdgSLl64)nV<_lnGu(BiddXb%rTYM)7<RqIUtNv{3J913A^XAK*p+b8Ld3&SA7HQ}
zAHUNi1dZ{=!+e`?OH3$%MIV8}Q=qzEbGjqR$1IPzc4PWxm0W|5S%`*0vI_Q!qFz<X
z1@0~_V@<+-e%i=f*ZLOqarcmgUS3Dw@yxl?JF{VRPQ^9~Xc`)g%!mFkgGP4dZyysX
zkj2y-Hk)lgYwXz_Uu&z^l8r@#`s$6y?=c|R>1XqPGRt!_%S$Lj+%(#|Ys0esFW}vJ
zSjm!gF-}$I9UUV%z6+J5m(mLIfBz4;V<1am5t(uyr}}%6kp`rHn8br+#=GGqL+A7y
zdRghTsT;}QD|u2TP)X&%7;(<{IF(Q8X-_i6()&PV=WDK?J-d}%PWS7PT`A-RC{Skx
zPPqXvE&z<tMqPi(hrVvAThRdKxu0lqn&=-3`5%qGR_)(R_<uzWBJL-~GE2OQM^DuZ
zUstui*tqSH<hdGVmU}zc^F{A^N*F~DDQ_K0SDs%7U5=%I5Q*AO5N$h1g|cpn7_9O_
hBAW}5q#^rgG*B@0sDNgj(+rZC<0%)1a(lwnzX8d7n}YxV