Skip to content

Commit

Permalink
[MIRROR] Fixes quirk being examined when observing (#2740)
Browse files Browse the repository at this point in the history
* Fixes quirk being examined when observing

* Update examine.dm

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Waterpig <[email protected]>
Co-authored-by: Mal <[email protected]>
  • Loading branch information
4 people authored Apr 5, 2024
1 parent 6dbb908 commit b0e7174
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions code/modules/mob/living/carbon/human/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
//NOVA EDIT ADDITION BEGIN - EXAMINE RECORDS
if(target_record && length(target_record.past_medical_records) > RECORDS_INVISIBLE_THRESHOLD)
. += "<a href='?src=[REF(src)];hud=m;medrecords=1;examine_time=[world.time]'>\[View medical records\]</a>"
//NOVA EDIT ADDITION END
//NOVA EDIT ADDITION END - EXAMINE RECORDS

if(HAS_TRAIT(user, TRAIT_SECURITY_HUD))
if((user.stat == CONSCIOUS || isobserver(user)) && user != src)
Expand Down Expand Up @@ -454,9 +454,11 @@

if(target_record && length(target_record.past_general_records) > RECORDS_INVISIBLE_THRESHOLD)
. += "<a href='?src=[REF(src)];hud=[HAS_TRAIT(user, TRAIT_SECURITY_HUD) ? "s" : "m"];genrecords=1;examine_time=[world.time]'>\[View general records\]</a>"
else if(isobserver(user))
. += span_info("<b>Quirks:</b> [get_quirk_string(FALSE, CAT_QUIRK_ALL)]")
// NOVA EDIT ADDITION END - EXAMINE RECORDS
if(isobserver(user))
. += span_info("\n<b>Quirks:</b> [get_quirk_string(FALSE, CAT_QUIRK_ALL)]")

// NOVA EDIT ADDITION START
if(isobserver(user) || user.mind?.can_see_exploitables || user.mind?.has_exploitables_override)
var/datum/record/crew/target_records = find_record(perpname)
if(target_records)
Expand All @@ -468,16 +470,13 @@
. += "<a href='?src=[REF(src)];exprecords=1'>\[View exploitable info\]</a>"

. += EXAMINE_SECTION_BREAK
//NOVA EDIT ADDITION END
//NOVA EDIT ADDITION BEGIN - GUNPOINT

if(gunpointing)
. += "<span class='warning'><b>[t_He] [t_is] holding [gunpointing.target.name] at gunpoint with [gunpointing.aimed_gun.name]!</b></span>\n"
if(length(gunpointed))
for(var/datum/gunpoint/GP in gunpointed)
. += "<span class='warning'><b>[GP.source.name] [GP.source.p_are()] holding [t_him] at gunpoint with [GP.aimed_gun.name]!</b></span>\n"
//NOVA EDIT ADDITION END

//NOVA EDIT ADDITION BEGIN - CUSTOMIZATION
for(var/genital in GLOB.possible_genitals)
if(dna.species.mutant_bodyparts[genital])
var/datum/sprite_accessory/genital/G = GLOB.sprite_accessories[genital][dna.species.mutant_bodyparts[genital][MUTANT_INDEX_NAME]]
Expand Down Expand Up @@ -518,8 +517,7 @@
if (!isnull(opt_in_status))
var/stringified_optin = GLOB.antag_opt_in_strings["[opt_in_status]"]
. += span_info("Antag Opt-in Status: <b><font color='[GLOB.antag_opt_in_colors[stringified_optin]]'>[stringified_optin]</font></b>")
//NOVA EDIT ADDITION END

// NOVA EDIT ADDITION END
SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .)

/**
Expand Down

0 comments on commit b0e7174

Please sign in to comment.