From ed4a636f4ae795df651d6bbcfdc3471f14333bef Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Mon, 19 Apr 2021 23:10:56 +0200 Subject: [PATCH] Investigation map fix (#11698) --- html/changelogs/InvestigationMapFix.yml | 10 ++ maps/aurora/aurora-4_mainlevel.dmm | 123 ++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/InvestigationMapFix.yml diff --git a/html/changelogs/InvestigationMapFix.yml b/html/changelogs/InvestigationMapFix.yml new file mode 100644 index 00000000000..a76d66fe3ab --- /dev/null +++ b/html/changelogs/InvestigationMapFix.yml @@ -0,0 +1,10 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - maptweak: "Added a ringer to the investigations office, forensic lab, evidence storage & autopsy linked to a button by the lab front desk." + - maptweak: "Added intercoms to the forensic lab, evidence storage, autopsy & investigations office." + - maptweak: "Fixed the disposal in the forensic lab." + - maptweak: "Autopsy now has a request console for that paperwork." + - maptweak: "An air alarm has been put into evidence storage." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index d2a206d3729..ef0571151de 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -823,12 +823,19 @@ layer = 5; name = "adjusted reinforced window" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/forensics_laboratory) "abT" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/security/brig) "abU" = ( @@ -964,6 +971,11 @@ name = "Forensics Desk"; req_access = list(4) }, +/obj/machinery/ringer_button{ + id = "investigation_ringer"; + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/security/forensics_laboratory) "acm" = ( @@ -1350,6 +1362,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/brig) "acR" = ( @@ -1444,13 +1457,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/security/brig) "adb" = ( @@ -3261,8 +3271,12 @@ "agu" = ( /obj/structure/table/standard, /obj/item/storage/box/bodybags, -/obj/machinery/firealarm/west, /obj/item/device/healthanalyzer, +/obj/machinery/requests_console{ + department = "Autopsy"; + departmentType = 5; + pixel_x = -32 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -3987,6 +4001,12 @@ pixel_y = 5 }, /obj/item/pen/red, +/obj/machinery/ringer{ + department = "Security"; + id = "investigation_ringer"; + pixel_x = -30; + req_access = list(1) + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -60515,6 +60535,7 @@ /area/hallway/primary/port) "fiO" = ( /obj/structure/closet/crate/freezer, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -61175,6 +61196,12 @@ pixel_y = 5 }, /obj/item/pen, +/obj/item/device/radio/intercom{ + desc = "Talk... listen through this."; + name = "Station Intercom (Brig Radio)"; + pixel_y = 25; + wires = 7 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -61984,6 +62011,12 @@ /area/rnd/chemistry) "hIP" = ( /obj/structure/table/standard, +/obj/item/device/radio/intercom{ + desc = "Talk... listen through this."; + name = "Station Intercom (Brig Radio)"; + pixel_x = -28; + wires = 7 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -62402,6 +62435,9 @@ "itx" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) "ivh" = ( @@ -64793,6 +64829,12 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/item/device/radio/intercom{ + desc = "Talk... listen through this."; + name = "Station Intercom (Brig Radio)"; + pixel_y = 25; + wires = 7 + }, /turf/simulated/floor/tiled/dark, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -65506,6 +65548,12 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/ringer{ + department = "Security"; + id = "investigation_ringer"; + pixel_y = 30; + req_access = list(1) + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -65566,6 +65614,16 @@ /obj/structure/target_stake, /turf/simulated/floor/plating, /area/maintenance/research_port) +"oUH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_laboratory) "oVj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_research{ @@ -65723,6 +65781,16 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/research_port) +"phk" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/ringer{ + department = "Security"; + id = "investigation_ringer"; + pixel_y = -30; + req_access = list(1) + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_laboratory) "phM" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -66107,6 +66175,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"pLP" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/security/brig) "pQp" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -66287,6 +66362,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"qkc" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_laboratory) "qkU" = ( /obj/machinery/light{ dir = 8 @@ -66782,6 +66866,9 @@ pixel_y = 16 }, /obj/item/storage/briefcase/crimekit, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/forensics_laboratory) "rbT" = ( @@ -66964,6 +67051,12 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/ringer{ + department = "Security"; + id = "investigation_ringer"; + pixel_x = 30; + req_access = list(1) + }, /turf/simulated/floor/tiled/dark, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -67902,6 +67995,12 @@ pixel_x = 5; pixel_y = 3 }, +/obj/item/device/radio/intercom{ + desc = "Talk... listen through this."; + name = "Station Intercom (Brig Radio)"; + pixel_y = 25; + wires = 7 + }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) "sYI" = ( @@ -71124,6 +71223,10 @@ /obj/item/folder/sec, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/item/device/hand_labeler, +/obj/machinery/alarm{ + pixel_y = 28; + target_temperature = 278 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -100597,7 +100700,7 @@ xcZ xBx abb abx -xBx +phk afe abQ acI @@ -102139,7 +102242,7 @@ tsx srX dob abB -abB +qkc acj ltW acN @@ -102396,7 +102499,7 @@ aaJ srX abf abC -tOQ +oUH ack tOQ acO @@ -102911,8 +103014,8 @@ aaV abh abE abT -abT -abT +pLP +pLP acQ ada adu