Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More access tweaks #1077

Merged
merged 3 commits into from
Mar 11, 2024
Merged

More access tweaks #1077

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d8ea5e
More access tweaks
m-dzianishchyts Mar 10, 2024
c284568
Merge branch 'master' into supply-shuttle-access
Legendaxe Mar 11, 2024
1415ebe
trailing newline
Legendaxe Mar 11, 2024
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
14 changes: 8 additions & 6 deletions _maps/map_files220/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5415,7 +5415,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" = (
Expand Down Expand Up @@ -9789,12 +9789,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
Expand Down Expand Up @@ -14212,7 +14214,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" = (
Expand Down Expand Up @@ -56600,7 +56602,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" = (
Expand Down Expand Up @@ -81742,7 +81744,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)
Expand Down
13 changes: 7 additions & 6 deletions _maps/map_files220/cyberiad/cyberiad.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23069,7 +23069,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" = (
Expand Down Expand Up @@ -23194,12 +23194,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
Expand Down Expand Up @@ -24378,7 +24380,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" = (
Expand Down Expand Up @@ -25901,7 +25903,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" = (
Expand Down Expand Up @@ -85074,7 +85075,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" = (
Expand Down
18 changes: 13 additions & 5 deletions _maps/map_files220/delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7313,7 +7313,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" = (
Expand Down Expand Up @@ -8583,7 +8583,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" = (
Expand Down Expand Up @@ -8903,7 +8902,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" = (
Expand Down Expand Up @@ -9847,7 +9845,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" = (
Expand Down Expand Up @@ -94991,6 +94989,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"
Expand Down Expand Up @@ -154889,7 +154897,7 @@ ayD
aFR
aGP
aFN
aFR
ayD
aFN
aIk
aFR
Expand Down
13 changes: 8 additions & 5 deletions _maps/map_files220/generic/centcomm.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand Down
8 changes: 6 additions & 2 deletions modular_ss220/balance/code/access/access.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand All @@ -30,6 +30,10 @@
. = ..()
access += list(ACCESS_ATMOSPHERICS)

/datum/job/blueshield/New()
. = ..()
access += list(ACCESS_CARGO_BAY)

/datum/job/roboticist/New()
. = ..()
access += list(ACCESS_TOX)
access += list(ACCESS_TOX)

Check failure on line 39 in modular_ss220/balance/code/access/access.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Check Grep 

modular_ss220/balance/code/access/access.dm:39: Missing a trailing newline
Loading