Skip to content

Removes naked requirement to view NSFW flavortext #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tenryumi wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

Removes naked requirement to view NSFW flavortext #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions code/modules/mob/living/carbon/human/examine_tgui.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/ExaminePanelData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/ExaminePanelPages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -110,7 +110,7 @@ export const FlavorTextPage = (props) => {
</Button>
<Button
selected={flavorTextIndex === 'NSFW'}
disabled={!flavor_text_nsfw|| !is_naked}
disabled={!flavor_text_nsfw} // Caustic Edit: Removes naked requirement to view NSFW flavortext
bold={flavorTextIndex === 'NSFW'}
onClick={() => setFlavorTextIndex('NSFW')}
textAlign="center"
Expand Down
Loading