From 04529469c0a0ac04fbb13ced7c0ad12cb3b6c846 Mon Sep 17 00:00:00 2001 From: gregolego <61952812+dablusniper@users.noreply.github.com> Date: Sat, 21 Mar 2020 14:13:00 +0100 Subject: [PATCH] Minor map fixes (#50086) * Minor map fixes part 1 Donut: - Gave geneticist medical access on donut - Geneticist can now use genetics maint and South genetic door - Replaced genetics door with glass door (for aesthetics) Meta: - Fixed cell 3 door/timer being linked to cell 2. Now cell 3 is independent from cell 2. Bar bluespace shelter: - Gave mining access to bar area (it's sort of redundant otherwise) * Minor map fixes part 2 - Added "purge" AI module to risky AI module spawner - Added "reset" AI module to AI chamber on donut * Fixed trailing newline --- _maps/map_files/Donutstation/Donutstation.dmm | 10 +++++----- _maps/map_files/Donutstation/Donutstation_LVL2.dmm | 3 ++- _maps/map_files/Donutstation/job_changes.dm | 7 +++++++ _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- _maps/templates/shelter_3.dmm | 2 +- code/game/objects/effects/spawners/lootdrop.dm | 3 ++- code/modules/jobs/map_changes/map_changes.dm | 3 +++ 7 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 _maps/map_files/Donutstation/job_changes.dm diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index e4446a9e47f82..efac2283f0527 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -14021,14 +14021,14 @@ /turf/open/floor/plasteel, /area/hydroponics) "aFR" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Research"; + req_access_txt = "5;9" + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "aFS" = ( @@ -33797,7 +33797,7 @@ "bwm" = ( /obj/machinery/door/airlock/maintenance{ name = "Genetics Maintenance Access"; - req_access_txt = "5; 9; 68" + req_access_txt = "5;9" }, /turf/open/floor/plating, /area/maintenance/port) diff --git a/_maps/map_files/Donutstation/Donutstation_LVL2.dmm b/_maps/map_files/Donutstation/Donutstation_LVL2.dmm index a5c071597c412..9905f23e24bb2 100644 --- a/_maps/map_files/Donutstation/Donutstation_LVL2.dmm +++ b/_maps/map_files/Donutstation/Donutstation_LVL2.dmm @@ -7780,6 +7780,7 @@ /obj/structure/sign/plaques/kiddie{ pixel_x = -32 }, +/obj/item/aiModule/supplied/quarantine, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "qV" = ( @@ -8329,13 +8330,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/aiModule/supplied/quarantine, /obj/machinery/airalarm{ dir = 8; pixel_x = 24; req_access = null; req_one_access_txt = "2;24" }, +/obj/item/aiModule/reset, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "rX" = ( diff --git a/_maps/map_files/Donutstation/job_changes.dm b/_maps/map_files/Donutstation/job_changes.dm new file mode 100644 index 0000000000000..6c7150cd1c2b2 --- /dev/null +++ b/_maps/map_files/Donutstation/job_changes.dm @@ -0,0 +1,7 @@ +#define JOB_MODIFICATION_MAP_NAME "Donutstation" + +/datum/job/geneticist/New() + ..() + MAP_JOB_CHECK + access += ACCESS_MEDICAL + minimal_access += ACCESS_MEDICAL diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b08d528b9a2ec..34fa4230b8d8c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -68596,8 +68596,8 @@ /area/medical/virology) "dBX" = ( /obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 2"; - name = "Cell 2" + id = "Cell 3"; + name = "Cell 3" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index f2a3de030cae3..729d634c6efc9 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -129,7 +129,7 @@ /area/survivalpod) "v" = ( /obj/machinery/door/window/survival_pod{ - req_access_txt = "25" + req_access_txt = "25;48" }, /turf/open/floor/pod/dark, /area/survivalpod) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a8e6081bf33b4..fe23df4bd5b44 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -327,7 +327,8 @@ /obj/item/aiModule/core/full/balance, /obj/item/aiModule/core/full/tyrant, /obj/item/aiModule/core/full/thermurderdynamic, - /obj/item/aiModule/core/full/damaged + /obj/item/aiModule/core/full/damaged, + /obj/item/aiModule/reset/purge ) // Tech storage circuit board spawners diff --git a/code/modules/jobs/map_changes/map_changes.dm b/code/modules/jobs/map_changes/map_changes.dm index 0eeebd7392325..a1e7e1adecc8a 100644 --- a/code/modules/jobs/map_changes/map_changes.dm +++ b/code/modules/jobs/map_changes/map_changes.dm @@ -5,3 +5,6 @@ #include "..\..\..\..\_maps\map_files\BoxStation\job_changes.dm" #undef JOB_MODIFICATION_MAP_NAME + +#include "..\..\..\..\_maps\map_files\Donutstation\job_changes.dm" +#undef JOB_MODIFICATION_MAP_NAME