cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wallets and ID card tweaks (#20250)

Browse Source 
* wallet the third

* MORE id card tweaks

* farie review
This commit is contained in:
Contrabang
2023-01-25 20:13:38 +01:00
committed by GitHub
parent fa83a85f73
commit 7afa6cb087
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+11 -12
View File
@@ -494,12 +494,13 @@
//gets name from ID or PDA itself, ID inside PDA doesn't matter
//Useful when player is being seen by other mobs
/mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown")
var/obj/item/pda/pda = wear_id
var/obj/item/card/id/id = wear_id
if(istype(pda)) . = pda.owner
else if(istype(id)) . = id.registered_name
if(!.) . = if_no_id //to prevent null-names making the mob unclickable
return
var/obj/item/card/id/id = wear_id?.GetID()
if(istype(id))
return id.registered_name
if(is_pda(wear_id))
var/obj/item/pda/pda = wear_id
return pda.owner
return if_no_id //to prevent null-names making the mob unclickable
//gets ID card object from special clothes slot or, if applicable, hands as well
/mob/living/carbon/human/proc/get_idcard(check_hands = FALSE)
@@ -1774,15 +1775,13 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/can_track(mob/living/user)
if(wear_id)
var/obj/item/card/id/id = wear_id
var/obj/item/card/id/id = wear_id.GetID()
if(istype(id) && id.is_untrackable())
return 0
if(wear_pda)
var/obj/item/pda/pda = wear_pda
if(istype(pda))
var/obj/item/card/id/id = pda.id
if(istype(id) && id.is_untrackable())
return 0
var/obj/item/card/id/id = wear_pda.GetID()
if(istype(id) && id.is_untrackable())
return 0
if(istype(head, /obj/item/clothing/head))
var/obj/item/clothing/head/hat = head
if(hat.blockTracking)