From 081c15b00f30bfa57a323f772143376e38adc9a7 Mon Sep 17 00:00:00 2001 From: Jenny Date: Thu, 12 Feb 2026 23:50:56 -0600 Subject: [PATCH] Removes naked requirement to view NSFW flavortext --- code/modules/mob/living/carbon/human/examine_tgui.dm | 12 +++++++----- tgui/packages/tgui/interfaces/ExaminePanelData.ts | 2 +- tgui/packages/tgui/interfaces/ExaminePanelPages.tsx | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine_tgui.dm b/code/modules/mob/living/carbon/human/examine_tgui.dm index da511725e39..8841d01ea9b 100644 --- a/code/modules/mob/living/carbon/human/examine_tgui.dm +++ b/code/modules/mob/living/carbon/human/examine_tgui.dm @@ -46,7 +46,7 @@ var/song_url var/has_song = FALSE var/is_vet = FALSE - var/is_naked = FALSE + // var/is_naked = FALSE // Caustic Edit: Removes naked requirement to view NSFW flavortext var/obscured = FALSE var/datum/preferences/prefs = holder.client?.prefs @@ -88,7 +88,7 @@ "is_playing" = is_playing, "has_song" = has_song, "is_vet" = is_vet, - "is_naked" = is_naked, + // "is_naked" = is_naked, // Caustic Edit: Removes naked requirement to view NSFW flavortext ) return data @@ -105,14 +105,16 @@ var/song_url var/has_song = FALSE var/is_vet = FALSE - var/is_naked = FALSE + // var/is_naked = FALSE // Caustic Edit: Removes naked requirement to view NSFW flavortext var/datum/antagonist/vampire/vampireplayer = user.mind?.has_antag_datum(/datum/antagonist/vampire) var/datum/antagonist/lich/lichplayer = user.mind?.has_antag_datum(/datum/antagonist/lich) if(ishuman(holder)) var/mob/living/carbon/human/holder_human = holder + /* Caustic Edit: Removes naked requirement to view NSFW flavortext if(!(holder.wear_armor && holder.wear_armor.flags_inv) && !(holder.wear_shirt && holder.wear_shirt.flags_inv)) is_naked = TRUE + */ obscured = ((!isobserver(user)) && !holder_human.client?.prefs?.masked_examine) && ((holder_human.wear_mask && (holder_human.wear_mask.flags_inv & HIDEFACE)) || (holder_human.head && (holder_human.head.flags_inv & HIDEFACE))) flavor_text = obscured ? "Obscured" : holder.flavortext flavor_text_nsfw = obscured ? "Obscured" : holder.nsfwflavortext @@ -133,7 +135,7 @@ headshot = "headshot_red.png" else if(pref) - is_naked = TRUE + // is_naked = TRUE // Caustic Edit: Removes naked requirement to view NSFW flavortext obscured = FALSE flavor_text = pref.flavortext flavor_text_nsfw = pref.nsfwflavortext @@ -179,7 +181,7 @@ "is_playing" = is_playing, "has_song" = has_song, "is_vet" = is_vet, - "is_naked" = is_naked, + // "is_naked" = is_naked, // Caustic Edit: Removes naked requirement to view NSFW flavortext ) return data diff --git a/tgui/packages/tgui/interfaces/ExaminePanelData.ts b/tgui/packages/tgui/interfaces/ExaminePanelData.ts index 6194fd628d5..e7177cd6012 100644 --- a/tgui/packages/tgui/interfaces/ExaminePanelData.ts +++ b/tgui/packages/tgui/interfaces/ExaminePanelData.ts @@ -13,5 +13,5 @@ export type ExaminePanelData = { is_playing: boolean; has_song: boolean; is_vet: boolean; - is_naked: boolean; + // is_naked: boolean; // Caustic Edit: Removes naked requirement to view NSFW flavortext }; diff --git a/tgui/packages/tgui/interfaces/ExaminePanelPages.tsx b/tgui/packages/tgui/interfaces/ExaminePanelPages.tsx index d664da12266..a0168994978 100644 --- a/tgui/packages/tgui/interfaces/ExaminePanelPages.tsx +++ b/tgui/packages/tgui/interfaces/ExaminePanelPages.tsx @@ -13,7 +13,7 @@ export const FlavorTextPage = (props) => { ooc_notes, ooc_notes_nsfw, headshot, - is_naked, + // is_naked, // Caustic Edit: Removes naked requirement to view NSFW flavortext } = data; const [oocNotesIndex, setOocNotesIndex] = useState('SFW'); const [flavorTextIndex, setFlavorTextIndex] = useState('SFW'); @@ -110,7 +110,7 @@ export const FlavorTextPage = (props) => {