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 d9755bd4..4c8cb3c5 100644 Binary files a/GainStation13/icons/turf/decals_large_candy.dmi and b/GainStation13/icons/turf/decals_large_candy.dmi differ diff --git a/GainStation13/icons/turf/floor_candy.dmi b/GainStation13/icons/turf/floor_candy.dmi index 0dcc3553..6357aa40 100644 Binary files a/GainStation13/icons/turf/floor_candy.dmi and b/GainStation13/icons/turf/floor_candy.dmi differ diff --git a/GainStation13/icons/turf/wall_candy.dmi b/GainStation13/icons/turf/wall_candy.dmi new file mode 100644 index 00000000..51d922f8 Binary files /dev/null and b/GainStation13/icons/turf/wall_candy.dmi differ 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"