From 573dce1311c1e6c080cbc6daad5dfba6f12c539d Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Wed, 1 Mar 2023 21:44:39 -0600 Subject: [PATCH 01/19] Changes IDs Add: Blueshield CENTCOM to Silver ID Add: NT Rep CENTCOM to Silver ID Add: Weapon Permit access for QM Add: Surgery access for Brigmed --- code/datums/id_trim/jobs.dm | 1 + .../master_files/code/datums/id_trim/jobs.dm | 19 ++++++++++--------- .../modules/blueshield/code/blueshield.dm | 2 +- .../code/nanotrasen_consultant.dm | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 53d65854966..07b9fbccd71 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -810,6 +810,7 @@ ACCESS_COMMAND, ACCESS_EVA, ACCESS_BRIG_ENTRANCE, + ACCESS_WEAPONS, //BUBBER EDIT ) extra_access = list() minimal_wildcard_access = list( diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 55211885d58..30a80cc143e 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -70,14 +70,13 @@ orbit_icon = "clipboard-check" sechud_icon_state = SECHUD_NT_CONSULTANT extra_access = list() - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINEERING, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_COMMAND, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_TELEPORTER, ACCESS_CENT_GENERAL) - minimal_wildcard_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL) + //BUBBER EDIT START + minimal_access = list( + ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, + ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, + ) + //BUBBER EDIT END + minimal_wildcard_access = list() template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) /datum/id_trim/job/security_medic @@ -89,7 +88,9 @@ subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_SECURITY_MEDIC extra_access = list(ACCESS_DETECTIVE) - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) + //BUBBER EDIT START + minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_SURGERY,) + //BUBBER EDIT END template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) /datum/id_trim/job/security_medic/New() diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index d21be806882..3ef9522fb34 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -49,7 +49,7 @@ uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield gloves = /obj/item/clothing/gloves/tackler/combat/insulated - id = /obj/item/card/id/advanced/centcom + id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 1cca23d4fb3..abd6873b042 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -68,7 +68,7 @@ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/centcom) - id = /obj/item/card/id/advanced/centcom + id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM id_trim = /datum/id_trim/job/nanotrasen_consultant /obj/item/radio/headset/heads/nanotrasen_consultant From 725a6c75c12eb115f4d6de452cc52bfff601000a Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Thu, 2 Mar 2023 00:32:20 -0600 Subject: [PATCH 02/19] Fixes the Blueshield ID Blueshield ID is now silver --- modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 8 ++++---- modular_skyrat/modules/blueshield/code/blueshield.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 30a80cc143e..83307b321fa 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -57,9 +57,9 @@ extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare minimal_access = list( ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, - ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, + ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_WEAPONS, ) - minimal_wildcard_access = list(ACCESS_CAPTAIN) + minimal_wildcard_access = list() //BUBBER EDIT: Original ACCESS_CAPTAIN template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) /datum/id_trim/job/nanotrasen_consultant @@ -75,8 +75,8 @@ ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ) - //BUBBER EDIT END minimal_wildcard_access = list() + //BUBBER EDIT END template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) /datum/id_trim/job/security_medic @@ -89,7 +89,7 @@ sechud_icon_state = SECHUD_SECURITY_MEDIC extra_access = list(ACCESS_DETECTIVE) //BUBBER EDIT START - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_SURGERY,) + minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_SURGERY) //BUBBER EDIT END template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index 3ef9522fb34..c977b9d905f 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -49,7 +49,6 @@ uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield gloves = /obj/item/clothing/gloves/tackler/combat/insulated - id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses @@ -64,7 +63,8 @@ box = /obj/item/storage/box/survival/security belt = /obj/item/modular_computer/pda/security - id_trim = /datum/id_trim/job/blueshield + id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM + id_trim = /datum/id_trim/job/blueshield //BUBBER EDIT /datum/outfit/plasmaman/blueshield name = "Blueshield Plasmaman" From e1f61327dfec7c415538d74724bb7ab24f4acfc3 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Thu, 2 Mar 2023 20:42:14 -0600 Subject: [PATCH 03/19] Removes "BUBBER EDIT" comment --- modular_skyrat/modules/blueshield/code/blueshield.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index c977b9d905f..b7dd317bbb8 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -64,7 +64,7 @@ belt = /obj/item/modular_computer/pda/security id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM - id_trim = /datum/id_trim/job/blueshield //BUBBER EDIT + id_trim = /datum/id_trim/job/blueshield /datum/outfit/plasmaman/blueshield name = "Blueshield Plasmaman" From 323c5477d0ff92a453010f015922ffb2bf561a8b Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 14:17:05 -0600 Subject: [PATCH 04/19] Updates access.dm Add: NTRep Access --- code/__DEFINES/access.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 33b5808936c..802152af924 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -32,6 +32,10 @@ #define ACCESS_CAPTAIN "captain" /// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. #define ACCESS_HOP "hop" +//ACCESS FOR THE NTRep's personal quarters in mapping. +#define ACCESS_REPRESENTATIVE "representative" +//BUBBER EDIT END: Add NTRep Access + /// Security's General Access. In mapping, grants access to spaces such as to the "meeting room" or firing range, as well as being the general access that Tablet/Computer Programs check for "heads". Also unlocks other types of security equipment. #define ACCESS_SECURITY "security" @@ -353,7 +357,8 @@ ACCESS_HOP, \ ACCESS_QM, \ ACCESS_RD, \ -) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS + ACCESS_REPRESENTATIVE, \ + ) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS //BUBBER EDIT: Added ACCESS_REPRESENTATIVE to PRIVATE_COMMAND_ACCESS /// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) #define CAPTAIN_ACCESS list( \ From 19cd619ca2051a5535b3cbad9b6e3edc73c8af1b Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 14:36:45 -0600 Subject: [PATCH 05/19] Consultant's officer acc. change Add: NT Consultant's Locker access --- code/modules/awaymissions/gateway.dm | 2 +- .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 9378d3330df..8774c897de1 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -339,7 +339,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) /obj/machinery/computer/gateway_control name = "Gateway Control" desc = "Human friendly interface to the mysterious gate next to it." - req_access = list(ACCESS_CENT_GENERAL) //SKYRAT EDIT ADDITION + req_access = list(ACCESS_SECURITY) //BUBBER EDIT ADDITION var/obj/machinery/gateway/G /obj/machinery/computer/gateway_control/Initialize(mapload, obj/item/circuitboard/C) diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index abd6873b042..012fc7c2178 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -128,7 +128,7 @@ /obj/structure/closet/secure_closet/nanotrasen_consultant/station name = "\proper nanotrasen consultant's locker" - req_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL) + req_access = list(ACCESS_REPRESENTATIVE) //BUBBER EDIT icon_state = "cc" icon = 'modular_skyrat/master_files/icons/obj/closet.dmi' door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS From 1b2e19c138e1a3a29e7ec662ffd6335e11ab05e3 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 15:07:05 -0600 Subject: [PATCH 06/19] Gives the NTRep access Add: ACCESS_REPRESENTATIVE for NTRep --- modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 83307b321fa..6cd2889b864 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -73,7 +73,7 @@ //BUBBER EDIT START minimal_access = list( ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, - ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, + ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ACCESS_REPRESENTATIVE ) minimal_wildcard_access = list() //BUBBER EDIT END From b3106f4a9b7f78ef2d04e6a24346151ac3bea920 Mon Sep 17 00:00:00 2001 From: Gr33d-y <103287849+Gr33d-y@users.noreply.github.com> Date: Sat, 4 Mar 2023 20:00:57 -0500 Subject: [PATCH 07/19] Changes the access on the doors of the NT rep's doors to ACCESS_NTREP --- _maps/map_files/Deltastation/DeltaStation2_bubber.dmm | 6 ++++-- _maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm | 6 ++++-- _maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm index 3a05fa64e3f..667d0fa234b 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm @@ -26409,7 +26409,8 @@ "gqA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" + name = "Maintenance Hatch"; + req_access = ACCESS_NTREP }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35234,7 +35235,8 @@ /area/station/maintenance/port) "iAQ" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + name = "NT Consultant's Office"; + req_access = ACCESS_NTREP }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm index de684b0ac1a..30434af2f2d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm @@ -14665,7 +14665,8 @@ /area/station/maintenance/port/aft) "eoR" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + name = "NT Consultant's Office"; + req_access = ACCESS_NTREP }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, @@ -26453,7 +26454,8 @@ /area/station/security/brig/upper) "hTx" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + name = "NT Consultant's Office"; + req_access = ACCESS_NTREP }, /obj/machinery/door/firedoor, /obj/structure/cable, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm index cccf2763b83..1ab76a813c6 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm @@ -12475,7 +12475,8 @@ "dGZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/corporate{ - name = "Consultant's Quarters" + name = "Consultant's Quarters"; + req_access = ACCESS_NTREP }, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30165,7 +30166,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/corporate{ id_tag = "consultantdoor"; - name = "Consultant's Office" + name = "Consultant's Office"; + req_access = ACCESS_NTREP }, /obj/structure/disposalpipe/segment{ dir = 4 From fd4587e26ccbfc6aa97948b7ba53ec4f69996b85 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 22:18:16 -0600 Subject: [PATCH 08/19] Making ACCESS_NTREP A thing pt. 1 --- code/__DEFINES/access.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 802152af924..354dcdba3e7 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -33,7 +33,7 @@ /// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. #define ACCESS_HOP "hop" //ACCESS FOR THE NTRep's personal quarters in mapping. -#define ACCESS_REPRESENTATIVE "representative" +#define ACCESS_NTREP "representative" //BUBBER EDIT END: Add NTRep Access @@ -357,8 +357,8 @@ ACCESS_HOP, \ ACCESS_QM, \ ACCESS_RD, \ - ACCESS_REPRESENTATIVE, \ - ) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS //BUBBER EDIT: Added ACCESS_REPRESENTATIVE to PRIVATE_COMMAND_ACCESS + ACCESS_NTREP, \ + ) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS //BUBBER EDIT: Added ACCESS_NTREP to PRIVATE_COMMAND_ACCESS /// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) #define CAPTAIN_ACCESS list( \ From 4a1ea3658776792a329a1ea9ad2d5c19169b59f7 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 22:18:48 -0600 Subject: [PATCH 09/19] Making ACCESS_NTREP A thing --- .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 012fc7c2178..4a11b7b5b9c 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -128,7 +128,7 @@ /obj/structure/closet/secure_closet/nanotrasen_consultant/station name = "\proper nanotrasen consultant's locker" - req_access = list(ACCESS_REPRESENTATIVE) //BUBBER EDIT + req_access = list(ACCESS_NTREP) //BUBBER EDIT icon_state = "cc" icon = 'modular_skyrat/master_files/icons/obj/closet.dmi' door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS From 45cf79974243b6540c68f4bd94214b5e6f616058 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Sat, 4 Mar 2023 22:19:47 -0600 Subject: [PATCH 10/19] Making ACCESS_NTRep a thing pt. 3 --- modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 6cd2889b864..a03f7013e32 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -73,7 +73,7 @@ //BUBBER EDIT START minimal_access = list( ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, - ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ACCESS_REPRESENTATIVE + ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ACCESS_NTREP ) minimal_wildcard_access = list() //BUBBER EDIT END From 9fe42dec8042472051f2fb6e5f37ecfddabf3314 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:42:39 -0600 Subject: [PATCH 11/19] Works on fixing IDs more Lots of edits, fixes most old problems --- _maps/map_files/Deltastation/DeltaStation2_bubber.dmm | 6 ++---- _maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm | 6 ++---- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 4 ++-- _maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm | 8 +++----- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 4 ++-- _maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm | 2 +- code/__DEFINES/access.dm | 4 ---- code/__DEFINES/~~bubber_defines/access.dm | 1 + modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 2 +- .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 10 files changed, 15 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm index 667d0fa234b..afa5d6a25a0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm @@ -26410,14 +26410,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; - req_access = ACCESS_NTREP + req_access = list("representative") }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /turf/open/floor/iron, /area/station/maintenance/port/fore) "gqF" = ( @@ -35236,12 +35235,11 @@ "iAQ" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office"; - req_access = ACCESS_NTREP + req_access = list("representative") }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/command/heads_quarters/captain/private/nt_rep) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm index 30434af2f2d..4afce152036 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm @@ -14666,10 +14666,9 @@ "eoR" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office"; - req_access = ACCESS_NTREP + req_access = list("representative") }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -26455,11 +26454,10 @@ "hTx" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office"; - req_access = ACCESS_NTREP + req_access = list("representative") }, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index e3d484e2bb1..8fa97297f24 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -12463,8 +12463,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/corporate{ name = "Consultant's Quarters" + req_access = list("representative") }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood/end, /obj/effect/turf_decal/siding/wood{ @@ -30147,13 +30147,13 @@ /area/station/engineering/atmos/pumproom) "iGu" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/corporate{ id_tag = "consultantdoor"; name = "Consultant's Office" + req_access = list("representative") }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm index 1ab76a813c6..ae9804a19cf 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm @@ -12476,9 +12476,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/corporate{ name = "Consultant's Quarters"; - req_access = ACCESS_NTREP + req_access = list("representative") }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood/end, /obj/effect/turf_decal/siding/wood{ @@ -30160,14 +30159,13 @@ /area/station/engineering/atmos/pumproom) "iGu" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/corporate{ id_tag = "consultantdoor"; name = "Consultant's Office"; - req_access = ACCESS_NTREP + req_access = list("representative") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -72801,7 +72799,7 @@ normaldoorcontrol = 1; pixel_x = 4; pixel_y = -26; - req_access = list("cent_general"); + req_access = list("representative"); specialfunctions = 4 }, /obj/effect/turf_decal/bot, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 2f5529bb273..352b1c61667 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -9473,8 +9473,8 @@ "nOb" = ( /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" + req_access = list("representative") }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -12217,8 +12217,8 @@ "uqJ" = ( /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" + req_access = list("representative") }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/effect/turf_decal/siding/white{ dir = 1 }, diff --git a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm index e5cae400e97..505eeee3b3b 100644 --- a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm +++ b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm @@ -5344,10 +5344,10 @@ "vJ" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office" + req_access = list("representative") }, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 354dcdba3e7..fe8bcac0749 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -32,10 +32,6 @@ #define ACCESS_CAPTAIN "captain" /// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. #define ACCESS_HOP "hop" -//ACCESS FOR THE NTRep's personal quarters in mapping. -#define ACCESS_NTREP "representative" -//BUBBER EDIT END: Add NTRep Access - /// Security's General Access. In mapping, grants access to spaces such as to the "meeting room" or firing range, as well as being the general access that Tablet/Computer Programs check for "heads". Also unlocks other types of security equipment. #define ACCESS_SECURITY "security" diff --git a/code/__DEFINES/~~bubber_defines/access.dm b/code/__DEFINES/~~bubber_defines/access.dm index 8141df7dd3f..a701a911b34 100644 --- a/code/__DEFINES/~~bubber_defines/access.dm +++ b/code/__DEFINES/~~bubber_defines/access.dm @@ -1 +1,2 @@ #define ACCESS_BLACKSMITH "blacksmith" +#define ACCESS_NTREP "representative" diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index a03f7013e32..130f52585a8 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -72,7 +72,7 @@ extra_access = list() //BUBBER EDIT START minimal_access = list( - ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, + ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ACCESS_NTREP ) minimal_wildcard_access = list() diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 4a11b7b5b9c..22000b3bade 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -128,7 +128,7 @@ /obj/structure/closet/secure_closet/nanotrasen_consultant/station name = "\proper nanotrasen consultant's locker" - req_access = list(ACCESS_NTREP) //BUBBER EDIT + req_access = list("representative") //BUBBER EDIT icon_state = "cc" icon = 'modular_skyrat/master_files/icons/obj/closet.dmi' door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS From 3111c2b5ac7d9c4419ac7cc8a5db413c36bb0272 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:46:16 -0600 Subject: [PATCH 12/19] Stops messing with the automapper --- _maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm index 505eeee3b3b..829a73a91f9 100644 --- a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm +++ b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm @@ -5344,7 +5344,6 @@ "vJ" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office" - req_access = list("representative") }, /obj/machinery/door/firedoor, /obj/structure/cable, From acf53d84765d3a3d02928c19f0989d61730527cb Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:56:29 -0600 Subject: [PATCH 13/19] Fixes a conflict --- modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index dcd488add20..130f52585a8 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -52,6 +52,7 @@ trim_state = "trim_blueshield" department_color = COLOR_COMMAND_BLUE subdepartment_color = COLOR_CENTCOM_BLUE // Not the other way around. I think. + orbit_icon = "shield-dog" sechud_icon_state = SECHUD_BLUESHIELD extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare minimal_access = list( @@ -66,6 +67,7 @@ trim_state = "trim_centcom" department_color = COLOR_GREEN subdepartment_color = COLOR_GREEN + orbit_icon = "clipboard-check" sechud_icon_state = SECHUD_NT_CONSULTANT extra_access = list() //BUBBER EDIT START @@ -81,6 +83,7 @@ assignment = "Security Medic" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_securitymedic" + orbit_icon = "heart-pulse" department_color = COLOR_ASSEMBLY_BLACK subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_SECURITY_MEDIC @@ -101,6 +104,7 @@ assignment = "Corrections Officer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_corrections_officer" + orbit_icon = "hands-bound" department_color = COLOR_ASSEMBLY_BLACK subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_CORRECTIONS_OFFICER @@ -116,6 +120,7 @@ trim_state = "trim_barber" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME + orbit_icon = "scissors" sechud_icon_state = SECHUD_BARBER extra_access = list() minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER, ACCESS_SERVICE) From 51052180a965815e61f2901339edfe680edf808f Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:04:27 -0600 Subject: [PATCH 14/19] Removes basic VR access change --- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 690e5d729c9..d399e51b474 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -12364,7 +12364,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/corporate{ name = "Consultant's Quarters" - req_access = list("representative") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood/end, From bee662803880d656d119977d08eb4310774e3af1 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:07:52 -0600 Subject: [PATCH 15/19] Remove that overlap Fixes voidraptor.dmm --- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index d399e51b474..595321ecefd 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -29871,7 +29871,6 @@ /obj/machinery/door/airlock/corporate{ id_tag = "consultantdoor"; name = "Consultant's Office" - req_access = list("representative") }, /obj/structure/disposalpipe/segment{ dir = 4 From 2f52c5940ff2564593d1eecba1a1017aecafe55a Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:10:13 -0600 Subject: [PATCH 16/19] Takes the Nanotrasen rep off the Interlink... --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index bed4132dabb..996f553a3c6 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -9322,7 +9322,6 @@ "nOb" = ( /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" - req_access = list("representative") }, /obj/effect/turf_decal/siding/white{ dir = 4 From f106cd1ea0e7763d9f86eafa8677215c1e8828ba Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:11:29 -0600 Subject: [PATCH 17/19] Update CentCom_skyrat_z2.dmm --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 996f553a3c6..dfa759fe20e 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -11997,7 +11997,6 @@ "uqJ" = ( /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" - req_access = list("representative") }, /obj/effect/turf_decal/siding/white{ dir = 1 From 0e94e7fb0574a4d787555a33899aebb02ec8af1f Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:24:05 -0600 Subject: [PATCH 18/19] Fixes the orbit_icon error --- modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 130f52585a8..dcd488add20 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -52,7 +52,6 @@ trim_state = "trim_blueshield" department_color = COLOR_COMMAND_BLUE subdepartment_color = COLOR_CENTCOM_BLUE // Not the other way around. I think. - orbit_icon = "shield-dog" sechud_icon_state = SECHUD_BLUESHIELD extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare minimal_access = list( @@ -67,7 +66,6 @@ trim_state = "trim_centcom" department_color = COLOR_GREEN subdepartment_color = COLOR_GREEN - orbit_icon = "clipboard-check" sechud_icon_state = SECHUD_NT_CONSULTANT extra_access = list() //BUBBER EDIT START @@ -83,7 +81,6 @@ assignment = "Security Medic" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_securitymedic" - orbit_icon = "heart-pulse" department_color = COLOR_ASSEMBLY_BLACK subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_SECURITY_MEDIC @@ -104,7 +101,6 @@ assignment = "Corrections Officer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_corrections_officer" - orbit_icon = "hands-bound" department_color = COLOR_ASSEMBLY_BLACK subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_CORRECTIONS_OFFICER @@ -120,7 +116,6 @@ trim_state = "trim_barber" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME - orbit_icon = "scissors" sechud_icon_state = SECHUD_BARBER extra_access = list() minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER, ACCESS_SERVICE) From c1278a8075eba2869bbb704f370a782a713ec3e2 Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Sun, 12 Mar 2023 09:11:49 +0100 Subject: [PATCH 19/19] Update modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm --- .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 00dccc7c562..5930d4c1747 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -128,7 +128,7 @@ /obj/structure/closet/secure_closet/nanotrasen_consultant/station name = "\proper nanotrasen consultant's locker" - req_access = list("representative") //BUBBER EDIT + req_access = list(ACCESS_NTREP) //BUBBER EDIT icon_state = "cc" icon = 'modular_skyrat/master_files/icons/obj/closet.dmi' door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS