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/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)