From 7ca379800cb2565415a4255b63fc60ba0f835dcc Mon Sep 17 00:00:00 2001
From: evilew <mipsio117@gmail.com>
Date: Mon, 21 Aug 2023 01:26:56 +0200
Subject: [PATCH] added candy decals and walls, organized GS13 turfs a bit

this also changes some small things, like removing corn oil from vent clog event and nerfing lipoifier generation from grinding calorite
---
 GainStation13/code/game/turfs/closed.dm       |  20 +++++++
 GainStation13/code/game/turfs/open.dm         |  50 ++++++++++++++++++
 .../food_and_drinks/objects/candy_flora.dm    |  30 +++++++++++
 .../icons/turf/decals_large_candy.dmi         | Bin 1088 -> 1091 bytes
 GainStation13/icons/turf/floor_candy.dmi      | Bin 5363 -> 4837 bytes
 GainStation13/icons/turf/wall_candy.dmi       | Bin 0 -> 475 bytes
 .../objects/items/stacks/sheets/mineral.dm    |   2 +-
 code/game/turfs/simulated/water.dm            |  15 ------
 code/modules/events/vent_clog.dm              |   2 +-
 tgstation.dme                                 |   3 ++
 10 files changed, 105 insertions(+), 17 deletions(-)
 create mode 100644 GainStation13/code/game/turfs/closed.dm
 create mode 100644 GainStation13/code/game/turfs/open.dm
 create mode 100644 GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm
 create mode 100644 GainStation13/icons/turf/wall_candy.dmi

diff --git a/GainStation13/code/game/turfs/closed.dm b/GainStation13/code/game/turfs/closed.dm
new file mode 100644
index 00000000..ecc2fd2c
--- /dev/null
+++ b/GainStation13/code/game/turfs/closed.dm
@@ -0,0 +1,20 @@
+// /turf/closed
+// 	layer = CLOSED_TURF_LAYER
+// 	opacity = 1
+// 	density = TRUE
+// 	blocks_air = 1
+// 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+// 	rad_insulation = RAD_MEDIUM_INSULATION
+
+
+// leaving this helper for remembering vars - Sono
+
+
+///////////////////////////////// GS13 CLOSED TURFS ///////////////////////////////
+
+
+/turf/closed/indestructible/candy
+	name = "Candy wall"
+	desc = "Despite being made out of mere candy, this wall is harder than stone!"
+	icon = 'Gainstation13/icons/turf/wall_candy.dmi'
+	icon_state = "candywall"
diff --git a/GainStation13/code/game/turfs/open.dm b/GainStation13/code/game/turfs/open.dm
new file mode 100644
index 00000000..470ab0ef
--- /dev/null
+++ b/GainStation13/code/game/turfs/open.dm
@@ -0,0 +1,50 @@
+// /turf/open
+// 	plane = FLOOR_PLANE
+// 	var/slowdown = 0 //negative for faster, positive for slower
+
+// 	var/postdig_icon_change = FALSE
+// 	var/postdig_icon
+// 	var/wet
+
+// 	var/footstep = null
+// 	var/barefootstep = null
+// 	var/clawfootstep = null
+// 	var/heavyfootstep = null
+
+// leaving this helper for remembering vars - Sono
+
+///////////////////////////////// GS13 OPEN TURFS ///////////////////////////////
+
+/turf/open/indestructible/chocolate
+	name = "chocolate floor"
+	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "choclit_2"
+
+
+/turf/open/indestructible/bubblegum
+	name = "bubblegum floor"
+	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "floor_pinkgum"
+
+/turf/open/candyfloor
+	name = "candy grass"
+	desc = "This weird grass smells of cinnamon and liquorice."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "candyfloor"
+
+/turf/open/chocolateriver
+	gender = PLURAL
+	name = "liquid chocolate"
+	desc = "This is probably used for some kind of huge fountain."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "chocwater"
+	slowdown = 1
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null //needs a splashing sound one day.
+
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
diff --git a/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm
new file mode 100644
index 00000000..87b525a5
--- /dev/null
+++ b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm
@@ -0,0 +1,30 @@
+//GS13 decals - candyland related!
+//would be cool if we could use ash flora code to make these harvestable in the future - Lew
+
+
+/obj/effect/turf_decal/candy //used for baseline
+	icon = 'GainStation13/icons/turf/decals_candy.dmi'
+	icon_state = ""
+
+/obj/effect/turf_decal/candy/redwhite
+	icon = 'GainStation13/icons/turf/decals_candy.dmi'
+	icon_state = "candy_decal1"
+
+/obj/effect/turf_decal/candy/redwhite2
+	icon = 'GainStation13/icons/turf/decals_candy.dmi'
+	icon_state = "candy_decal2"
+
+/obj/effect/turf_decal/candy/redwhite3
+	icon = 'GainStation13/icons/turf/decals_candy.dmi'
+	icon_state = "candy_decal3"
+
+/obj/structure/lollipop //ik it's not necessarily a decal but I'm lazy rn and will (hopefully) move it later
+	name = "Lollipop tree"
+	desc = "A mere snack for people larger than life."
+	max_integrity = 80
+	density = TRUE
+	pixel_x = -16
+	layer = FLY_LAYER
+	anchored = TRUE
+	icon = 'GainStation13/icons/turf/decals_large_candy.dmi'
+	icon_state = "lollipop_tree_blue"
diff --git a/GainStation13/icons/turf/decals_large_candy.dmi b/GainStation13/icons/turf/decals_large_candy.dmi
index d9755bd4503db36d50502de86ecae5d9ef9425b9..4c8cb3c5b2f340614581ad747e742c6670b22b8f 100644
GIT binary patch
delta 151
zcmV;I0BHZf2*U`FB!7Z>R9JLGWpiV4X>fFDZ*Bkpc${_1u?mAQ6h`4W_bGmKFBPO)
zmJ%r$^cBRC+vY;rNOD_W-@)1KoZ)M6A0B>!8$JEGRLNgh^p`7{O@c;P+<G#R<sJ2y
zs*5r#nv_$LHLtT4=J}a^+>i-UDl9rOud;mj=o3;noQW30<P6|OPdgb6FG!JU4z;nY
FlmjrRMCSki

delta 148
zcmV;F0Birl2*3!CB!7Q;R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;
z&r`5fFwryM;w;ZhDalZ<RWLK*;><|ROwTBRaEeP3OHvhV6_j%Fb8<2Z@(bciic(YK
zlX6N^mAE)lGK-28Y!wW-IMa#}b5kK~GPEcwxca#$xcGW<0SN$4FE6!Zljt9@uapC7
CDnW|?

diff --git a/GainStation13/icons/turf/floor_candy.dmi b/GainStation13/icons/turf/floor_candy.dmi
index 0dcc35536d00b6cb7b7709ca1f808771d6cef84a..6357aa40d382ce7645a21bcd4d08d6c5e9240aab 100644
GIT binary patch
delta 4461
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

delta 5019
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
TU&{XdxIo$(2I}>y4srhnpfR#l

diff --git a/GainStation13/icons/turf/wall_candy.dmi b/GainStation13/icons/turf/wall_candy.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..51d922f899476afadff79e8e766d2ba77ca5ff19
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000jP)t-sXBQXj
zjg9HV#Q*>QmLek1R8;Zt@vJg3(1U~6*x0nRw7+O*VPRqB=H^f$B6Q8X)&KwiZF*E#
zbVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3t
zxHvOXGt)ClAe`co#FA7XQz<zyFQu|PF(*ffi!&v&s2C__$i<mfl$e_eVJj=R`niCO
z1^~S%8_HkY<}m;O0PsmfK~yM_U68R2!Y~j;jg*R1%z$8ltN;Q^5-~xfY+xN3AXq6V
zQS6$^)KrWRQByMtcW1}8_>Ip`|IWTIW{X72q7d0BRfAxQ=elW{6@juA*$$vLBn<$P
zftiG$LeK}GL6!(il#)l0?YRP;G!U@<4iJInJ6be?+)f6vAedV=^hA3CqcsCS%YCis
z7%2Bw0yhQ#XY&VI<69VL2L@_nz?F8-b{^0Go+JbC%gD3^4O+&bnsORs`i~Sq2&kgv
z)MQZ<a?Z=~6UwEY<N<K0)5NgzgWzByxe~};57cvm!m1X6&!D^b3e-Dj`~kZ``;il#
R4FmuH002ovPDHLkV1h7k%ZLB~

literal 0
HcmV?d00001

diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 37588be9..f672e78b 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -290,7 +290,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
 	sheettype = "calorite"
 	materials = list(MAT_CALORITE=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list(/datum/reagent/consumable/lipoifier = 3)
+	grind_results = list(/datum/reagent/consumable/lipoifier = 2)
 	point_value = 40
 	merge_type = /obj/item/stack/sheet/mineral/calorite
 
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 73dc66c3..d0410dde 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -12,18 +12,3 @@
 	barefootstep = FOOTSTEP_WATER
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
-
-/turf/open/chocolateriver // GS13
-	gender = PLURAL
-	name = "liquid chocolate"
-	desc = "This is probably used for some kind of huge fountain."
-	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
-	icon_state = "chocwater"
-	slowdown = 1
-	bullet_sizzle = TRUE
-	bullet_bounce_sound = null //needs a splashing sound one day.
-
-	footstep = FOOTSTEP_WATER
-	barefootstep = FOOTSTEP_WATER
-	clawfootstep = FOOTSTEP_WATER
-	heavyfootstep = FOOTSTEP_WATER
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 72daaf75..92c967d2 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -167,6 +167,7 @@
 		CHECK_TICK
 
 // Lipoifier variant here
+// GS13
 
 /datum/round_event_control/vent_clog_fat
 	name = "Clogged Vents: Fattening Chems"
@@ -186,7 +187,6 @@
 	var/list/saferChems2 = list(		
 		/datum/reagent/consumable/lipoifier,
 		/datum/reagent/consumable/nutriment,
-		/datum/reagent/consumable/cornoil,
 	)
 
 /datum/round_event/vent_clog_fat/announce()
diff --git a/tgstation.dme b/tgstation.dme
index 6a3045c2..c2879b7f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3076,6 +3076,8 @@
 #include "GainStation13\code\game\sound.dm"
 #include "GainStation13\code\game\area\ruins.dm"
 #include "GainStation13\code\game\objects\effects\spawners\choco_slime_delivery.dm"
+#include "GainStation13\code\game\turfs\closed.dm"
+#include "GainStation13\code\game\turfs\open.dm"
 #include "GainStation13\code\machinery\fattening_turret.dm"
 #include "GainStation13\code\machinery\feeding_tube.dm"
 #include "GainStation13\code\mechanics\fatness.dm"
@@ -3087,6 +3089,7 @@
 #include "GainStation13\code\mobs\races\caloritegolem.dm"
 #include "GainStation13\code\modules\client\preferences\preferences.dm"
 #include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm"
+#include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm"
 #include "GainStation13\code\modules\mob\living\emote.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm"