From 08114c46c5b2777cfdd80efbb13cb678334e2448 Mon Sep 17 00:00:00 2001 From: SpaceCatSS13 <201633078+SpaceCatSS13@users.noreply.github.com> Date: Fri, 4 Jul 2025 17:35:57 +0100 Subject: [PATCH] Adds age vet messages to lustwish portals. Bonus: at maintainer request also removes the non-vetted message entirely (#4159) ## About The Pull Request I removed this from the original PR since it was removed elsewhere but since the merge its been re-added, just adding it back here for consistency. At StrangeWeirdKitten's request this PR also removes the non vetted message entirely. This should not be player facing. ## Why It's Good For The Game Consistency pretty much ## Proof Of Testing
Screenshots/Videos ![Portal4](https://github.com/user-attachments/assets/3d81838a-1712-4425-8765-f7686e808391)
## Changelog :cl: fix: Age vetting message added to lust wish portals. /:cl: --- .../code/game/objects/structures/lewd_portals.dm | 6 ++++++ modular_zubbers/code/modules/vetted/examine.dm | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modular_zubbers/code/game/objects/structures/lewd_portals.dm b/modular_zubbers/code/game/objects/structures/lewd_portals.dm index 136d8a8b191..4524adca7c4 100644 --- a/modular_zubbers/code/game/objects/structures/lewd_portals.dm +++ b/modular_zubbers/code/game/objects/structures/lewd_portals.dm @@ -371,6 +371,12 @@ if(!(gential_sprite.is_hidden(owner))) . += "It has exposed genitals... \[Look closer...\]" break + if(!CONFIG_GET(flag/check_vetted)) + return + if(!owner?.client || !SSplayer_ranks.initialized) + return + if(SSplayer_ranks.is_vetted(owner?.client, admin_bypass = FALSE)) + . += span_greenannounce("This player has been vetted as 18+ by staff.") /obj/lewd_portal_relay/Topic(href, href_list) . = ..() diff --git a/modular_zubbers/code/modules/vetted/examine.dm b/modular_zubbers/code/modules/vetted/examine.dm index b790663480e..cbabfc32cce 100644 --- a/modular_zubbers/code/modules/vetted/examine.dm +++ b/modular_zubbers/code/modules/vetted/examine.dm @@ -6,8 +6,6 @@ return if(SSplayer_ranks.is_vetted(client, admin_bypass = FALSE)) . += span_greenannounce("This player has been vetted as 18+ by staff.") - else - . += span_velvet("THIS PLAYER IS NOT VETTED! CONTINUE AT YOUR OWN RISK!") /mob/living/carbon/human/examine(mob/user) . = ..() @@ -17,5 +15,3 @@ return if(SSplayer_ranks.is_vetted(client, admin_bypass = FALSE)) . += span_greenannounce("This player has been vetted as 18+ by staff.") - else - . += span_velvet("THIS PLAYER IS NOT VETTED! CONTINUE AT YOUR OWN RISK!")