cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from Bubberstation/ID-fix-part-2

Browse Source 
Works on fixing IDs more
This commit is contained in:
ReturnToZender
2023-03-10 17:00:18 -06:00
committed by GitHub
parent 71326052b8 3066da2c17
commit 9e67f7394c
9 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
+2 -4
View File
@@ -26409,14 +26409,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)
_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm
+2 -4
View File
@@ -14653,10 +14653,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,
@@ -26439,11 +26438,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,
_maps/map_files/VoidRaptor/VoidRaptor.dmm
+2 -2
View File
@@ -12364,8 +12364,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{
@@ -29866,13 +29866,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
_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
+3 -5
View File
@@ -12478,9 +12478,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{
@@ -30166,14 +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";
req_access = ACCESS_NTREP
req_access = list("representative")
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -72796,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,
_maps/map_files/generic/CentCom_skyrat_z2.dmm
+2 -2
View File
@@ -9322,8 +9322,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
},
@@ -11998,8 +11998,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
},
code/__DEFINES/access.dm
-4
View File
@@ -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"
code/__DEFINES/~~bubber_defines/access.dm
+1
View File
@@ -1 +1,2 @@
#define ACCESS_BLACKSMITH "blacksmith"
#define ACCESS_NTREP "representative"
modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+6 -1
View File
@@ -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,11 +67,12 @@
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
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()
@@ -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)
modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
+1 -1
View File
@@ -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