cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace ID/PDA/Wallet checks with GetID() (#10204)

Browse Source
This commit is contained in:
JohnWildkins
2020-10-10 12:58:41 +02:00
committed by GitHub
parent aa24c56893
commit 0ed0cba6b7
29 changed files with 84 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/bluespacetech.dm
+12 -30
View File
@@ -184,11 +184,8 @@
voice_name = "Bluespace Cat"
real_name = "Bluespace Cat"
mind.name = "Bluespace Cat"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Cat"
gender = "female"
regenerate_icons()
@@ -204,11 +201,8 @@
voice_name = "Bluespace Bot"
real_name = "Bluespace Bot"
mind.name = "Bluespace Bot"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Bot"
regenerate_icons()
else
@@ -222,11 +216,8 @@
voice_name = "Bluespace Tree"
real_name = "Bluespace Tree"
mind.name = "Bluespace Tree"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Tree"
regenerate_icons()
else
@@ -241,11 +232,8 @@
voice_name = "Bluespace Lizard"
real_name = "Bluespace Lizard"
mind.name = "Bluespace Lizard"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Lizard"
regenerate_icons()
else
@@ -260,11 +248,8 @@
voice_name = "Bluespace Squid"
real_name = "Bluespace Squid"
mind.name = "Bluespace Squid"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Squid"
gender = "female"
regenerate_icons()
@@ -280,11 +265,8 @@
voice_name = "Bluespace Bug"
real_name = "Bluespace Bug"
mind.name = "Bluespace Bug"
if(wear_id)
var/obj/item/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
if(GetIdCard())
var/obj/item/card/id/id = GetIdCard()
id.registered_name = "Bluespace Bug"
regenerate_icons()
else
code/modules/admin/verbs/debug.dm
+2 -5
View File
@@ -131,11 +131,8 @@
return
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if (H.wear_id)
var/obj/item/card/id/id = H.wear_id
if(istype(H.wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = H.wear_id
id = pda.id
if (H.GetIdCard())
var/obj/item/card/id/id = H.GetIdCard()
id.icon_state = "gold"
id.access = get_all_accesses()
else