From 489d4f1580a9f76b7a5673142dfea86c1c368cbc Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Wed, 11 Apr 2018 15:36:59 +0100 Subject: [PATCH 1/3] Fixes Gr3y.T1d3 delaming the SM From f959571249c05305a608313d006e653c79bd1076 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 11 Apr 2018 06:11:49 -0400 Subject: [PATCH 2/3] Fixes Gr3y.T1d3 delaming the SM (#36925) Fixes #36841 --- _maps/map_files/BoxStation/BoxStation.dmm | 7 +++---- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- _maps/map_files/OmegaStation/OmegaStation.dmm | 10 ++++++++++ code/game/machinery/doors/airlock_types.dm | 6 ++++++ code/modules/events/prison_break.dm | 4 +++- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 7e2b344fbf5e..89052389e9d6 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -36253,8 +36253,7 @@ pixel_y = 24 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, @@ -47869,7 +47868,7 @@ /area/engine/supermatter) "cqE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/engineering/glass{ +/obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" @@ -48101,7 +48100,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "crt" = ( -/obj/machinery/door/airlock/engineering/glass{ +/obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index cb7d8e78a4d6..8f8c8998b763 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9914,7 +9914,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "aAW" = ( -/obj/machinery/door/airlock/atmos/glass{ +/obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_one_access_txt = "24;10" @@ -100691,7 +100691,7 @@ /turf/open/floor/plasteel/whitepurple/side, /area/science/misc_lab) "uYS" = ( -/obj/machinery/door/airlock/atmos/glass{ +/obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_one_access_txt = "24;10" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 30949cceedf2..9f33499f23aa 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -17900,7 +17900,7 @@ /turf/open/floor/engine, /area/engine/engineering) "aMj" = ( -/obj/machinery/door/airlock/engineering/glass{ +/obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" @@ -77193,7 +77193,7 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "tDM" = ( -/obj/machinery/door/airlock/engineering/glass{ +/obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d5fd7a85ffbd..075e200b20b6 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -18122,7 +18122,12 @@ /turf/closed/wall/r_wall/rust, /area/engine/supermatter) "aLR" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/atmos/glass{ +======= +/obj/machinery/door/airlock/atmos/glass/critical{ + heat_proof = 1; +>>>>>>> e71af8bc87... Fixes Gr3y.T1d3 delaming the SM (#36925) name = "Supermatter Chamber"; req_access_txt = "24" }, @@ -35713,7 +35718,12 @@ /turf/open/floor/plasteel, /area/engine/atmos) "wUF" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/atmos/glass{ +======= +/obj/machinery/door/airlock/atmos/glass/critical{ + heat_proof = 1; +>>>>>>> e71af8bc87... Fixes Gr3y.T1d3 delaming the SM (#36925) name = "Supermatter Chamber"; req_access_txt = "24" }, diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 020133172fd7..a4f81aeb86c2 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -88,6 +88,9 @@ opacity = 0 glass = TRUE +/obj/machinery/door/airlock/engineering/glass/critical + critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. + /obj/machinery/door/airlock/security/glass opacity = 0 glass = TRUE @@ -112,6 +115,9 @@ opacity = 0 glass = TRUE +/obj/machinery/door/airlock/atmos/glass/critical + critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. + /obj/machinery/door/airlock/science/glass opacity = 0 glass = TRUE diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 96f5a3917dac..e1dfe51bacf9 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -53,7 +53,9 @@ temp.update_icon() else if(istype(O, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/temp = O + if(temp.critical_machine) //Skip doors in critical positions, such as the SM chamber. + continue temp.prison_open() else if(istype(O, /obj/machinery/door_timer)) var/obj/machinery/door_timer/temp = O - temp.timer_end(forced = TRUE) \ No newline at end of file + temp.timer_end(forced = TRUE) From 79b15d5677db82c0ed4a192dd6286a117eac6f00 Mon Sep 17 00:00:00 2001 From: Nich Date: Wed, 11 Apr 2018 19:15:24 +0200 Subject: [PATCH 3/3] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 075e200b20b6..24b16d62e3fe 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -18122,12 +18122,8 @@ /turf/closed/wall/r_wall/rust, /area/engine/supermatter) "aLR" = ( -<<<<<<< HEAD -/obj/machinery/door/airlock/atmos/glass{ -======= /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; ->>>>>>> e71af8bc87... Fixes Gr3y.T1d3 delaming the SM (#36925) name = "Supermatter Chamber"; req_access_txt = "24" }, @@ -35718,12 +35714,8 @@ /turf/open/floor/plasteel, /area/engine/atmos) "wUF" = ( -<<<<<<< HEAD -/obj/machinery/door/airlock/atmos/glass{ -======= /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; ->>>>>>> e71af8bc87... Fixes Gr3y.T1d3 delaming the SM (#36925) name = "Supermatter Chamber"; req_access_txt = "24" },