shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14822 from qweq12yt/more-cargo-features

Browse Source 
Solving inconsistencies regarding QM being command
This commit is contained in:
silicons
2021-06-29 08:46:33 -07:00
committed by GitHub
parent 392111dc74 663a8c4853
commit f4c6888f96
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+3 -3
View File
@@ -30488,7 +30488,7 @@
/obj/machinery/keycard_auth{
pixel_x = -24
},
/obj/machinery/computer/cargo{
/obj/machinery/computer/cargo/request{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
@@ -31346,7 +31346,7 @@
/turf/open/floor/plasteel,
/area/cargo/qm)
"bwT" = (
/obj/machinery/door/airlock/mining/glass{
/obj/machinery/door/airlock/command{
name = "Quartermaster";
req_access_txt = "41"
},
@@ -31611,7 +31611,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/science)
"bxw" = (
/obj/machinery/door/airlock/mining/glass{
/obj/machinery/door/airlock/command{
name = "Quartermaster";
req_access_txt = "41"
},
_maps/map_files/Deltastation/DeltaStation2.dmm
+2 -2
View File
@@ -111598,7 +111598,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
/obj/machinery/door/airlock/command{
name = "Quartermaster's Quarters";
req_access_txt = "41"
},
@@ -127746,7 +127746,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
/obj/machinery/door/airlock/command{
name = "Quartermaster's Office";
req_access_txt = "41"
},
_maps/map_files/MetaStation/MetaStation.dmm
+1 -1
View File
@@ -56562,7 +56562,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
/obj/machinery/door/airlock/command{
name = "Quartermaster";
req_access_txt = "41"
},
_maps/map_files/PubbyStation/PubbyStation.dmm
+1 -1
View File
@@ -23298,7 +23298,7 @@
/turf/open/floor/plating,
/area/cargo/qm)
"bbG" = (
/obj/machinery/door/airlock/mining/glass{
/obj/machinery/door/airlock/command{
name = "Quartermaster";
req_access_txt = "41"
},
code/modules/jobs/job_types/head_of_personnel.dm
+4 -4
View File
@@ -23,14 +23,14 @@
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY)
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/quartermaster.dm
+1 -1
View File
@@ -25,7 +25,7 @@
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING,
ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS, ACCESS_HEADS)
paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck.
paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck. //alright i'll agree to that -qweq
paycheck_department = ACCOUNT_CAR
display_order = JOB_DISPLAY_ORDER_QUARTERMASTER