cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4248 from Anewbe/invisiblity_examin

Browse Source 
People with low alpha (aka near-invisible) can no longer be examined
This commit is contained in:
Neerti
2017-11-11 16:55:35 -05:00
committed by GitHub
parent 5c8a87e9f8 ab39e29f04
commit 2ea87a0987
2 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -18,17 +18,9 @@
var/skiparms = 0 var/skiparms = 0
var/skipfeet = 0 var/skipfeet = 0
if(alpha <= 50)
var/cloaked = 0 // 0 for normal, 1 for cloaked close src.loc.examine(user)
return
if(mind && mind.changeling && mind.changeling.cloaked && !istype(user, /mob/observer))
var/distance = get_dist(user, src)
if(distance > 2)
src.loc.examine(user)
return
else
cloaked = 1
var/looks_synth = looksSynthetic() var/looks_synth = looksSynthetic()
@@ -97,8 +89,6 @@
if(skipjumpsuit && skipface) //big suits/masks/helmets make it hard to tell their gender if(skipjumpsuit && skipface) //big suits/masks/helmets make it hard to tell their gender
T = gender_datums[PLURAL] T = gender_datums[PLURAL]
if(cloaked)
T = gender_datums[NEUTER]
else if(species && species.ambiguous_genders) else if(species && species.ambiguous_genders)
var/can_detect_gender = FALSE var/can_detect_gender = FALSE
@@ -458,25 +448,18 @@
msg += "<span class = 'deptradio'>Medical records:</span> <a href='?src=\ref[src];medrecord=`'>\[View\]</a> <a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>\n" msg += "<span class = 'deptradio'>Medical records:</span> <a href='?src=\ref[src];medrecord=`'>\[View\]</a> <a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>\n"
if(print_flavor_text() && !cloaked) if(print_flavor_text())
msg += "[print_flavor_text()]\n" msg += "[print_flavor_text()]\n"
msg += "*---------*</span><br>" msg += "*---------*</span><br>"
msg += applying_pressure msg += applying_pressure
if (pose && !cloaked) if (pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 ) if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period. pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "[T.He] [pose]" msg += "[T.He] [pose]"
user << jointext(msg, null) user << jointext(msg, null)
/mob/living/carbon/human/get_description_fluff()
if(mind && mind.changeling && mind.changeling.cloaked)
return ""
else
return ..()
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records. //Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M as mob, hudtype) /proc/hasHUD(mob/M as mob, hudtype)
if(istype(M, /mob/living/carbon/human)) if(istype(M, /mob/living/carbon/human))

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -318,8 +318,6 @@
//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere
/mob/living/carbon/human/proc/get_visible_name() /mob/living/carbon/human/proc/get_visible_name()
if( mind && mind.changeling && mind.changeling.cloaked)
return "Unknown"
if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible
return get_id_name("Unknown") return get_id_name("Unknown")
if( head && (head.flags_inv&HIDEFACE) ) if( head && (head.flags_inv&HIDEFACE) )