diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 5aea5b477ed..ae966070f22 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -15,8 +15,9 @@ return 0 /obj/structure/spacepoddoor/Destroy() - air_update_turf(1) - return ..() + var/turf/T = get_turf(src) + . = ..() + T.air_update_turf(TRUE) /obj/structure/spacepoddoor/CanPass(atom/movable/A, turf/T) if(istype(A, /obj/spacepod)) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index e765e59442d..0a8436867be 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -178,8 +178,9 @@ air_update_turf(1) /obj/structure/foamedmetal/Destroy() - air_update_turf(1) - return ..() + var/turf/T = get_turf(src) + . = ..() + T.air_update_turf(TRUE) /obj/structure/foamedmetal/Move() var/turf/T = loc diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 1738344ae60..111da862e97 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -56,8 +56,9 @@ ..() /obj/structure/alien/resin/Destroy() - air_update_turf(1) - return ..() + var/turf/T = get_turf(src) + . = ..() + T.air_update_turf(TRUE) /obj/structure/alien/resin/Move() var/turf/T = loc diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 0b730a539b9..e5c0fc85722 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -82,8 +82,8 @@ /obj/structure/holosign/barrier/atmos/Destroy() var/turf/T = get_turf(src) + . = ..() T.air_update_turf(TRUE) - return ..() /obj/structure/holosign/barrier/cyborg name = "Energy Field" diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 4ea0fc34e2d..f4efa5452b0 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -22,16 +22,18 @@ icon = 'icons/obj/inflatable.dmi' icon_state = "wall" - + var/torn = /obj/item/inflatable/torn + var/intact = /obj/item/inflatable var/health = 50.0 /obj/structure/inflatable/Initialize(location) ..() - air_update_turf(1) + air_update_turf(TRUE) /obj/structure/inflatable/Destroy() - air_update_turf(1) - return ..() + var/turf/T = get_turf(src) + . = ..() + T.air_update_turf(TRUE) /obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0) return 0 @@ -122,13 +124,13 @@ playsound(loc, 'sound/machines/hiss.ogg', 75, 1) if(violent) visible_message("[src] rapidly deflates!") - var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc) + var/obj/item/inflatable/torn/R = new torn(loc) src.transfer_fingerprints_to(R) qdel(src) else visible_message("[src] slowly deflates.") spawn(50) - var/obj/item/inflatable/R = new /obj/item/inflatable(loc) + var/obj/item/inflatable/R = new intact(loc) src.transfer_fingerprints_to(R) qdel(src) @@ -164,6 +166,8 @@ icon = 'icons/obj/inflatable.dmi' icon_state = "door_closed" + torn = /obj/item/inflatable/door/torn + intact = /obj/item/inflatable/door var/state = 0 //closed, 1 == open var/isSwitchingStates = 0 @@ -238,21 +242,6 @@ else icon_state = "door_closed" -/obj/structure/inflatable/door/deflate(var/violent=0) - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) - if(violent) - visible_message("[src] rapidly deflates!") - var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc) - src.transfer_fingerprints_to(R) - qdel(src) - else - visible_message("[src] slowly deflates.") - spawn(50) - var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc) - src.transfer_fingerprints_to(R) - qdel(src) - air_update_turf(1) - /obj/item/inflatable/torn name = "torn inflatable wall" desc = "A folded membrane which rapidly expands into a large cubical shape on activation. It is too torn to be usable." diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 19b6dc02617..91e2d552859 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -125,12 +125,13 @@ desc = "Heavy duty, airtight, plastic flaps." /obj/structure/plasticflaps/mining/Initialize() - air_update_turf(1) + air_update_turf(TRUE) ..() /obj/structure/plasticflaps/mining/Destroy() - air_update_turf(1) - return ..() + var/turf/T = get_turf(src) + . = ..() + T.air_update_turf(TRUE) /obj/structure/plasticflaps/mining/CanAtmosPass(turf/T) - return 0 + return FALSE