Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes Gr3y.T1d3 delaming the SM #333

Merged
Amelia0010 merged 3 commits into from
Apr 11, 2018
Merged

Fixes Gr3y.T1d3 delaming the SM #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489d4f1
Fixes Gr3y.T1d3 delaming the SM
yogstation13-bot Apr 11, 2018
f959571
Fixes Gr3y.T1d3 delaming the SM (#36925)
ShizCalev Apr 11, 2018
79b15d5
Update OmegaStation.dmm
Amelia0010 Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions _maps/map_files/OmegaStation/OmegaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18122,7 +18122,8 @@
/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"
},
Expand Down Expand Up @@ -35713,7 +35714,8 @@
/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"
},
Expand Down
6 changes: 6 additions & 0 deletions code/game/machinery/doors/airlock_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion code/modules/events/prison_break.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)