cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows OOC examine at all times (#8694)

Browse Source 
* e

chad

e

E

* 000

* Update ExaminePanel.js

* Update ExaminePanel.js

* EEEEE

* Update examine_tgui.dm

* Update examine_tgui.dm
This commit is contained in:
Gandalf
2021-10-08 18:15:00 -04:00
committed by GitHub
parent b88ab829b5
commit d8d9cf7fde
5 changed files with 114 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+3 -4
View File
@@ -468,10 +468,9 @@
if(!(G.is_hidden(src)))
. += "<span class='notice'>[t_He] has exposed genitals... <a href='?src=[REF(src)];lookup_info=genitals'>Look closer...</a></span>"
break
if(!skipface)
var/line = span_notice("<a href='?src=[REF(src)];lookup_info=open_examine_panel'>Examine closely...</a>")
if(line)
. += line
var/line = span_notice("<a href='?src=[REF(src)];lookup_info=open_examine_panel'>Examine closely...</a>")
if(line)
. += line
if(client)
var/erp_status_pref = client.prefs.read_preference(/datum/preference/choiced/erp_status)
if(erp_status_pref && erp_status_pref != "disabled")
code/modules/mob/living/carbon/human/examine_tgui.dm
+28 -5
View File
@@ -34,10 +34,33 @@
/datum/examine_panel/ui_data(mob/user)
var/list/data = list()
data["character_name"] = holder.name
var/datum/preferences/preferences = holder.client?.prefs
var/obscured = (holder.wear_mask && (holder.wear_mask.flags_inv & HIDEFACE)) || (holder.head && (holder.head.flags_inv & HIDEFACE))
var/name = obscured ? "Unknown" : holder.name
var/flavor_text = obscured ? "Obscured" : holder.dna.features["flavor_text"]
var/custom_species = obscured ? "Obscured" : holder.dna.features["custom_species"]
var/custom_species_lore = obscured ? "Obscured" : holder.dna.features["custom_species_lore"]
var/ooc_notes = ""
if(preferences && preferences.read_preference(/datum/preference/toggle/master_erp_preferences))
var/e_prefs = preferences.read_preference(/datum/preference/choiced/erp_status)
var/e_prefs_nc = preferences.read_preference(/datum/preference/choiced/erp_status_nc)
var/e_prefs_v = preferences.read_preference(/datum/preference/choiced/erp_status_v)
ooc_notes += "ERP: [e_prefs]\n"
ooc_notes += "Non-conforming - [e_prefs_nc]\n"
ooc_notes += "VR - [e_prefs_v]\n"
ooc_notes += "\n"
ooc_notes += holder.dna.features["ooc_notes"]
data["obscured"] = obscured ? TRUE : FALSE
data["character_name"] = name
data["assigned_map"] = examine_panel_screen.assigned_map
data["flavor_text"] = holder.dna.features["flavor_text"]
data["ooc_notes"] = holder.dna.features["ooc_notes"]
data["custom_species"] = holder.dna.features["custom_species"]
data["custom_species_lore"] = holder.dna.features["custom_species_lore"]
data["flavor_text"] = flavor_text
data["ooc_notes"] = ooc_notes
data["custom_species"] = custom_species
data["custom_species_lore"] = custom_species_lore
return data