[MIRROR] Firelocks can't close if an holofan is placed on their turf (#4891)

* Firelocks can't close if an holofan is placed on their turf (#58332)

* Firelocks can't close if an holofan is placed on their turf

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-04-13 14:39:14 +01:00
committed by GitHub
co-authored by Ghilker
parent bcd16b7f82
commit 5c2fdc82cb
3 changed files with 10 additions and 1 deletions
+3
View File
@@ -440,6 +440,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Minor trait used for beakers, or beaker-ishes. [/obj/item/reagent_containers], to show that they've been used in a reagent grinder.
#define TRAIT_MAY_CONTAIN_BLENDED_DUST "may_contain_blended_dust"
///Trait applied to turfs when an atmos holosign is placed on them. It will stop firedoors from closing.
#define TRAIT_FIREDOOR_STOP "firedoor_stop"
//Medical Categories for quirks
#define CAT_QUIRK_ALL 0
#define CAT_QUIRK_NOTES 1
+2
View File
@@ -224,6 +224,8 @@
latetoggle()
/obj/machinery/door/firedoor/close()
if(HAS_TRAIT(loc, TRAIT_FIREDOOR_STOP))
return
. = ..()
latetoggle()
+5 -1
View File
@@ -106,14 +106,18 @@
/obj/structure/holosign/barrier/atmos/Initialize()
. = ..()
var/turf/local = get_turf(loc)
ADD_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)
air_update_turf(TRUE, TRUE)
/obj/structure/holosign/barrier/atmos/BlockSuperconductivity() //Didn't used to do this, but it's "normal", and will help ease heat flow transitions with the players.
return TRUE
/obj/structure/holosign/barrier/atmos/Destroy()
. = ..()
var/turf/local = get_turf(loc)
REMOVE_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)
air_update_turf(TRUE, FALSE)
return ..()
/obj/structure/holosign/barrier/cyborg
name = "Energy Field"