From 5d8ea5eff57320648feb0dff27c2c4f9182819a4 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Sun, 10 Mar 2024 18:44:41 +0300 Subject: [PATCH 1/2] More access tweaks --- _maps/map_files220/MetaStation/MetaStation.dmm | 14 ++++++++------ _maps/map_files220/cyberiad/cyberiad.dmm | 13 +++++++------ _maps/map_files220/delta/delta.dmm | 18 +++++++++++++----- _maps/map_files220/generic/centcomm.dmm | 13 ++++++++----- modular_ss220/balance/code/access/access.dm | 6 +++++- 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index d26242666853..bf62f4501915 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -5403,7 +5403,7 @@ locked = 1 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "aDB" = ( @@ -9773,12 +9773,14 @@ /obj/machinery/door_control/shutter/west{ id = "QMLoaddoor"; name = "Loading Doors"; - pixel_y = -5 + pixel_y = -8; + req_one_access_txt = "79" }, /obj/machinery/door_control/shutter/west{ id = "QMLoaddoor2"; name = "Loading Doors"; - pixel_y = 5 + pixel_y = 8; + req_one_access_txt = "79" }, /obj/machinery/computer/supplycomp{ dir = 4 @@ -14192,7 +14194,7 @@ }, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/maintenance/port2) "bfp" = ( @@ -56621,7 +56623,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/lobby) "iKZ" = ( @@ -81777,7 +81779,7 @@ /obj/machinery/door_control/shutter/north{ id = "qm_warehouse"; name = "Warehouse Door Control"; - req_access_txt = "31" + req_one_access_txt = "78" }, /turf/simulated/floor/plasteel, /area/station/supply/storage) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 1ddd1c661b72..c16eab561220 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -23031,7 +23031,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/maintenance/port) "bNI" = ( @@ -23155,12 +23155,14 @@ /obj/machinery/door_control/shutter/west{ id = "QMLoaddoor"; name = "Loading Doors"; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "79" }, /obj/machinery/door_control/shutter/west{ id = "QMLoaddoor2"; name = "Loading Doors"; - pixel_y = 8 + pixel_y = 8; + req_one_access_txt = "79" }, /obj/effect/turf_decal{ dir = 8 @@ -24336,7 +24338,7 @@ locked = 1 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "bTu" = ( @@ -25862,7 +25864,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "cat" = ( @@ -84986,7 +84987,7 @@ locked = 1 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "sfu" = ( diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 496ec0a007b9..428a31837ddc 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -7302,7 +7302,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "aFO" = ( @@ -8587,7 +8587,6 @@ /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, /turf/simulated/floor/plasteel, /area/station/supply/office) "aKE" = ( @@ -8906,7 +8905,6 @@ /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, /turf/simulated/floor/plasteel, /area/station/supply/office) "aMd" = ( @@ -9851,7 +9849,7 @@ }, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/supply/storage) "aQs" = ( @@ -94928,6 +94926,16 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/door_control/shutter/east{ + pixel_y = -8; + id = "QMLoaddoor2"; + req_one_access_txt = "79" + }, +/obj/machinery/door_control/shutter/east{ + pixel_y = 8; + id = "QMLoaddoor"; + req_one_access_txt = "79" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -154804,7 +154812,7 @@ ayD aFR aGP aFN -aFR +ayD aFN aIk aFR diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index b682e635eb48..5dade58fb721 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -2524,7 +2524,8 @@ id = "QMLoaddoor"; layer = 3; name = "Loading Doors"; - pixel_y = 8 + pixel_y = 8; + req_one_access_txt = "79" }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) @@ -6057,7 +6058,7 @@ /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; name = "Shuttle Hatch"; - req_access_txt = "31" + req_one_access_txt = "79" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -26347,13 +26348,15 @@ id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "106" }, /obj/machinery/door_control/no_emag/east{ id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; - pixel_y = 8 + pixel_y = 8; + req_one_access_txt = "106" }, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/supply) @@ -34162,7 +34165,7 @@ /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; name = "Shuttle Hatch"; - req_access_txt = "31" + req_one_access_txt = "79" }, /obj/structure/fans/tiny, /obj/docking_port/mobile/supply{ diff --git a/modular_ss220/balance/code/access/access.dm b/modular_ss220/balance/code/access/access.dm index 67c135a4377a..75e252025369 100644 --- a/modular_ss220/balance/code/access/access.dm +++ b/modular_ss220/balance/code/access/access.dm @@ -4,7 +4,7 @@ /datum/job/mining/New() . = ..() - access += list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MAILSORTING) + access += list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MAILSORTING) /datum/job/bartender/New() . = ..() @@ -29,3 +29,7 @@ /datum/job/engineer/New() . = ..() access += list(ACCESS_ATMOSPHERICS) + +/datum/job/blueshield/New() + . = ..() + access += list(ACCESS_CARGO_BAY) From 1415ebe2b9b5e3d28853eee21b4f2f75c095bd1a Mon Sep 17 00:00:00 2001 From: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:47:44 +0200 Subject: [PATCH 2/2] trailing newline --- modular_ss220/balance/code/access/access.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/balance/code/access/access.dm b/modular_ss220/balance/code/access/access.dm index 883094164a62..a665eaf114b7 100644 --- a/modular_ss220/balance/code/access/access.dm +++ b/modular_ss220/balance/code/access/access.dm @@ -36,4 +36,4 @@ /datum/job/roboticist/New() . = ..() - access += list(ACCESS_TOX) \ No newline at end of file + access += list(ACCESS_TOX)