cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6429 from Heroman3003/idfix

Browse Source 
Fixes editing colony director IDs editing global 'station access' list
This commit is contained in:
Anewbe
2019-08-29 17:26:45 -05:00
committed by VirgoBot
parent a006728e5d
commit 083a0634a0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/antagonist/station/highlander.dm
View File

@@ -47,8 +47,8 @@ var/datum/antagonist/highlander/highlanders
var/obj/item/weapon/card/id/W = new(player) var/obj/item/weapon/card/id/W = new(player)
W.name = "[player.real_name]'s ID Card" W.name = "[player.real_name]'s ID Card"
W.icon_state = "centcom" W.icon_state = "centcom"
W.access = get_all_station_access() W.access = get_all_station_access().Copy
W.access += get_all_centcom_access() W.access |= get_all_centcom_access()
W.assignment = "Highlander" W.assignment = "Highlander"
W.registered_name = player.real_name W.registered_name = player.real_name
player.equip_to_slot_or_del(W, slot_wear_id) player.equip_to_slot_or_del(W, slot_wear_id)

4
code/game/objects/items/weapons/id cards/station_ids.dm
View File

@@ -171,7 +171,7 @@
/obj/item/weapon/card/id/synthetic/Initialize() /obj/item/weapon/card/id/synthetic/Initialize()
. = ..() . = ..()
access = get_all_station_access() + access_synth access = get_all_station_access().Copy() + access_synth
/obj/item/weapon/card/id/centcom /obj/item/weapon/card/id/centcom
name = "\improper CentCom. ID" name = "\improper CentCom. ID"
@@ -182,7 +182,7 @@
/obj/item/weapon/card/id/centcom/Initialize() /obj/item/weapon/card/id/centcom/Initialize()
. = ..() . = ..()
access = get_all_centcom_access() access = get_all_centcom_access().Copy()
/obj/item/weapon/card/id/centcom/station/Initialize() /obj/item/weapon/card/id/centcom/station/Initialize()
. = ..() . = ..()

4
code/modules/admin/verbs/debug.dm
View File

@@ -282,11 +282,11 @@
var/obj/item/device/pda/pda = H.wear_id var/obj/item/device/pda/pda = H.wear_id
id = pda.id id = pda.id
id.icon_state = "gold" id.icon_state = "gold"
id.access = get_all_accesses() id.access = get_all_accesses().Copy()
else else
var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M); var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M);
id.icon_state = "gold" id.icon_state = "gold"
id.access = get_all_accesses() id.access = get_all_accesses().Copy()
id.registered_name = H.real_name id.registered_name = H.real_name
id.assignment = "Colony Director" id.assignment = "Colony Director"
id.name = "[id.registered_name]'s ID Card ([id.assignment])" id.name = "[id.registered_name]'s ID Card ([id.assignment])"