From 0895b57e7adb41fe734125ee56dcbbff3cd2c8cc Mon Sep 17 00:00:00 2001 From: admiralLusitano <119751708+admiralLusitano@users.noreply.github.com> Date: Mon, 20 Feb 2023 08:31:26 -0300 Subject: [PATCH] minor changes to arousal meter --- modular_splurt/code/modules/arousal/arousal.dm | 11 ++++++++--- .../code/modules/mob/living/carbon/human/life.dm | 4 ---- tgstation.dme | 1 - 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 modular_splurt/code/modules/mob/living/carbon/human/life.dm diff --git a/modular_splurt/code/modules/arousal/arousal.dm b/modular_splurt/code/modules/arousal/arousal.dm index d4b85abb5f..aafa99ac33 100644 --- a/modular_splurt/code/modules/arousal/arousal.dm +++ b/modular_splurt/code/modules/arousal/arousal.dm @@ -140,9 +140,6 @@ var/percentage = ((get_lust() / get_lust_tolerance()) * 100) return percentage -/mob/living/carbon/human/proc/update_arousal() - update_arousal_hud() - /mob/living/carbon/human/proc/update_arousal_hud() if(!client || !hud_used) return FALSE @@ -155,3 +152,11 @@ arousal_state = "arousal[arousal_rounded]" hud_used.arousal.icon_state = arousal_state return TRUE + +/mob/living/carbon/human/adjust_arousal() + ..() + update_arousal_hud() + +/mob/living/carbon/human/mob_climax() + ..() + update_arousal_hud() diff --git a/modular_splurt/code/modules/mob/living/carbon/human/life.dm b/modular_splurt/code/modules/mob/living/carbon/human/life.dm deleted file mode 100644 index 5a1896c030..0000000000 --- a/modular_splurt/code/modules/mob/living/carbon/human/life.dm +++ /dev/null @@ -1,4 +0,0 @@ -/mob/living/carbon/human/BiologicalLife(delta_time, times_fired) - ..() - if(stat != DEAD) - update_arousal() diff --git a/tgstation.dme b/tgstation.dme index bc397bb72a..8a475ca746 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4718,7 +4718,6 @@ #include "modular_splurt\code\modules\mob\living\carbon\human\human.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defines.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\inventory.dm" -#include "modular_splurt\code\modules\mob\living\carbon\human\life.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\physiology.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\update_icons.dm"