shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes all access const to be a define

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-16 11:44:47 -05:00
parent 344dc1a061
commit 609ae007ae
106 changed files with 618 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclear.dm
+1 -1
View File
@@ -118,7 +118,7 @@
if(foundIDs.len)
for(var/obj/item/weapon/card/id/ID in foundIDs)
ID.name = "lead agent card"
ID.access += GLOB.access_syndicate_leader
ID.access += ACCESS_SYNDICATE_LEADER
else
message_admins("Warning: Nuke Ops spawned without access to leave their spawn area!")
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -437,7 +437,7 @@
var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id
W.icon_state = "centcom"
W.access += GLOB.access_maint_tunnels
W.access += ACCESS_MAINT_TUNNELS
W.assignment = "Multiverse Traveller"
W.registered_name = M.real_name
W.update_label(M.real_name)
code/game/machinery/ai_slipper.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/uses = 20
var/cooldown = 0
var/cooldown_time = 100
req_access = list(GLOB.access_ai_upload)
req_access = list(ACCESS_AI_UPLOAD)
/obj/machinery/ai_slipper/examine(mob/user)
..()
code/game/machinery/cloning.dm
+1 -1
View File
@@ -15,7 +15,7 @@
density = TRUE
icon = 'icons/obj/cloning.dmi'
icon_state = "pod_0"
req_access = list(GLOB.access_cloning) //For premature unlocking.
req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING.
verb_say = "states"
var/heal_level //The clone is released once its health reaches this level.
var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine.
code/game/machinery/computer/aifixer.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer"
desc = "Used with intelliCards containing nonfunctioning AIs to restore them to working order."
req_access = list(GLOB.access_captain, GLOB.access_robotics, GLOB.access_heads)
req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS)
var/mob/living/silicon/ai/occupier = null
var/active = 0
circuit = /obj/item/weapon/circuitboard/computer/aifixer
code/game/machinery/computer/apc_control.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to remotely control the flow of power to different parts of the station."
icon_screen = "solar"
icon_keyboard = "power_key"
req_access = list(GLOB.access_engine)
req_access = list(ACCESS_ENGINE)
circuit = /obj/item/weapon/circuitboard/computer/apc_control
light_color = LIGHT_COLOR_YELLOW
var/list/apcs //APCs the computer has access to
code/game/machinery/computer/card.dm
+12 -12
View File
@@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
desc = "You can use this to manage jobs and ID access."
icon_screen = "id"
icon_keyboard = "id_key"
req_one_access = list(GLOB.access_heads, GLOB.access_change_ids)
req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
circuit = /obj/item/weapon/circuitboard/computer/card
var/obj/item/weapon/card/id/scan = null
var/obj/item/weapon/card/id/modify = null
@@ -158,7 +158,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
dat += "<table>"
dat += "<tr><td style='width:25%'><b>Job</b></td><td style='width:25%'><b>Slots</b></td><td style='width:25%'><b>Open job</b></td><td style='width:25%'><b>Close job</b><td style='width:25%'><b>Prioritize</b></td></td></tr>"
var/ID
if(scan && (GLOB.access_change_ids in scan.access) && !target_dept)
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
ID = 1
else
ID = 0
@@ -392,7 +392,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if (check_access(scan))
region_access = list()
head_subordinates = list()
if(GLOB.access_change_ids in scan.access)
if(ACCESS_CHANGE_IDS in scan.access)
if(target_dept)
head_subordinates = get_all_jobs()
region_access |= target_dept
@@ -402,20 +402,20 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
else
if((GLOB.access_hop in scan.access) && ((target_dept==1) || !target_dept))
if((ACCESS_HOP in scan.access) && ((target_dept==1) || !target_dept))
region_access |= 1
region_access |= 6
get_subordinates("Head of Personnel")
if((GLOB.access_hos in scan.access) && ((target_dept==2) || !target_dept))
if((ACCESS_HOS in scan.access) && ((target_dept==2) || !target_dept))
region_access |= 2
get_subordinates("Head of Security")
if((GLOB.access_cmo in scan.access) && ((target_dept==3) || !target_dept))
if((ACCESS_CMO in scan.access) && ((target_dept==3) || !target_dept))
region_access |= 3
get_subordinates("Chief Medical Officer")
if((GLOB.access_rd in scan.access) && ((target_dept==4) || !target_dept))
if((ACCESS_RD in scan.access) && ((target_dept==4) || !target_dept))
region_access |= 4
get_subordinates("Research Director")
if((GLOB.access_ce in scan.access) && ((target_dept==5) || !target_dept))
if((ACCESS_CE in scan.access) && ((target_dept==5) || !target_dept))
region_access |= 5
get_subordinates("Chief Engineer")
if(region_access)
@@ -492,7 +492,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("make_job_available")
// MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
if(scan && (GLOB.access_change_ids in scan.access) && !target_dept)
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
var/edit_job_target = href_list["job"]
var/datum/job/j = SSjob.GetJob(edit_job_target)
if(!j)
@@ -507,7 +507,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("make_job_unavailable")
// MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
if(scan && (GLOB.access_change_ids in scan.access) && !target_dept)
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
var/edit_job_target = href_list["job"]
var/datum/job/j = SSjob.GetJob(edit_job_target)
if(!j)
@@ -523,7 +523,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if ("prioritize_job")
// TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
if(scan && (GLOB.access_change_ids in scan.access) && !target_dept)
if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
var/priority_target = href_list["job"]
var/datum/job/j = SSjob.GetJob(priority_target)
if(!j)
@@ -564,7 +564,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/obj/machinery/computer/card/centcom
name = "\improper Centcom identification console"
circuit = /obj/item/weapon/circuitboard/computer/card/centcom
req_access = list(GLOB.access_cent_captain)
req_access = list(ACCESS_CENT_CAPTAIN)
/obj/machinery/computer/card/minor
name = "department management console"
code/game/machinery/computer/cloning.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_screen = "dna"
icon_keyboard = "med_key"
circuit = /obj/item/weapon/circuitboard/computer/cloning
req_access = list(GLOB.access_heads) //Only used for record deletion right now.
req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW.
var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
var/list/pods //Linked cloning pods
var/temp = "Inactive"
code/game/machinery/computer/communications.dm
+2 -2
View File
@@ -4,7 +4,7 @@
desc = "A console used for high-priority announcements and emergencies."
icon_screen = "comm"
icon_keyboard = "tech_key"
req_access = list(GLOB.access_heads)
req_access = list(ACCESS_HEADS)
circuit = /obj/item/weapon/circuitboard/computer/communications
var/authenticated = 0
var/auth_id = "Unknown" //Who is currently logged in?
@@ -101,7 +101,7 @@
var/obj/item/device/pda/pda = I
I = pda.id
if (I && istype(I))
if(GLOB.access_captain in I.access)
if(ACCESS_CAPTAIN in I.access)
var/old_level = GLOB.security_level
if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN
code/game/machinery/computer/gulag_teleporter.dm
+1 -1
View File
@@ -4,7 +4,7 @@
desc = "Used to send criminals to the Labor Camp"
icon_screen = "explosive"
icon_keyboard = "security_key"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
circuit = /obj/item/weapon/circuitboard/computer/gulag_teleporter_console
var/default_goal = 200
var/obj/item/weapon/card/id/prisoner/id = null
code/game/machinery/computer/medical.dm
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "This can be used to check medical records."
icon_screen = "medcomp"
icon_keyboard = "med_key"
req_one_access = list(GLOB.access_medical, GLOB.access_forensics_lockers)
req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS)
circuit = /obj/item/weapon/circuitboard/computer/med_data
var/obj/item/weapon/card/id/scan = null
var/authenticated = null
code/game/machinery/computer/pod.dm
+1 -1
View File
@@ -130,7 +130,7 @@
name = "\improper ProComp Executive IIc"
desc = "The Syndicate operate on a tight budget. Operates external airlocks."
title = "External Airlock Controls"
req_access = list(GLOB.access_syndicate)
req_access = list(ACCESS_SYNDICATE)
/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user)
if(!allowed(user))
code/game/machinery/computer/prisoner.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to manage tracking implants placed inside criminals."
icon_screen = "explosive"
icon_keyboard = "security_key"
req_access = list(GLOB.access_brig)
req_access = list(ACCESS_BRIG)
var/id = 0
var/temp = null
var/status = 0
code/game/machinery/computer/robot.dm
+1 -1
View File
@@ -6,7 +6,7 @@
desc = "Used to remotely lockdown or detonate linked Cyborgs."
icon_screen = "robot"
icon_keyboard = "rd_key"
req_access = list(GLOB.access_robotics)
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/weapon/circuitboard/computer/robotics
var/temp = null
code/game/machinery/computer/security.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to view and edit personnel's security records."
icon_screen = "security"
icon_keyboard = "security_key"
req_one_access = list(GLOB.access_security, GLOB.access_forensics_lockers)
req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
circuit = /obj/item/weapon/circuitboard/computer/secure_data
var/obj/item/weapon/card/id/scan = null
var/authenticated = null
code/game/machinery/dance_machine.dm
+1 -1
View File
@@ -8,7 +8,7 @@
anchored = FALSE
verb_say = "states"
density = TRUE
req_access = list(GLOB.access_engine)
req_access = list(ACCESS_ENGINE)
var/active = FALSE
var/list/rangers = list()
var/charge = 35
code/game/machinery/doors/airlock_electronics.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/electronics/airlock
name = "airlock electronics"
req_access = list(GLOB.access_maint_tunnels)
req_access = list(ACCESS_MAINT_TUNNELS)
var/list/accesses = list()
var/one_access = 0
code/game/machinery/doors/brigdoors.dm
+1 -1
View File
@@ -23,7 +23,7 @@
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
desc = "A remote control for a door."
req_access = list(GLOB.access_security)
req_access = list(ACCESS_SECURITY)
anchored = TRUE
density = FALSE
var/id = null // id of linked machinery/lockers
code/game/machinery/gulag_item_reclaimer.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to reclaim your items after you finish your sentence at the labor camp"
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_taken"
req_access = list(GLOB.access_security) //reqaccess to access all stored items
req_access = list(ACCESS_SECURITY) //REQACCESS TO ACCESS ALL STORED ITEMS
density = FALSE
anchored = TRUE
use_power = IDLE_POWER_USE
code/game/machinery/navbeacon.dm
+1 -1
View File
@@ -20,7 +20,7 @@
var/list/codes // assoc. list of transponder codes
var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value"
req_access = list(GLOB.access_engine, GLOB.access_robotics)
req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
/obj/machinery/navbeacon/New()
..()
code/game/machinery/porta_turret/portable_turret.dm
+4 -4
View File
@@ -15,7 +15,7 @@
use_power = IDLE_POWER_USE //this turret uses and requires power
idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power
active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power
req_access = list(GLOB.access_security)
req_access = list(ACCESS_SECURITY)
power_channel = EQUIP //drains power from the EQUIPMENT channel
var/base_icon_state = "standard"
@@ -553,7 +553,7 @@
use_power = NO_POWER_USE
has_cover = 0
scan_range = 9
req_access = list(GLOB.access_syndicate)
req_access = list(ACCESS_SYNDICATE)
stun_projectile = /obj/item/projectile/bullet
lethal_projectile = /obj/item/projectile/bullet
lethal_projectile_sound = 'sound/weapons/gunshot.ogg'
@@ -651,7 +651,7 @@
var/locked = TRUE
var/control_area = null //can be area name, path or nothing.
var/ailock = 0 // AI cannot use this
req_access = list(GLOB.access_ai_upload)
req_access = list(ACCESS_AI_UPLOAD)
var/list/obj/machinery/porta_turret/turrets = list()
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -862,7 +862,7 @@
. = ..()
/obj/machinery/porta_turret/lasertag
req_access = list(GLOB.access_maint_tunnels, GLOB.access_theatre)
req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE)
check_records = 0
criminals = 0
auth_weapons = 1
code/game/machinery/rechargestation.dm
+1 -1
View File
@@ -7,7 +7,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 1000
req_access = list(GLOB.access_robotics)
req_access = list(ACCESS_ROBOTICS)
var/recharge_speed
var/repairs
state_open = TRUE
code/game/machinery/requests_console.dm
+1 -1
View File
@@ -514,7 +514,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
msgVerified = "<font color='green'><b>Verified by [ID.registered_name] ([ID.assignment])</b></font>"
updateUsrDialog()
if(screen == 10)
if (GLOB.access_RC_announce in ID.access)
if (ACCESS_RC_ANNOUNCE in ID.access)
announceAuth = 1
else
announceAuth = 0
code/game/machinery/shieldgen.dm
+3 -3
View File
@@ -72,7 +72,7 @@
opacity = 0
anchored = FALSE
pressure_resistance = 2*ONE_ATMOSPHERE
req_access = list(GLOB.access_engine)
req_access = list(ACCESS_ENGINE)
max_integrity = 100
var/active = FALSE
var/list/deployed_shields
@@ -209,7 +209,7 @@
icon_state = "Shield_Gen"
anchored = FALSE
density = TRUE
req_access = list(GLOB.access_teleporter)
req_access = list(ACCESS_TELEPORTER)
flags = CONDUCT
use_power = NO_POWER_USE
max_integrity = 300
@@ -224,7 +224,7 @@
name = "xenobiology shield wall generator"
desc = "A shield generator meant for use in xenobiology."
icon_state = "Shield_Gen"
req_access = list(GLOB.access_xenobiology)
req_access = list(ACCESS_XENOBIOLOGY)
/obj/machinery/shieldwallgen/Destroy()
for(var/d in GLOB.cardinals)
code/game/machinery/telecomms/computers/logbrowser.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/universal_translate = 0 // set to 1 if it can translate nonhuman speech
req_access = list(GLOB.access_tcomsat)
req_access = list(ACCESS_TCOMSAT)
circuit = /obj/item/weapon/circuitboard/computer/comm_server
/obj/machinery/computer/telecomms/server/attack_hand(mob/user)
code/game/mecha/combat/gygax.dm
+1 -1
View File
@@ -23,7 +23,7 @@
armor = list(melee = 40, bullet = 40, laser = 50, energy = 35, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100)
max_temperature = 35000
leg_overload_coeff = 100
operation_req_access = list(GLOB.access_syndicate)
operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/gygax/dark
max_equip = 4
code/game/mecha/combat/honker.dm
+1 -1
View File
@@ -9,7 +9,7 @@
armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
max_temperature = 25000
infra_luminosity = 5
operation_req_access = list(GLOB.access_theatre)
operation_req_access = list(ACCESS_THEATRE)
wreckage = /obj/structure/mecha_wreckage/honker
add_req_access = 0
max_equip = 3
code/game/mecha/combat/marauder.dm
+3 -3
View File
@@ -9,7 +9,7 @@
max_temperature = 60000
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
infra_luminosity = 3
operation_req_access = list(GLOB.access_cent_specops)
operation_req_access = list(ACCESS_CENT_SPECOPS)
wreckage = /obj/structure/mecha_wreckage/marauder
add_req_access = 0
internal_damage_threshold = 25
@@ -44,7 +44,7 @@
desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
name = "\improper Seraph"
icon_state = "seraph"
operation_req_access = list(GLOB.access_cent_specops)
operation_req_access = list(ACCESS_CENT_SPECOPS)
step_in = 3
max_integrity = 550
wreckage = /obj/structure/mecha_wreckage/seraph
@@ -70,7 +70,7 @@
desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model."
name = "\improper Mauler"
icon_state = "mauler"
operation_req_access = list(GLOB.access_syndicate)
operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/mauler
max_equip = 5
code/game/mecha/combat/reticence.dm
+1 -1
View File
@@ -9,7 +9,7 @@
armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
max_temperature = 15000
wreckage = /obj/structure/mecha_wreckage/reticence
operation_req_access = list(GLOB.access_theatre)
operation_req_access = list(ACCESS_THEATRE)
add_req_access = 0
internal_damage_threshold = 25
max_equip = 2
code/game/mecha/mech_fabricator.dm
+1 -1
View File
@@ -8,7 +8,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 20
active_power_usage = 5000
req_access = list(GLOB.access_robotics)
req_access = list(ACCESS_ROBOTICS)
var/time_coeff = 1
var/component_coeff = 1
var/datum/material_container/materials
code/game/mecha/mecha.dm
+1 -1
View File
@@ -63,7 +63,7 @@
var/internal_damage = 0 //contains bitflags
var/list/operation_req_access = list()//required access level for mecha operation
var/list/internals_req_access = list(GLOB.access_engine,GLOB.access_robotics)//required access level to open cell compartment
var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)//REQUIRED ACCESS LEVEL TO OPEN CELL COMPARTMENT
var/wreckage
code/game/mecha/mecha_control_console.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to remotely locate or lockdown exosuits."
icon_screen = "mecha"
icon_keyboard = "tech_key"
req_access = list(GLOB.access_robotics)
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/weapon/circuitboard/computer/mecha_control
var/list/located = list()
var/screen = 0
code/game/objects/items/weapons/cards_ids.dm
+12 -12
View File
@@ -145,7 +145,7 @@ update_label("John Doe", "Clowny")
/obj/item/weapon/card/id/syndicate
name = "agent card"
access = list(GLOB.access_maint_tunnels, GLOB.access_syndicate)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE)
origin_tech = "syndicate=1"
var/anyone = FALSE //Can anyone forge the ID or just syndicate?
@@ -195,7 +195,7 @@ update_label("John Doe", "Clowny")
desc = "An ID straight from the Syndicate."
registered_name = "Syndicate"
assignment = "Syndicate Overlord"
access = list(GLOB.access_syndicate)
access = list(ACCESS_SYNDICATE)
/obj/item/weapon/card/id/captains_spare
name = "captain's spare ID"
@@ -229,7 +229,7 @@ update_label("John Doe", "Clowny")
assignment = "Emergency Response Team Commander"
/obj/item/weapon/card/id/ert/Initialize()
access = get_all_accesses()+get_ert_access("commander")-GLOB.access_change_ids
access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS
..()
/obj/item/weapon/card/id/ert/Security
@@ -237,7 +237,7 @@ update_label("John Doe", "Clowny")
assignment = "Security Response Officer"
/obj/item/weapon/card/id/ert/Security/Initialize()
access = get_all_accesses()+get_ert_access("sec")-GLOB.access_change_ids
access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS
..()
/obj/item/weapon/card/id/ert/Engineer
@@ -245,7 +245,7 @@ update_label("John Doe", "Clowny")
assignment = "Engineer Response Officer"
/obj/item/weapon/card/id/ert/Engineer/Initialize()
access = get_all_accesses()+get_ert_access("eng")-GLOB.access_change_ids
access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS
..()
/obj/item/weapon/card/id/ert/Medical
@@ -253,7 +253,7 @@ update_label("John Doe", "Clowny")
assignment = "Medical Response Officer"
/obj/item/weapon/card/id/ert/Medical/Initialize()
access = get_all_accesses()+get_ert_access("med")-GLOB.access_change_ids
access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS
..()
/obj/item/weapon/card/id/prisoner
@@ -299,26 +299,26 @@ update_label("John Doe", "Clowny")
/obj/item/weapon/card/id/mining
name = "mining ID"
access = list(GLOB.access_mining, GLOB.access_mining_station, GLOB.access_mineral_storeroom)
access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
/obj/item/weapon/card/id/away
name = "a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
access = list(GLOB.access_away_general)
access = list(ACCESS_AWAY_GENERAL)
/obj/item/weapon/card/id/away/hotel
name = "Staff ID"
desc = "A staff ID used to access the hotel's doors."
access = list(GLOB.access_away_general, GLOB.access_away_maint)
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT)
/obj/item/weapon/card/id/away/hotel/securty
name = "Officer ID"
access = list(GLOB.access_away_general, GLOB.access_away_maint, GLOB.access_away_sec)
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_SEC)
/obj/item/weapon/card/id/away/old
name = "a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
access = list(GLOB.access_away_general)
access = list(ACCESS_AWAY_GENERAL)
/obj/item/weapon/card/id/away/old/sec
name = "Security Officer ID"
@@ -339,4 +339,4 @@ update_label("John Doe", "Clowny")
name = "APC Access ID"
desc = "Special ID card to allow access to APCs"
icon_state = "centcom"
access = list(GLOB.access_engine_equip)
access = list(ACCESS_ENGINE_EQUIP)
code/game/objects/items/weapons/storage/lockbox.dm
+6 -6
View File
@@ -7,7 +7,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
var/locked = TRUE
var/broken = FALSE
var/open = FALSE
@@ -88,7 +88,7 @@
/obj/item/weapon/storage/lockbox/loyalty
name = "lockbox of mindshield implants"
req_access = list(GLOB.access_security)
req_access = list(ACCESS_SECURITY)
/obj/item/weapon/storage/lockbox/loyalty/PopulateContents()
for(var/i in 1 to 3)
@@ -99,7 +99,7 @@
/obj/item/weapon/storage/lockbox/clusterbang
name = "lockbox of clusterbangs"
desc = "You have a bad feeling about opening this."
req_access = list(GLOB.access_security)
req_access = list(ACCESS_SECURITY)
/obj/item/weapon/storage/lockbox/clusterbang/PopulateContents()
new /obj/item/weapon/grenade/clusterbuster(src)
@@ -113,7 +113,7 @@
max_w_class = WEIGHT_CLASS_SMALL
storage_slots = 10
max_combined_w_class = 20
req_access = list(GLOB.access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_locked = "medalbox+l"
icon_closed = "medalbox"
icon_broken = "medalbox+b"
@@ -162,7 +162,7 @@
/obj/item/weapon/storage/lockbox/medal/sec
name = "security medal box"
desc = "A locked box used to store medals to be given to members of the security department."
req_access = list(GLOB.access_hos)
req_access = list(ACCESS_HOS)
/obj/item/weapon/storage/lockbox/medal/sec/PopulateContents()
for(var/i in 1 to 3)
@@ -171,7 +171,7 @@
/obj/item/weapon/storage/lockbox/medal/sci
name = "science medal box"
desc = "A locked box used to store medals to be given to members of the science department."
req_access = list(GLOB.access_rd)
req_access = list(ACCESS_RD)
/obj/item/weapon/storage/lockbox/medal/sci/PopulateContents()
for(var/i in 1 to 3)
code/game/objects/structures/barsigns.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A bar sign with no writing on it"
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
req_access = list(GLOB.access_bar)
req_access = list(ACCESS_BAR)
max_integrity = 500
integrity_failure = 250
armor = list(melee = 20, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
@@ -119,10 +119,10 @@
to_chat(user, "<span class='warning'>Nothing interesting happens!</span>")
return
emagged = TRUE
req_access = list(GLOB.access_syndicate)
to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
sleep(100) //10 seconds
set_sign(new /datum/barsign/hiddensigns/syndibarsign)
req_access = list(ACCESS_SYNDICATE)
/obj/structure/sign/barsign/proc/pick_sign()
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/bar
name = "booze storage"
req_access = list(GLOB.access_bar)
req_access = list(ACCESS_BAR)
icon_state = "cabinet"
resistance_flags = FLAMMABLE
max_integrity = 70
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/quartermaster
name = "\proper quartermaster's locker"
req_access = list(GLOB.access_qm)
req_access = list(ACCESS_QM)
icon_state = "qm"
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+5 -5
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "\proper chief engineer's locker"
req_access = list(GLOB.access_ce)
req_access = list(ACCESS_CE)
icon_state = "ce"
/obj/structure/closet/secure_closet/engineering_chief/PopulateContents()
@@ -30,7 +30,7 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(GLOB.access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng"
icon_door = "eng_elec"
@@ -49,7 +49,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
req_access = list(GLOB.access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng"
icon_door = "eng_weld"
@@ -62,7 +62,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(GLOB.access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng_secure"
/obj/structure/closet/secure_closet/engineering_personal/PopulateContents()
@@ -78,7 +78,7 @@
/obj/structure/closet/secure_closet/atmospherics
name = "\proper atmospheric technician's locker"
req_access = list(GLOB.access_atmospherics)
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "atmos"
/obj/structure/closet/secure_closet/atmospherics/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+3 -3
View File
@@ -3,7 +3,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen Cabinet"
req_access = list(GLOB.access_kitchen)
req_access = list(ACCESS_KITCHEN)
/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
..()
@@ -51,7 +51,7 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
desc = "This contains cold hard cash."
req_access = list(GLOB.access_heads_vault)
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
..()
@@ -65,7 +65,7 @@
/obj/structure/closet/secure_closet/freezer/cream_pie
name = "cream pie closet"
desc = "Contains pies filled with cream and/or custard, you sickos."
req_access = list(GLOB.access_theatre)
req_access = list(ACCESS_THEATRE)
/obj/structure/closet/secure_closet/freezer/pie/PopulateContents()
..()
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(GLOB.access_hydroponics)
req_access = list(ACCESS_HYDROPONICS)
icon_state = "hydro"
/obj/structure/closet/secure_closet/hydroponics/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+5 -5
View File
@@ -2,7 +2,7 @@
name = "medicine closet"
desc = "Filled to the brim with medical junk."
icon_state = "med"
req_access = list(GLOB.access_medical)
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/PopulateContents()
..()
@@ -24,7 +24,7 @@
/obj/structure/closet/secure_closet/medical2
name = "anesthetic closet"
desc = "Used to knock people out."
req_access = list(GLOB.access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/PopulateContents()
..()
@@ -35,7 +35,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(GLOB.access_surgery)
req_access = list(ACCESS_SURGERY)
icon_state = "med_secure"
/obj/structure/closet/secure_closet/medical3/PopulateContents()
@@ -49,7 +49,7 @@
/obj/structure/closet/secure_closet/CMO
name = "\proper chief medical officer's locker"
req_access = list(GLOB.access_cmo)
req_access = list(ACCESS_CMO)
icon_state = "cmo"
/obj/structure/closet/secure_closet/CMO/PopulateContents()
@@ -74,7 +74,7 @@
/obj/structure/closet/secure_closet/animal
name = "animal control"
req_access = list(GLOB.access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/animal/PopulateContents()
..()
code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+4 -4
View File
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/ertCom
name = "commander's closet"
desc = "Emergency Response Team equipment locker."
req_access = list(GLOB.access_cent_captain)
req_access = list(ACCESS_CENT_CAPTAIN)
icon_state = "cap"
/obj/structure/closet/secure_closet/ertCom/PopulateContents()
@@ -22,7 +22,7 @@
/obj/structure/closet/secure_closet/ertSec
name = "security closet"
desc = "Emergency Response Team equipment locker."
req_access = list(GLOB.access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
icon_state = "hos"
/obj/structure/closet/secure_closet/ertSec/PopulateContents()
@@ -36,7 +36,7 @@
/obj/structure/closet/secure_closet/ertMed
name = "medical closet"
desc = "Emergency Response Team equipment locker."
req_access = list(GLOB.access_cent_medical)
req_access = list(ACCESS_CENT_MEDICAL)
icon_state = "cmo"
/obj/structure/closet/secure_closet/ertMed/PopulateContents()
@@ -52,7 +52,7 @@
/obj/structure/closet/secure_closet/ertEngi
name = "engineer closet"
desc = "Emergency Response Team equipment locker."
req_access = list(GLOB.access_cent_storage)
req_access = list(ACCESS_CENT_STORAGE)
icon_state = "ce"
/obj/structure/closet/secure_closet/ertEngi/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/personal
desc = "It's a secure locker for personnel. The first card swiped gains control."
name = "personal closet"
req_access = list(GLOB.access_all_personal_lockers)
req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
var/registered_name = null
/obj/structure/closet/secure_closet/personal/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/RD
name = "\proper research director's locker"
req_access = list(GLOB.access_rd)
req_access = list(ACCESS_RD)
icon_state = "rd"
/obj/structure/closet/secure_closet/RD/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+13 -13
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/captains
name = "\proper captain's locker"
req_access = list(GLOB.access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_state = "cap"
/obj/structure/closet/secure_closet/captains/PopulateContents()
@@ -32,7 +32,7 @@
/obj/structure/closet/secure_closet/hop
name = "\proper head of personnel's locker"
req_access = list(GLOB.access_hop)
req_access = list(ACCESS_HOP)
icon_state = "hop"
/obj/structure/closet/secure_closet/hop/PopulateContents()
@@ -56,7 +56,7 @@
/obj/structure/closet/secure_closet/hos
name = "\proper head of security's locker"
req_access = list(GLOB.access_hos)
req_access = list(ACCESS_HOS)
icon_state = "hos"
/obj/structure/closet/secure_closet/hos/PopulateContents()
@@ -87,7 +87,7 @@
/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "warden"
/obj/structure/closet/secure_closet/warden/PopulateContents()
@@ -111,7 +111,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(GLOB.access_security)
req_access = list(ACCESS_SECURITY)
icon_state = "sec"
/obj/structure/closet/secure_closet/security/PopulateContents()
@@ -159,7 +159,7 @@
/obj/structure/closet/secure_closet/detective
name = "\proper detective's cabinet"
req_access = list(GLOB.access_forensics_lockers)
req_access = list(ACCESS_FORENSICS_LOCKERS)
icon_state = "cabinet"
resistance_flags = FLAMMABLE
max_integrity = 70
@@ -186,7 +186,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections"
req_access = list(GLOB.access_hos)
req_access = list(ACCESS_HOS)
/obj/structure/closet/secure_closet/injection/PopulateContents()
..()
@@ -195,7 +195,7 @@
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(GLOB.access_brig)
req_access = list(ACCESS_BRIG)
anchored = TRUE
var/id = null
@@ -206,7 +206,7 @@
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(GLOB.access_court)
req_access = list(ACCESS_COURT)
/obj/structure/closet/secure_closet/courtroom/PopulateContents()
..()
@@ -235,7 +235,7 @@
/obj/structure/closet/secure_closet/armory2
name = "armory ballistics locker"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "armory"
/obj/structure/closet/secure_closet/armory2/PopulateContents()
@@ -248,7 +248,7 @@
/obj/structure/closet/secure_closet/armory3
name = "armory energy gun locker"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "armory"
/obj/structure/closet/secure_closet/armory3/PopulateContents()
@@ -262,7 +262,7 @@
/obj/structure/closet/secure_closet/tac
name = "armory tac locker"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "tac"
/obj/structure/closet/secure_closet/tac/PopulateContents()
@@ -274,7 +274,7 @@
/obj/structure/closet/secure_closet/lethalshots
name = "shotgun lethal rounds"
req_access = list(GLOB.access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "tac"
/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
code/game/objects/structures/crates_lockers/closets/secure/security.dm.rej
+30
View File
@@ -0,0 +1,30 @@
diff a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm (rejected hunks)
@@ -203,7 +203,7 @@
anchored = TRUE
name = "Secure Evidence Closet"
req_access_txt = "0"
- req_one_access_txt = list(GLOB.access_armory, GLOB.access_forensics_lockers)
+ req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS)
/obj/structure/closet/secure_closet/brig/PopulateContents()
..()
@@ -227,16 +227,16 @@
/obj/structure/closet/secure_closet/contraband/armory
anchored = TRUE
name = "Contraband Locker"
- req_access = list(GLOB.access_armory)
+ req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/contraband/heads
anchored = TRUE
name = "Contraband Locker"
- req_access = list(GLOB.access_heads)
+ req_access = list(ACCESS_HEADS)
/obj/structure/closet/secure_closet/armory1
name = "armory armor locker"
- req_access = list(GLOB.access_armory)
+ req_access = list(ACCESS_ARMORY)
icon_state = "armory"
/obj/structure/closet/secure_closet/armory1/PopulateContents()
code/game/objects/structures/displaycase.dm
+2 -2
View File
@@ -239,13 +239,13 @@
/obj/structure/displaycase/captain
alert = 1
start_showpiece_type = /obj/item/weapon/gun/energy/laser/captain
req_access = list(GLOB.access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/obj/structure/displaycase/labcage
name = "lab cage"
desc = "A glass lab container for storing interesting creatures."
start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
req_access = list(GLOB.access_rd)
req_access = list(ACCESS_RD)
code/game/objects/structures/ghost_role_spawners.dm
+1 -1
View File
@@ -390,7 +390,7 @@
death = FALSE
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_s"
id_access_list = list(GLOB.access_syndicate)
id_access_list = list(ACCESS_SYNDICATE)
outfit = /datum/outfit/syndicate_empty
assignedrole = "Space Syndicate" //I know this is really dumb, but Syndicate operative is nuke ops
code/game/objects/structures/noticeboard.dm
+8 -8
View File
@@ -89,39 +89,39 @@
/obj/structure/noticeboard/captain
name = "Captain's Notice Board"
desc = "Important notices from the Captain."
req_access = list(GLOB.access_captain)
req_access = list(ACCESS_CAPTAIN)
/obj/structure/noticeboard/hop
name = "Head of Personnel's Notice Board"
desc = "Important notices from the Head of Personnel."
req_access = list(GLOB.access_hop)
req_access = list(ACCESS_HOP)
/obj/structure/noticeboard/ce
name = "Chief Engineer's Notice Board"
desc = "Important notices from the Chief Engineer."
req_access = list(GLOB.access_ce)
req_access = list(ACCESS_CE)
/obj/structure/noticeboard/hos
name = "Head of Security's Notice Board"
desc = "Important notices from the Head of Security."
req_access = list(GLOB.access_hos)
req_access = list(ACCESS_HOS)
/obj/structure/noticeboard/cmo
name = "Chief Medical Officer's Notice Board"
desc = "Important notices from the Chief Medical Officer."
req_access = list(GLOB.access_cmo)
req_access = list(ACCESS_CMO)
/obj/structure/noticeboard/rd
name = "Research Director's Notice Board"
desc = "Important notices from the Research Director."
req_access = list(GLOB.access_rd)
req_access = list(ACCESS_RD)
/obj/structure/noticeboard/qm
name = "Quartermaster's Notice Board"
desc = "Important notices from the Quartermaster."
req_access = list(GLOB.access_qm)
req_access = list(ACCESS_QM)
/obj/structure/noticeboard/staff
name = "Staff Notice Board"
desc = "Important notices from the heads of staff."
req_access = list(GLOB.access_heads)
req_access = list(ACCESS_HEADS)