diff --git a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm index 5b61e707d92..4d419585e2c 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm @@ -26408,14 +26408,14 @@ "gqA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" + name = "Maintenance Hatch"; + 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" = ( @@ -35234,12 +35234,12 @@ /area/station/maintenance/port) "iAQ" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + name = "NT Consultant's Office"; + 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 54901ccff2c..f788b8e94cd 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm @@ -14652,10 +14652,10 @@ /area/station/maintenance/port/aft) "eoR" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + name = "NT Consultant's Office"; + 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, @@ -26437,11 +26437,11 @@ /area/station/security/brig/upper) "hTx" = ( /obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" + 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/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 0690a84b89a..595321ecefd 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -12365,7 +12365,6 @@ /obj/machinery/door/airlock/corporate{ name = "Consultant's Quarters" }, -/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{ @@ -29866,7 +29865,6 @@ /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, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm index 0a996c424f0..f2ed3e8d3b0 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm @@ -12477,9 +12477,9 @@ "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 = 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{ @@ -30165,13 +30165,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" + name = "Consultant's Office"; + req_access = list("representative") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -72794,7 +72794,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 3afe74a6de0..dfa759fe20e 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -9323,7 +9323,6 @@ /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -11999,7 +11998,6 @@ /obj/machinery/door/airlock/centcom{ name = "NanoTrasen Consultant's Office" }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/effect/turf_decal/siding/white{ dir = 1 }, diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index cfb1da3c16e..e78a07e08ce 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -353,7 +353,8 @@ ACCESS_HOP, \ ACCESS_QM, \ ACCESS_RD, \ -) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO 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( \ 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/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 18a32214b5c..30d8f394d15 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -784,6 +784,7 @@ ACCESS_COMMAND, ACCESS_EVA, ACCESS_BRIG_ENTRANCE, + ACCESS_WEAPONS, //BUBBER EDIT ) extra_access = list() minimal_wildcard_access = list( diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index acae48ecdb8..779ddf94158 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -362,7 +362,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/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 3d001e1deb2..dcd488add20 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -56,9 +56,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, - ) - minimal_wildcard_access = list(ACCESS_CAPTAIN) + ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_WEAPONS, + ) + minimal_wildcard_access = list() //BUBBER EDIT: Original ACCESS_CAPTAIN template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) /datum/id_trim/job/nanotrasen_consultant @@ -68,14 +68,13 @@ subdepartment_color = COLOR_GREEN 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_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() + //BUBBER EDIT END template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) /datum/id_trim/job/security_medic @@ -86,7 +85,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 d57592e5167..8936844c68b 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/centcom shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses @@ -64,6 +63,7 @@ box = /obj/item/storage/box/survival/security 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 /datum/outfit/plasmaman/blueshield diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index adae2bce6a7..5930d4c1747 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 @@ -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_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