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 1/3] 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 2/3] 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 3/3] 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)