From 5dfd1f7d429b1dd2ee3b8b3a7175b8220c4a337b Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 12 Apr 2018 18:53:01 -0400 Subject: [PATCH 1/2] grunge airlock --- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 6 +-- .../map_files/Deltastation/DeltaStation2.dmm | 18 +++---- _maps/map_files/MetaStation/MetaStation.dmm | 20 ++++---- _maps/map_files/OmegaStation/OmegaStation.dmm | 16 +++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 50 +++++++++---------- code/game/machinery/doors/airlock_types.dm | 9 +++- .../objects/structures/door_assembly_types.dm | 6 +++ 7 files changed, 68 insertions(+), 57 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index cd711dd7aa..f6f090e807 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1040,7 +1040,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/workroom) "dj" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Hotel Staff Storage" }, /obj/structure/cable{ @@ -2047,7 +2047,7 @@ /turf/open/floor/plasteel/bar, /area/ruin/space/has_grav/hotel/bar) "gs" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Hotel Staff Room"; req_access_txt = "200" }, @@ -4297,7 +4297,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "mQ" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Hotel Staff Room"; req_access_txt = "200" }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 26ad2b8e78..8831c0243f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -86912,7 +86912,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "9" }, @@ -88643,7 +88643,7 @@ /area/hallway/primary/aft) "dGg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "6" }, @@ -88770,7 +88770,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "5" }, @@ -95537,7 +95537,7 @@ }, /area/chapel/office) "dVb" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Morgue"; req_access_txt = "27" }, @@ -95573,7 +95573,7 @@ /area/chapel/main) "dVh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Hall" }, /obj/structure/disposalpipe/segment{ @@ -95845,7 +95845,7 @@ /area/chapel/main) "dVW" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Hall" }, /obj/effect/turf_decal/stripes/line{ @@ -97206,7 +97206,7 @@ /turf/closed/wall, /area/chapel/office) "dZi" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Crematorium"; req_access_txt = "27" }, @@ -98779,7 +98779,7 @@ /turf/closed/wall, /area/chapel/main) "ecU" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Office"; req_access_txt = "27" }, @@ -99853,7 +99853,7 @@ }, /area/chapel/office) "efm" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Quarters"; req_access_txt = "27" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 77546c544e..f9de891e3d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -21345,7 +21345,7 @@ /area/hallway/primary/fore) "aRX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Courtroom"; opacity = 1 }, @@ -23131,7 +23131,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Courtroom"; opacity = 1 }, @@ -37479,7 +37479,7 @@ /area/security/vacantoffice) "bzz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom/abandoned{ +/obj/machinery/door/airlock/grunge/abandoned{ name = "Vacant Office"; opacity = 1; req_access_txt = "32" @@ -39286,7 +39286,7 @@ /area/crew_quarters/bar) "bDG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Club"; opacity = 1 }, @@ -40147,7 +40147,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Club"; opacity = 1 }, @@ -44175,7 +44175,7 @@ /area/maintenance/port) "bOk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Quiet Room"; opacity = 1 }, @@ -44184,7 +44184,7 @@ /area/library) "bOl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Quiet Room"; opacity = 1 }, @@ -62913,7 +62913,7 @@ /area/medical/genetics/cloning) "cBc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Genetics"; opacity = 1; req_access_txt = "9" @@ -64322,7 +64322,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; opacity = 1; req_access_txt = "5" @@ -64874,7 +64874,7 @@ /area/medical/morgue) "cEY" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; opacity = 1; req_access_txt = "6" diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index b918af9e64..aa7f64800d 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -20480,7 +20480,7 @@ /area/medical/morgue) "aRd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "5" }, @@ -22207,7 +22207,7 @@ /area/medical/morgue) "aVf" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "5" }, @@ -27275,7 +27275,7 @@ /turf/closed/wall, /area/chapel/main) "bfz" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Crematorium"; req_access_txt = "27" }, @@ -28145,7 +28145,7 @@ /turf/closed/wall, /area/chapel/main) "bhr" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Crematorium"; req_access_txt = "27" }, @@ -28217,7 +28217,7 @@ /area/chapel/main) "bhy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Hall" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -28798,7 +28798,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/main) "biH" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Quarters"; req_access_txt = "27" }, @@ -28842,7 +28842,7 @@ /area/chapel/main) "biM" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Office"; req_access_txt = "27" }, @@ -29849,7 +29849,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "blA" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Mass Driver Room"; req_access_txt = "27" }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 654038c283..33e7a62547 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -24379,7 +24379,7 @@ /area/medical/morgue) "biZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; opacity = 1; req_access_txt = "6" @@ -26892,7 +26892,7 @@ /area/medical/medbay/zone3) "bpG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; opacity = 1; req_access_txt = "6" @@ -26951,7 +26951,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Morgue"; opacity = 1; req_access_txt = "6" @@ -36984,7 +36984,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/dock) "bLq" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Monastery Transit"; opacity = 1 }, @@ -38481,7 +38481,7 @@ /turf/open/space, /area/space/nearstation) "bPn" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -38493,7 +38493,7 @@ }, /area/chapel/dock) "bPo" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -41769,7 +41769,7 @@ /turf/closed/wall, /area/chapel/main/monastery) "bWW" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -41779,7 +41779,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "bWX" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -43669,7 +43669,7 @@ }, /area/chapel/main/monastery) "cbR" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Access"; opacity = 1 }, @@ -44348,7 +44348,7 @@ /turf/open/floor/plasteel/asteroid, /area/chapel/office) "ceg" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Office"; opacity = 1; req_access_txt = "22" @@ -44369,7 +44369,7 @@ /turf/closed/wall, /area/chapel/office) "cei" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -44382,7 +44382,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cej" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -44390,7 +44390,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cek" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel"; opacity = 1 }, @@ -44398,7 +44398,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cel" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Access"; opacity = 1 }, @@ -44689,7 +44689,7 @@ /turf/closed/wall, /area/chapel/office) "cfl" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Access"; opacity = 1 }, @@ -45752,7 +45752,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cjl" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Monastery Cemetary"; opacity = 1 }, @@ -45839,7 +45839,7 @@ /turf/open/floor/plating, /area/chapel/main/monastery) "cjH" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Garden"; opacity = 1 }, @@ -46202,7 +46202,7 @@ /turf/open/floor/plasteel/dark, /area/library/lounge) "ckT" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -47978,7 +47978,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "crJ" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Crematorium"; opacity = 1; req_access_txt = "27" @@ -48225,7 +48225,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Chapel Office"; opacity = 1; req_access_txt = "22" @@ -49112,7 +49112,7 @@ /turf/closed/wall/mineral/iron, /area/library/lounge) "cwg" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/structure/cable{ @@ -49357,7 +49357,7 @@ /turf/open/floor/carpet, /area/library/lounge) "cxz" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -50432,7 +50432,7 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "jgr" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -50561,7 +50561,7 @@ /turf/open/floor/plasteel, /area/science/circuit) "lqy" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -50963,7 +50963,7 @@ /turf/open/floor/plasteel, /area/science/circuit) "vOw" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/grunge{ name = "Library" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 020133172f..348d238f4c 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -302,7 +302,7 @@ CentCom Airlocks */ -/obj/machinery/door/airlock/centcom +/obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such. icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_centcom @@ -310,7 +310,12 @@ security_level = 6 explosion_block = 2 -/obj/machinery/door/airlock/centcom/abandoned +/obj/machinery/door/airlock/grunge + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_grunge + +/obj/machinery/door/airlock/grunge/abandoned abandoned = TRUE ////////////////////////////////// diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index b4e8b19aac..28d74422fc 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -161,6 +161,12 @@ airlock_type = /obj/machinery/door/airlock/centcom noglass = TRUE +/obj/structure/door_assembly/door_assembly_grunge + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/grunge + noglass = TRUE + /obj/structure/door_assembly/door_assembly_gold name = "gold airlock assembly" icon = 'icons/obj/doors/airlocks/station/gold.dmi'