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