cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Gr3y.T1d3 delaming the SM (#36925)

Browse Source 
Fixes #36841
This commit is contained in:
ShizCalev
2018-04-11 06:11:49 -04:00
committed by oranges
parent 99026a95bf
commit e71af8bc87
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+3 -4
View File
@@ -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"
_maps/map_files/Deltastation/DeltaStation2.dmm
+2 -2
View File
@@ -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"
_maps/map_files/MetaStation/MetaStation.dmm
+2 -2
View File
@@ -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"
_maps/map_files/OmegaStation/OmegaStation.dmm
+2 -2
View File
@@ -18129,7 +18129,7 @@
/turf/closed/wall/r_wall/rust,
/area/engine/supermatter)
"aLR" = (
/obj/machinery/door/airlock/atmos/glass{
/obj/machinery/door/airlock/atmos/glass/critical{
heat_proof = 1;
name = "Supermatter Chamber";
req_access_txt = "24"
@@ -35800,7 +35800,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"wUF" = (
/obj/machinery/door/airlock/atmos/glass{
/obj/machinery/door/airlock/atmos/glass/critical{
heat_proof = 1;
name = "Supermatter Chamber";
req_access_txt = "24"
code/game/machinery/doors/airlock_types.dm
+6
View File
@@ -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
code/modules/events/prison_break.dm
+3 -1
View File
@@ -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)
temp.timer_end(forced = TRUE)