From cfff6677b416326abfba36b86abf70a0b04f4e52 Mon Sep 17 00:00:00 2001 From: dapnee <33661984+dapnee@users.noreply.github.com> Date: Sun, 21 Jun 2020 18:14:34 -0600 Subject: [PATCH 1/5] wataur hahaha, imagine if this worked --- .../reagents/reagent_containers/glass.dm | 17 +++++++++++++++++ icons/obj/drinks.dmi | Bin 102685 -> 103077 bytes icons/obj/reagentfillings.dmi | Bin 4148 -> 4548 bytes 3 files changed, 17 insertions(+) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 800d66969d..4c20b4cb8a 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -386,6 +386,23 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() +/obj/item/reagent_containers/food/drinks/waterbottle/wataur + name = "Bottled Watuar" + desc = "Finally, a bottle as proportionate as you." + icon = 'icons/obj/drinks.dmi' + icon_state = "wataur" + item_state = "wataur" + list_reagents = list(/datum/reagent/water = 100) + custom_materials = list(/datum/material/glass=0) + volume = 100 + amount_per_transfer_from_this = 20 + possible_transfer_amounts = list(5,10,15,20,25,30,50, 100) + container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB + container_HP = 1 + +/obj/item/reagent_containers/food/drinks/waterbottle/wataur/empty + list_reagents = list() + /obj/item/reagent_containers/glass/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 07e7bf1da88bb6c08316a613720f6ae3b1a9ef14..6ba11b1ca339c0d081fce5f84ee0c17d9dce8882 100644 GIT binary patch delta 5433 zcmZ8k2{@G9+kY54HM|u?3|fdRm3
4%Pqj1;TW$b28h7dDL?}(WKJA6eAxS&-
zZa&Uatv=DVl24>hrDdxM7Yi>qJHr VY
zH?HOr_A0;%eik){H?YRPm@ax~?1ElVdvbEvM^EL#tvZOtE+Z&)vVRWpR*5-z4o`C#
zJ#B=1d#(6frDh8%UQj6)E1X>C`Kt#=oKX{VhNr*hQwt55y?Reh)=5XGtgp%LVQ~7L
zNAcAW7sY6_%Vcs=V?YIC%M#^Qf_y*_<&!go!Ob$~9vR3@!9h`AQYn3rDNFri+31Z+
zx^1sHQ-6d7Ef-afq+s_ u9
zzU#wvF9s-Ohu_}TrsSsKK*_c5M_OC-Ho7(#xgXO=5Ycvu7Cn;z$?#UFv2i>wu`S;E
zm1t@PY3*p22Q%G!fQUs(6l1wN$7M;Ai_W!O{D1JlQ4ot%RL{ubD8!8zPa(!sw|liM
z^aVS;vY`2lj<)OljC_xw#aWM(vKcZ$oOO-x;=|h2^d`}tCpV&K9vGww-5=&g&xR>e
z`xE@*mgr%MgZ+=*bltn|ofFq&Y;LR%FS_IoiF<6S2<9dM*imt-g+17DKXYQxiWk%1
zO=8 K=#5BkUy-*(Hzo>
zFe7XS8#?)`$6Lc)IorG`U4u4|78xbCzVdYS`0=tqz9RjsxZz}nx@m(>WHoCvy!*F>
z!LGpH?w}H)lLE*gO`qfW6-h1o1cXvQ^58@A;%Z&vWFGo#6dm%kq4^nq0#Rm9DiE}N
z3kC*Jxn@;v*twQ@W%Ch^F)?A-#kmCF~aNsNHbv@d#x6bYXpUA|AkZX#ELmYvyGDx|&xLCS6
zn<9>;p0VxOwG%ed=Q=u}iHSqzS#nPvk><+d>Lt-6u4uJI|G!()_19Y{=zmOPw9I3>
z2ZfyS-Gk@%vd89fq}{83oltT1@$xlvog#u#)|qME){OJ^ahS2;52KEmKof)tz3*=C
zp}{fu)dKMzf>Qf*tZnp59;v?Y2Z*e+bkj)E=0K<@FKo(b!K|R5pq=QH>Z@0uE7jlX
zyw8Fb%CBnu^5n%L(G$2Ltq46sr&8yMe%0K2Qk9G2-|<9F?!SRwm(Jb&0XJwp)cHxz
z(Y^}lN2IsIhc)%psX)%)`w0sh9?POMY?>MB0}_1!r$U7j@}X9xy=ukV4`F!gNMtqX
z4u@h&tYOF$qJi<2Qc#Zwa7|&OW&H8OhYy1+50Exg}x@39$(4!(cLDu1P$ZYM4|6l74LvejPV87nYwj3E4W
zJsc95
i(YP#U+a
z`$ILHk4C=6pPs(n&rZw(a+>FK7+POt*W~26tu>
k
z6;;B@*R$9-4rF=7SL8J({V?yzQ-;Zx+ndq~