From 55790864bdf86f8d38dd96a82c40f39517a9b0a8 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 20 Feb 2020 22:17:32 -0500 Subject: [PATCH 1/2] Adds carafes and pitchers Also adds them to the bartender vendor. --- code/game/machinery/vending.dm | 2 ++ .../food/drinkingglass/drinkingglass.dm | 16 +++++++------- .../food/drinkingglass/serving_glasses.dm | 20 ++++++++++++++++++ icons/obj/drinks_vr.dmi | Bin 0 -> 1655 bytes vorestation.dme | 1 + 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 code/modules/food/drinkingglass/serving_glasses.dm create mode 100644 icons/obj/drinks_vr.dmi diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 070351ea2c2..5771fe643bd 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -685,6 +685,8 @@ /obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10, + /obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, //VOREStation Add + /obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, //VOREStation Add /obj/item/weapon/reagent_containers/food/drinks/metaglass = 10, /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10, /obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5, diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index afed7b60b02..6b49fcdb222 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -74,9 +74,9 @@ update_icon() /obj/item/weapon/reagent_containers/food/drinks/glass2/proc/can_add_extra(obj/item/weapon/glass_extra/GE) - if(!("[base_icon]_[GE.glass_addition]left" in icon_states(DRINK_ICON_FILE))) + if(!("[base_icon]_[GE.glass_addition]left" in icon_states(icon))) //VOREStation Edit return 0 - if(!("[base_icon]_[GE.glass_addition]right" in icon_states(DRINK_ICON_FILE))) + if(!("[base_icon]_[GE.glass_addition]right" in icon_states(icon))) //VOREStation Edit return 0 return 1 @@ -106,20 +106,20 @@ over_liquid |= "[base_icon][amnt]_fizz" for(var/S in R.glass_special) - if("[base_icon]_[S]" in icon_states(DRINK_ICON_FILE)) + if("[base_icon]_[S]" in icon_states(icon)) //VOREStation Edit under_liquid |= "[base_icon]_[S]" - else if("[base_icon][amnt]_[S]" in icon_states(DRINK_ICON_FILE)) + else if("[base_icon][amnt]_[S]" in icon_states(icon)) //VOREStation Edit over_liquid |= "[base_icon][amnt]_[S]" for(var/k in under_liquid) - underlays += image(DRINK_ICON_FILE, src, k, -3) + underlays += image(icon, src, k, -3) //VOREStation Edit - var/image/filling = image(DRINK_ICON_FILE, src, "[base_icon][amnt][R.glass_icon]", -2) + var/image/filling = image(icon, src, "[base_icon][amnt][R.glass_icon]", -2) //VOREStation Edit filling.color = reagents.get_color() underlays += filling for(var/k in over_liquid) - underlays += image(DRINK_ICON_FILE, src, k, -1) + underlays += image(icon, src, k, -1) //VOREStation Edit else name = initial(name) desc = initial(desc) @@ -128,7 +128,7 @@ for(var/item in extras) if(istype(item, /obj/item/weapon/glass_extra)) var/obj/item/weapon/glass_extra/GE = item - var/image/I = image(DRINK_ICON_FILE, src, "[base_icon]_[GE.glass_addition][side]") + var/image/I = image(icon, src, "[base_icon]_[GE.glass_addition][side]") //VOREStation Edit if(GE.glass_color) I.color = GE.glass_color underlays += I diff --git a/code/modules/food/drinkingglass/serving_glasses.dm b/code/modules/food/drinkingglass/serving_glasses.dm new file mode 100644 index 00000000000..16c0c15cc98 --- /dev/null +++ b/code/modules/food/drinkingglass/serving_glasses.dm @@ -0,0 +1,20 @@ +/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe + name = "glass carafe" + base_name = "carafe" + base_icon = "carafe" + icon = 'icons/obj/drinks_vr.dmi' + filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100) + volume = 120 + possible_transfer_amounts = list(5,15,30) + matter = list("glass" = 50) + +/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher + name = "plastic pitcher" + base_name = "pitcher" + base_icon = "pitcher" + icon = 'icons/obj/drinks_vr.dmi' + filling_states = list(15, 30, 50, 70, 85, 100) + volume = 120 + possible_transfer_amounts = list(5,15,30) + matter = list("plastic" = 50) + \ No newline at end of file diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a8d69aa3276569cf8f4eb9cb7e0ffd8e0afff76d GIT binary patch literal 1655 zcmbW2c{tPw7{`Azt|3N_MbXA2JP3tkA~TF}eV%=G|J&W?`Mlrn^Spn&@B2LO`#f(d#>GxXYPS>s z05T5tDEBQd*$N^=d`r`UgH*Td$z=~O94ho;aLoB=-1(?T0KgaA?mH^gVzg7V*9YDj zw1WJsjg>Nep+&FesfU}pXULN6X~jVeh(%n(qDodF*`Ou1;6X835O*+{b4}V*Vt=c4 z)!Tce_2lM;=;hq(pCaNyD)7mTc;(pB_K#C?+V5rs-Qsic8<{oMp*y-1^pCE(P$zr+ zYKOzj%2z~oozxLc?5IX+EM82pQv{D0Enx6y4R?*Mt5x>{x!ZljI&>!lHrGRH0YHrC zfI@oU3qFla9aoK4VJ>M8*o={zdzGA4E>y#P0@IR8aL4_jBfT%i9d2O4HbA8dq5e>Q z^C`xX?L<|`Bk@ceX7TpxDTGodQ_1nhqbEl(@N$kxM@@*~Owun0I|}>SCImu6z!!tB z&~LMK4Vv*RC1qu?-WX(pL^MNA-Q!>T zANSF?+S;fPqFWxoA*_{(gn+AsktFO1d6Qk2AZXmq|IlcAq^}ov2+Z5?U$g8rp$9Jd zotm4Q3vz6@9&9wHC)iFqY0Yw4Z9C2$I%Hwt8^AeohfdQ=%<1p%e;Eb|1}mCd2<20+ zYsyPv{c1O~bDai<*FvzYf{LIx5rGORR z%0>_fevW12#!JiSEenr`7#QkdvkwWRgWlPaLcQhF+iX!G(a{*Ron4uiekYe3DKyQ` z&-ZD#K}^ddo;Y!$25(_d#7QNQB1U0PuCkTW+d^Yv$St(MG^s^(E9*9_W}(aR>C?tW zHWfD2n_f_=9m)c~IGIUmfA#7WsYyS>-oDP4=8A;2oQ0TzOq=ub@*c{_$fT0mJ3Bi` z?Hh{EB2M3I{rP_Xdz-%57BX=s)RyjSLl+3D~rYQuerQuDYqp@5`WhUWXq>~ zF+@WX;b3DGQ;=oP$1rfS8p{dMvwYwE0jYgTa(=m7{gwQ;+hJ75fi7}#vY5A*m&#-P zN(LLNhE=nBIPl>-Z?G=Iv229VQ~&Il;{5t(g{$@M>4zS=LEc&TBJI{7w}%542#)AJ z2ho!59AH^+MgLyMn-Q^-I*Kj}R_ZrFVa6XmdYwa7LR|MTDk6%3($3+YBsm#Ti0A)< z^)4&*DdlY;HjvjI42IpMM0PFA6um#2Lrm#o7}7^`h~nqXLYrMQx<46%L?-*x#?E;V zMR!{M2-XB}svIK5_7A?(Va9RdwFw(-d`c~$NEYI$mQ;EZ_y?U8hWk)%@WR1yF;6E% z1?+G9rh9~_{gLOh;lm%zP9T@p7`h>edoI_H1|$q^4hrUOx!y>>>^!yNnGd<9!Gsco zNOL}}wu!$g_<>U~^iG4pgct!<&3%={!eKgXHRdagbu5?N4m1eD$wtSxmFsWlRXQ=J zP$7v8LrQXW>r+G$DQ$)B)T)#wy;zku!L8vr`x>rZZ3^>SHQQ_pI4t-50T1Gc!hBV| z8TR?&Oi#@Y7))70JdzL_OYh}Q6vQ{ms=V&j%PulCNT9F7jK`~!L>TE`_hq5B$&3+x#kobXG1h%ee!mkF7;!egDqN3yL|9vPrGvQu==+wJ(G#-W zS!+D8W4?(QQ_c5H$4SRhLd!oBp3ZJAcs@-pZi*v4veY^Q>1J<2VGOq1q@?>%u^_X$^o=-8Mu(WMtEVd*Qg}maBy6dt80I3AoMxM u5 Date: Thu, 20 Feb 2020 22:34:22 -0500 Subject: [PATCH 2/2] Add to authpathe --- code/datums/autolathe/general_vr.dm | 11 ++++++++++- code/game/machinery/vending.dm | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/datums/autolathe/general_vr.dm b/code/datums/autolathe/general_vr.dm index 5c90909f553..e1fb7ad46f0 100644 --- a/code/datums/autolathe/general_vr.dm +++ b/code/datums/autolathe/general_vr.dm @@ -29,4 +29,13 @@ /datum/category_item/autolathe/general/metaglass name = "metamorphic glass" path =/obj/item/weapon/reagent_containers/food/drinks/metaglass - is_stack = TRUE \ No newline at end of file + is_stack = TRUE + +/datum/category_item/autolathe/general/drinkingglass_carafe + name = "glass carafe" + path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe + +/datum/category_item/autolathe/general/drinkingglass_pitcher + name = "plastic pitcher" + path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher + \ No newline at end of file diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5771fe643bd..f7668cbffa5 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -685,8 +685,8 @@ /obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10, - /obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, //VOREStation Add - /obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, //VOREStation Add + /obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, + /obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, /obj/item/weapon/reagent_containers/food/drinks/metaglass = 10, /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10, /obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5, @@ -728,7 +728,7 @@ /obj/item/weapon/reagent_containers/food/drinks/ice = 10, /obj/item/weapon/reagent_containers/food/drinks/tea = 15, /obj/item/weapon/glass_extra/stick = 30, - /obj/item/weapon/glass_extra/straw = 30) + /obj/item/weapon/glass_extra/straw = 30) //VOREStation Add - Carafes and Pitchers contraband = list() vend_delay = 15 idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.