Fix #8210 - sechuds were using a proc that did not respect masks and helmets that covered the face when trying to get the perp's name.

This commit is contained in:
D3athrow
2016-02-12 04:17:32 -06:00
parent 0d0f2bf024
commit 26cbf26245
3 changed files with 7 additions and 4 deletions

View File

@@ -108,7 +108,9 @@ proc/process_sec_hud(var/mob/M, var/advanced_mode,var/mob/eye)
C.images += holder
break
var/perpname = perp.get_face_name(perp.get_id_name(""))
var/perpname = perp.get_face_name()
if(lowertext(perpname) == "unknown" || !perpname)
perpname = perp.get_id_name("Unknown")
if(perpname)
var/datum/data/record/R = find_record("name", perpname, data_core.security)
if(R)

View File

@@ -484,8 +484,8 @@
return face_name
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
/mob/living/carbon/human/proc/get_face_name()
var/datum/organ/external/head/head = get_organ("head")
if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (M_HUSK in mutations) ) //disfigured. use id-name if possible
var/datum/organ/external/head/head_organ = get_organ("head")
if((wear_mask && (is_slot_hidden(wear_mask.body_parts_covered,HIDEFACE)) && !istype(wear_mask,/obj/item/clothing/mask/gas/golem)) || ( head && (is_slot_hidden(head.body_parts_covered,HIDEFACE))) || !head_organ || head_organ.disfigured || (head_organ.status & ORGAN_DESTROYED) || !real_name || (M_HUSK in mutations) ) //Wearing a mask which hides our face, use id-name if possible
return "Unknown"
return real_name

View File

@@ -1,2 +1,3 @@
author: Pomf123
changes: []
changes:
- bugfix: Fixed sechuds seeing through masks.