From 1ee21dccb16738d60d62aa6b11dfd66691b44f99 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 14 Aug 2021 18:21:23 +0100 Subject: [PATCH] more fixes --- code/game/turfs/simulated/floor/plating.dm | 41 +++++------ .../game/turfs/simulated/floor/transparent.dm | 73 +++++++++---------- .../atmospherics/machinery/pipes/pipe.dm | 4 - 3 files changed, 56 insertions(+), 62 deletions(-) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 0f0dc601f86..ad26fa8919e 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -78,27 +78,26 @@ if(R.get_amount() < 2) to_chat(user, "You need two sheets to build a [C.name] floor!") return TRUE - else - to_chat(user, "You begin swapping the plating for [C]...") - if(do_after(user, 3 SECONDS * C.toolspeed, target = src)) - if(R.get_amount() >= 2 && !transparent_floor) - if(istype(C, /obj/item/stack/sheet/plasmaglass)) //So, what type of glass floor do we want today? - ChangeTurf(/turf/simulated/floor/transparent/glass/plasma) - else if(istype(C, /obj/item/stack/sheet/plasmarglass)) - ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced/plasma) - else if(istype(C, /obj/item/stack/sheet/glass)) - ChangeTurf(/turf/simulated/floor/transparent/glass) - else if(istype(C, /obj/item/stack/sheet/rglass)) - ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced) - else if(istype(C, /obj/item/stack/sheet/titaniumglass)) - ChangeTurf(/turf/simulated/floor/transparent/glass/titanium) - else if(istype(C, /obj/item/stack/sheet/plastitaniumglass)) - ChangeTurf(/turf/simulated/floor/transparent/glass/titanium/plastic) - playsound(src, C.usesound, 80, TRUE) - R.use(2) - to_chat(user, "You swap the plating for [C].") - new /obj/item/stack/sheet/metal(src, 2) - return TRUE + to_chat(user, "You begin swapping the plating for [C]...") + if(do_after(user, 3 SECONDS * C.toolspeed, target = src)) + if(R.get_amount() >= 2 && !transparent_floor) + if(istype(C, /obj/item/stack/sheet/plasmaglass)) //So, what type of glass floor do we want today? + ChangeTurf(/turf/simulated/floor/transparent/glass/plasma) + else if(istype(C, /obj/item/stack/sheet/plasmarglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced/plasma) + else if(istype(C, /obj/item/stack/sheet/glass)) + ChangeTurf(/turf/simulated/floor/transparent/glass) + else if(istype(C, /obj/item/stack/sheet/rglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced) + else if(istype(C, /obj/item/stack/sheet/titaniumglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/titanium) + else if(istype(C, /obj/item/stack/sheet/plastitaniumglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/titanium/plasma) + playsound(src, C.usesound, 80, TRUE) + R.use(2) + to_chat(user, "You swap the plating for [C].") + new /obj/item/stack/sheet/metal(src, 2) + return TRUE /turf/simulated/floor/plating/screwdriver_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm index ce6d693a064..0322fbfbd0b 100644 --- a/code/game/turfs/simulated/floor/transparent.dm +++ b/code/game/turfs/simulated/floor/transparent.dm @@ -16,6 +16,7 @@ keep_dir = FALSE intact = FALSE transparent_floor = TRUE + heat_capacity = 800 /turf/simulated/floor/transparent/glass/Initialize(mapload) . = ..() @@ -25,41 +26,39 @@ dir = SOUTH //dirs that are not 2/south cause smoothing jank icon_state = "" //Prevents default icon appearing behind the glass -/turf/simulated/floor/transparent/glass/attackby(obj/item/C, mob/user, params) +/turf/simulated/floor/transparent/glass/crowbar_act(mob/user, obj/item/C) if(!C || !user) return - if(istype(C, /obj/item/crowbar)) - var/obj/item/stack/R = user.get_inactive_hand() - if(istype(R, /obj/item/stack/sheet/metal)) - if(R.get_amount() < 2) //not enough metal in the stack - to_chat(user, "You also need to hold two sheets of metal to dismantle [src]!") - return - else - to_chat(user, "You begin replacing [src]...") - playsound(src, C.usesound, 80, TRUE) - if(do_after(user, 3 SECONDS * C.toolspeed, target = src)) - if(R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/plating)) - if(!transparent_floor) - return - switch(type) //What material is returned? Depends on the turf - if(/turf/simulated/floor/transparent/glass/reinforced) - new /obj/item/stack/sheet/rglass(src, 2) - if(/turf/simulated/floor/transparent/glass) - new /obj/item/stack/sheet/glass(src, 2) - if(/turf/simulated/floor/transparent/glass/plasma) - new /obj/item/stack/sheet/plasmaglass(src, 2) - if(/turf/simulated/floor/transparent/glass/reinforced/plasma) - new /obj/item/stack/sheet/plasmarglass(src, 2) - if(/turf/simulated/floor/transparent/glass/titanium) - new /obj/item/stack/sheet/titaniumglass(src, 2) - if(/turf/simulated/floor/transparent/glass/titanium/plastic) - new /obj/item/stack/sheet/plastitaniumglass(src, 2) - R.use(2) - playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) - ChangeTurf(/turf/simulated/floor/plating) - else //not holding metal at all - to_chat(user, "You also need to hold two sheets of metal to dismantle \the [src]!") + var/obj/item/stack/R = user.get_inactive_hand() + if(istype(R, /obj/item/stack/sheet/metal)) + if(R.get_amount() < 2) //not enough metal in the stack + to_chat(user, "You also need to hold two sheets of metal to dismantle [src]!") return + else + to_chat(user, "You begin replacing [src]...") + playsound(src, C.usesound, 80, TRUE) + if(do_after(user, 3 SECONDS * C.toolspeed, target = src)) + if(R.get_amount() < 2 || !transparent_floor) + return + else //not holding metal at all + to_chat(user, "You also need to hold two sheets of metal to dismantle \the [src]!") + return + switch(type) //What material is returned? Depends on the turf + if(/turf/simulated/floor/transparent/glass/reinforced) + new /obj/item/stack/sheet/rglass(src, 2) + if(/turf/simulated/floor/transparent/glass) + new /obj/item/stack/sheet/glass(src, 2) + if(/turf/simulated/floor/transparent/glass/plasma) + new /obj/item/stack/sheet/plasmaglass(src, 2) + if(/turf/simulated/floor/transparent/glass/reinforced/plasma) + new /obj/item/stack/sheet/plasmarglass(src, 2) + if(/turf/simulated/floor/transparent/glass/titanium) + new /obj/item/stack/sheet/titaniumglass(src, 2) + if(/turf/simulated/floor/transparent/glass/titanium/plasma) + new /obj/item/stack/sheet/plastitaniumglass(src, 2) + R.use(2) + playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) + ChangeTurf(/turf/simulated/floor/plating) /turf/simulated/floor/transparent/glass/reinforced @@ -67,7 +66,7 @@ desc = "Jump on it, it can cope. Promise..." icon = 'icons/turf/floors/reinf_glass.dmi' thermal_conductivity = 0.035 - heat_capacity = 50000 + heat_capacity = 1600 /turf/simulated/floor/transparent/glass/reinforced/acid_act(acidpwr, acid_volume) acidpwr = min(acidpwr, 50) @@ -78,7 +77,7 @@ desc = "Wait, was space always that color?" icon = 'icons/turf/floors/plasmaglass.dmi' thermal_conductivity = 0.030 - heat_capacity = 75000 + heat_capacity = 32000 /turf/simulated/floor/transparent/glass/reinforced/plasma name = "reinforced plasma glass floor" @@ -91,10 +90,10 @@ name = "titanium glass floor" desc = "Stylish AND strong!" icon = 'icons/turf/floors/titaniumglass.dmi' - canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plastic) + canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plasma) thermal_conductivity = 0.025 - heat_capacity = 325000 + heat_capacity = 1600 -/turf/simulated/floor/transparent/glass/titanium/plastic +/turf/simulated/floor/transparent/glass/titanium/plasma name = "plastitanium glass floor" icon = 'icons/turf/floors/plastitaniumglass.dmi' diff --git a/code/modules/atmospherics/machinery/pipes/pipe.dm b/code/modules/atmospherics/machinery/pipes/pipe.dm index afda1c30db7..925bf48715d 100644 --- a/code/modules/atmospherics/machinery/pipes/pipe.dm +++ b/code/modules/atmospherics/machinery/pipes/pipe.dm @@ -46,10 +46,6 @@ if(istype(W, /obj/item/analyzer)) atmosanalyzer_scan(parent.air, user) return - - if(istype(W, /obj/item/painter)) - return - return ..() /obj/machinery/atmospherics/proc/pipeline_expansion()