cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 07:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for 6b2409065a

Browse Source
This commit is contained in:
Roxy
2025-11-12 17:01:17 -05:00
parent 14c23b2df7
commit 9240e8846d
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/components/empathy.dm
View File

@@ -79,6 +79,10 @@
seen_it = TRUE
living_parent.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil)
living_parent.set_jitter_if_lower(15 SECONDS)
// BUBBER EDIT ADDITION BEGIN - Empaths detect arousal
if(ishuman(target) && living_parent.client.prefs.read_preference(/datum/preference/toggle/erp))
examine_list += astype(target, /mob/living/carbon/human).get_arousal_info()
// BUBBER EDIT ADDITION END - Empaths detect arousal
/datum/component/empathy/proc/on_hands_laid(datum/source, mob/living/carbon/smiter)
SIGNAL_HANDLER

32
modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm
View File

@@ -337,24 +337,14 @@
* EMPATH BONUS
*/
/mob/living/carbon/human/examine(mob/user)
. = ..()
var/mob/living/examiner = user
if(stat >= DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH) || src == examiner || !HAS_TRAIT(examiner, TRAIT_EMPATH))
return
if(examiner.client?.prefs?.read_preference(/datum/preference/toggle/erp))
var/arousal_message
switch(arousal)
if(AROUSAL_MINIMUM_DETECTABLE to AROUSAL_LOW)
arousal_message = span_purple("[p_they()] [p_are()] slightly blushed.") + "\n"
if(AROUSAL_LOW to AROUSAL_MEDIUM)
arousal_message = span_purple("[p_they()] [p_are()] quite aroused and seems to be stirring up lewd thoughts in [p_their()] head.") + "\n"
if(AROUSAL_HIGH to AROUSAL_AUTO_CLIMAX_THRESHOLD)
arousal_message = span_purple("[p_they()] [p_are()] aroused as hell.") + "\n"
if(AROUSAL_AUTO_CLIMAX_THRESHOLD to INFINITY)
arousal_message = span_purple("[p_they()] [p_are()] extremely excited, exhausting from entolerable desire.") + "\n"
if(arousal_message)
. += arousal_message
else if(arousal > AROUSAL_MINIMUM_DETECTABLE)
. += span_purple("[p_they()] [p_are()] slightly blushed.") + "\n"
/// Used in the empathy component
/mob/living/carbon/human/proc/get_arousal_info()
switch(arousal)
if(AROUSAL_MINIMUM_DETECTABLE to AROUSAL_LOW)
return span_purple("[p_they()] [p_are()] slightly blushed.")
if(AROUSAL_LOW to AROUSAL_MEDIUM)
return span_purple("[p_they()] [p_are()] quite aroused and seems to be stirring up lewd thoughts in [p_their()] head.")
if(AROUSAL_HIGH to AROUSAL_AUTO_CLIMAX_THRESHOLD)
return span_purple("[p_they()] [p_are()] aroused as hell.")
if(AROUSAL_AUTO_CLIMAX_THRESHOLD to INFINITY)
return span_purple("[p_they()] [p_are()] extremely excited, exhausting from intolerable desire.")