From b0a2ebdf3e9aacf34b25c1a6fe3cffd0c86a3c58 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 28 Nov 2019 23:11:57 -0700
Subject: [PATCH] Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
---
code/__DEFINES/components.dm | 1 -
.../kitchen_machinery/icecream_vat.dm | 161 ++++++++++++++----
icons/obj/kitchen.dmi | Bin 25936 -> 26082 bytes
3 files changed, 129 insertions(+), 33 deletions(-)
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 72ad9ac5..1e2ba19d 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -101,5 +101,4 @@
#define COMSIG_MOVABLE_UPDATE_GLIDE_SIZE "movable_glide_size" //Called when the movable's glide size is updated: (new_glide_size)
#define COMSIG_LIVING_FULLY_HEAL "living_fully_healed" //from base of /mob/living/fully_heal(): (admin_revive)
-#define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs" //from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
index 58d3ef69..8670b16b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
@@ -1,9 +1,12 @@
#define ICECREAM_VANILLA 1
#define ICECREAM_CHOCOLATE 2
#define ICECREAM_STRAWBERRY 3
-#define ICECREAM_BLUE 4
-#define CONE_WAFFLE 5
-#define CONE_CHOC 6
+#define ICECREAM_PEACH 4
+#define ICECREAM_GRAPE 5
+#define ICECREAM_BLUE 6
+#define ICECREAM_CUSTOM 7
+#define CONE_WAFFLE 8
+#define CONE_CHOC 9
/obj/machinery/icecream_vat
name = "ice cream vat"
@@ -18,15 +21,18 @@
var/list/product_types = list()
var/dispense_flavour = ICECREAM_VANILLA
var/flavour_name = "vanilla"
+ var/obj/item/reagent_containers/beaker = null
var/static/list/icecream_vat_reagents = list(
- "milk" = 5,
- "flour" = 5,
- "sugar" = 5,
- "ice" = 5,
- "cocoa" = 5,
- "vanilla" = 5,
- "berryjuice" = 5,
- "singulo" = 5)
+ "milk" = 6,
+ "flour" = 6,
+ "sugar" = 6,
+ "ice" = 6,
+ "cocoa" = 6,
+ "vanilla" = 6,
+ "berryjuice" = 6,
+ "singulo" = 6,
+ "peachjuice" = 6,
+ "grapejuice" = 6)
/obj/machinery/icecream_vat/proc/get_ingredient_list(type)
switch(type)
@@ -34,6 +40,12 @@
return list("milk", "ice", "cocoa")
if(ICECREAM_STRAWBERRY)
return list("milk", "ice", "berryjuice")
+ if(ICECREAM_CUSTOM)
+ return list("milk", "ice")
+ if(ICECREAM_PEACH)
+ return list("milk", "ice", "peachjuice")
+ if(ICECREAM_GRAPE)
+ return list("milk", "ice", "grapejuice")
if(ICECREAM_BLUE)
return list("milk", "ice", "singulo")
if(CONE_WAFFLE)
@@ -52,6 +64,8 @@
return "strawberry"
if(ICECREAM_BLUE)
return "blue"
+ if(ICECREAM_CUSTOM)
+ return "custom"
if(CONE_WAFFLE)
return "waffle"
if(CONE_CHOC)
@@ -62,7 +76,7 @@
/obj/machinery/icecream_vat/Initialize()
. = ..()
- while(product_types.len < 6)
+ while(product_types.len < 9)
product_types.Add(5)
create_reagents(100, OPENCONTAINER | NO_REACT)
for(var/reagent in icecream_vat_reagents)
@@ -73,14 +87,23 @@
var/dat
dat += "ICE CREAM
Uakszhfnq#ZqyHp-Qz!h1gno_4leO(AXO~hk6smSP|j~b
zGv1BrZ-CxyL~ e~zN}e>f9C*aW68Sn-IsM8;r)WIH#(3|
z2|AM6j%T8P{I6#e`CNaCfO;3I^e>=G=4c@Ge2GLLRcO7|?$fUf5wU6v_ZEaKH++A0
zJ@MnG;?=R `;-=x0_qcl+(`+{%j1+S=NA{4+nlTlJd4X%|F`MX4XVQ6~=%
z78G67@rdCYbkYi)nmX;WapC0o@5O=jMgfK^8xz!@HyO|*GS!VA@XC!8!A9p&x5>=R
zDu?zSuX%qWg oeveykkkRP0D?|GXD=DbC>BVU%LVY2Byb2$-p%P-lRLhz*n{h$ouU>AEh5THD3
z!V;|t8;y#Ozo3~VWn~Q%?riSzOHi4C@~ASm2}C^6Y~bM_DKPY8xgfuVHFNfyaai$?
zJ}a+tGCB}=E~h0BaJMTR`KTN5#w~PAI43+NLy#z=0&Mc5r!iYtJ
zl4b37biGmCug)yqKQmd3$RJ8Z&$%(@+pDP>F+rc@M(vM)p
zX(29T`INf%oSjIyU5URnllZMdNGWn_>_*es$0*zAuzGIko(KT4@?PMGj2KBc1m9ZD
zx8Enf?u68mb3Ma}w*jhVR`}&_5A!cjKx$8VUxM1WadJp*vC`2#R5M9@3Zyv_#E#vw
zdF!4jt}CGLZnwL?we>kZ9{29
z0%au(yDge>S5+QLq+AEf&e~2Pj9bdeE7HbEIxySXvY}c
z(%-QqDU=#DL?1EI6{mCq6ka~xpLOPp=19^(0^uwmZXNXiPSZAYkoV?iv~$20-N}G<
zP>>?#rQ#yu#8nexfB`2{j>u9U-6kWTYpLhi!l^zNQ9RltD^sqA?CG+!QowFZcUfJC
zU?YC>`#0*y{Qai%dc?rOJ{vZ9R-T7H)6Fd&r~|%7wM65!Doq>o;NtG?POd5x^yKgD
z?ajS{O%|ZcZ6y|826Z9PKRHURNo8D7hMXL2aDK-gL04KfvkGXNC;!6RgTqTPPZWZ~
z>w<*E(-~A)SePaeAR;Cvh9A&Q;3m`&HnD+l(4fpSJBHxCjfecbW7G9_k_>Po=gS6o
zM`4nhoct~<8mVGR=-$)}IE18lWHI?4Cq&!ukyp=ps{{|&H+i0l6efX9kl)ePO+X~0
zd`sMg6L6Kfil3A~#~3`6a8P=Q9Yb&u2#Rnp{F;=cmagQcbr0o`sU!I?IAPsh82R{U
zS^IH@l|mq`nF`V~<&l2t4B$<8pMitZp^1sXBGnA<&Y>kl=jw&}>gCS!qRs|6wCw`*
z_wX?9CkfE`v@#b)3Z2n)#SzLy#r^aqS
)h{L
zh`^r~Nu%phKypqU{bf!ks71a0qHvpW7|#IcBiTr6e`2H91jcsKnQk6yxfF+q;*LP#
zR|OsU8d_Q*O-;fvv0o