From d09400af15f81b7d7731f6f7928709082c032707 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 10 Feb 2021 07:23:31 -0700 Subject: [PATCH 1/2] stop exploiting constructable showers --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 --- code/game/objects/structures/watercloset.dm | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 287f8157..817fcdce 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -50,9 +50,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ //END OF CIT CHANGES new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \ null, \ - //add this when I can find a way to make them easily constructible > new/datum/stack_recipe("sink", /obj/structure/sink, 2, one_per_turf = TRUE, on_floor = TRUE), - new/datum/stack_recipe("shower", /obj/machinery/shower/crafted, 2, one_per_turf = TRUE, on_floor = TRUE), \ - null, \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ null, \ diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 1d5b7eef..11a8e814 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -219,8 +219,8 @@ var/watertemp = "normal" //freezing, normal, or boiling var/datum/looping_sound/showering/soundloop -/obj/machinery/shower/crafted //When created from sheets of metal - anchored = FALSE +/*/obj/machinery/shower/crafted //When created from sheets of metal + anchored = FALSE */ //Stop exploiting this ree /obj/machinery/shower/Initialize() . = ..() From 75415bb7afeb3f294fa08fe2f7586bc1581f0370 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 10 Feb 2021 07:33:11 -0700 Subject: [PATCH 2/2] you know what, dont even deconstruct them --- code/game/objects/structures/watercloset.dm | 50 ++++++--------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 11a8e814..1a36a834 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -292,43 +292,19 @@ if (user.a_intent != INTENT_HELP) return ..() - switch (I.tool_behaviour) - if (TOOL_WRENCH) - if (!anchored) - user.visible_message("[user] starts to take apart [src]...", "You start dismantling [src]...") - I.play_tool_sound(src) - if(I.use_tool(src, user, 20)) - deconstruct(TRUE) - else - to_chat(user, "You begin to adjust the temperature valve with \the [I]...") - if(I.use_tool(src, user, 50)) - switch(watertemp) - if("normal") - watertemp = "freezing" - if("freezing") - watertemp = "boiling" - if("boiling") - watertemp = "normal" - user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [watertemp] temperature.") - log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])") - add_hiddenprint(user) - - if (TOOL_SCREWDRIVER) - if (!anchored) - to_chat(user, "You begin screwing in [src] to the floor...") - I.play_tool_sound(src) - if(I.use_tool(src, user, 30)) - user.visible_message("[user] connects [src] to the floor.", "You connect [src] to the floor.") - anchored = TRUE - else - to_chat(user, "You start to take out [src]'s screws...") - on = FALSE - soundloop.stop() - update_icon() - I.play_tool_sound(src) - if(I.use_tool(src, user, 20)) - user.visible_message("[user] disconnects [src] from the floor.", "You disconnect [src] from the floor.") - anchored = FALSE + if (I.tool_behaviour == TOOL_WRENCH) + to_chat(user, "You begin to adjust the temperature valve with \the [I]...") + if(I.use_tool(src, user, 50)) + switch(watertemp) + if("normal") + watertemp = "freezing" + if("freezing") + watertemp = "boiling" + if("boiling") + watertemp = "normal" + user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [watertemp] temperature.") + log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])") + add_hiddenprint(user) /obj/machinery/shower/examine() . += ..()