cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-18 12:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from Bubberstation/ID-Fix-Branches

Browse Source 
Changes IDs
This commit is contained in:
Cyprex
2023-03-12 09:39:50 +01:00
committed by GitHub
parent 97c183c17a c1278a8075
commit 8edb95d68a
12 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
+4 -4
View File
@@ -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)
_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm
+4 -4
View File
@@ -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,
_maps/map_files/VoidRaptor/VoidRaptor.dmm
-2
View File
@@ -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,
_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
+5 -5
View File
@@ -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,
_maps/map_files/generic/CentCom_skyrat_z2.dmm
-2
View File
@@ -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
},
code/__DEFINES/access.dm
+2 -1
View File
@@ -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( \
code/__DEFINES/~~bubber_defines/access.dm
+1
View File
@@ -1 +1,2 @@
#define ACCESS_BLACKSMITH "blacksmith"
#define ACCESS_NTREP "representative"
code/datums/id_trim/jobs.dm
+1
View File
@@ -784,6 +784,7 @@
ACCESS_COMMAND,
ACCESS_EVA,
ACCESS_BRIG_ENTRANCE,
ACCESS_WEAPONS, //BUBBER EDIT
)
extra_access = list()
minimal_wildcard_access = list(
code/modules/awaymissions/gateway.dm
+1 -1
View File
@@ -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)
modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+13 -12
View File
@@ -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()
modular_skyrat/modules/blueshield/code/blueshield.dm
+1 -1
View File
@@ -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
modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
+2 -2
View File
@@ -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