From bc86d26058f2a3447ed30b565879eb0222ab9b8e Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 23 Mar 2019 14:38:27 +0100 Subject: [PATCH 1/6] fixed the atmos not updating --- code/game/objects/structures/holosign.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 0b730a539b9..36b15796924 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -82,7 +82,8 @@ /obj/structure/holosign/barrier/atmos/Destroy() var/turf/T = get_turf(src) - T.air_update_turf(TRUE) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/holosign/barrier/cyborg From 8b0334209de5e64ede7ddffa4f262c7ab164750d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 23 Mar 2019 14:44:37 +0100 Subject: [PATCH 2/6] fixes the inflatable bug as well --- code/game/objects/structures/inflatable.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 4ea0fc34e2d..bc006d9dd3b 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -27,10 +27,12 @@ /obj/structure/inflatable/Initialize(location) ..() - air_update_turf(1) + air_update_turf(TRUE) /obj/structure/inflatable/Destroy() - air_update_turf(1) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0) From d04254a668c713acfc0da664e4e70585221f6de8 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 23 Mar 2019 15:10:58 +0100 Subject: [PATCH 3/6] fixes more --- code/game/machinery/doors/spacepod.dm | 4 +++- .../effects/effect_system/effects_foam.dm | 4 +++- code/game/objects/structures/aliens.dm | 4 +++- code/game/objects/structures/inflatable.dm | 22 ++++--------------- code/game/objects/structures/plasticflaps.dm | 8 ++++--- code/modules/mining/mine_items.dm | 4 +++- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 5aea5b477ed..0e82417b017 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -15,7 +15,9 @@ return 0 /obj/structure/spacepoddoor/Destroy() - air_update_turf(1) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/spacepoddoor/CanPass(atom/movable/A, turf/T) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index e765e59442d..f44070147a4 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -178,7 +178,9 @@ air_update_turf(1) /obj/structure/foamedmetal/Destroy() - air_update_turf(1) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/foamedmetal/Move() diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 1738344ae60..f782f58d68d 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -56,7 +56,9 @@ ..() /obj/structure/alien/resin/Destroy() - air_update_turf(1) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/alien/resin/Move() diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index bc006d9dd3b..345388807dd 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -22,7 +22,8 @@ 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) @@ -124,13 +125,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)///obj/item/inflatable/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)///obj/item/inflatable(loc) src.transfer_fingerprints_to(R) qdel(src) @@ -240,21 +241,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..4fe5bfd93d1 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -125,12 +125,14 @@ 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) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/plasticflaps/mining/CanAtmosPass(turf/T) - return 0 + return FALSE diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c3c276a5766..3f3c4b95252 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -529,7 +529,9 @@ /obj/structure/fans/Destroy() arbitraryatmosblockingvar = 0 - air_update_turf(1) + var/turf/T = get_turf(src) + spawn(0) + T.air_update_turf(TRUE) return ..() /obj/structure/fans/CanAtmosPass(turf/T) From f4168349e22d026645c1ff5e6ffcfbeaa960cac9 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 23 Mar 2019 15:16:59 +0100 Subject: [PATCH 4/6] correct inflatable deflate items --- code/game/objects/structures/inflatable.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 345388807dd..10e9dda5e98 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -167,6 +167,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 From c05103c3f2be47111776171bd3ddd27ed356d7ca Mon Sep 17 00:00:00 2001 From: farie82 Date: Sat, 23 Mar 2019 15:18:00 +0100 Subject: [PATCH 5/6] comments be gone --- code/game/objects/structures/inflatable.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 10e9dda5e98..a00734eba5f 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -125,13 +125,13 @@ playsound(loc, 'sound/machines/hiss.ogg', 75, 1) if(violent) visible_message("[src] rapidly deflates!") - var/obj/item/inflatable/torn/R = new torn(loc)///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 intact(loc)///obj/item/inflatable(loc) + var/obj/item/inflatable/R = new intact(loc) src.transfer_fingerprints_to(R) qdel(src) From f903290e1ca26c9fbc7c7cd65f4aad8d0eafbeee Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 24 Mar 2019 07:59:39 +0100 Subject: [PATCH 6/6] better way --- code/game/machinery/doors/spacepod.dm | 5 ++--- code/game/objects/effects/effect_system/effects_foam.dm | 5 ++--- code/game/objects/structures/aliens.dm | 5 ++--- code/game/objects/structures/holosign.dm | 5 ++--- code/game/objects/structures/inflatable.dm | 5 ++--- code/game/objects/structures/plasticflaps.dm | 5 ++--- code/modules/mining/mine_items.dm | 4 +--- 7 files changed, 13 insertions(+), 21 deletions(-) diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 0e82417b017..ae966070f22 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -16,9 +16,8 @@ /obj/structure/spacepoddoor/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + 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 f44070147a4..0a8436867be 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -179,9 +179,8 @@ /obj/structure/foamedmetal/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + 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 f782f58d68d..111da862e97 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -57,9 +57,8 @@ /obj/structure/alien/resin/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + 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 36b15796924..e5c0fc85722 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -82,9 +82,8 @@ /obj/structure/holosign/barrier/atmos/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + T.air_update_turf(TRUE) /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 a00734eba5f..f4efa5452b0 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -32,9 +32,8 @@ /obj/structure/inflatable/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + T.air_update_turf(TRUE) /obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0) return 0 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 4fe5bfd93d1..91e2d552859 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -130,9 +130,8 @@ /obj/structure/plasticflaps/mining/Destroy() var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) - return ..() + . = ..() + T.air_update_turf(TRUE) /obj/structure/plasticflaps/mining/CanAtmosPass(turf/T) return FALSE diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 3f3c4b95252..c3c276a5766 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -529,9 +529,7 @@ /obj/structure/fans/Destroy() arbitraryatmosblockingvar = 0 - var/turf/T = get_turf(src) - spawn(0) - T.air_update_turf(TRUE) + air_update_turf(1) return ..() /obj/structure/fans/CanAtmosPass(turf/T)