followup

SPLURT-Station · Sep 23, 2023 · d9a628e · d9a628e
1 parent f405132
commit d9a628e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/code/__SPLURTCODE/DEFINES/signals.dm b/code/__SPLURTCODE/DEFINES/signals.dm
@@ -1,4 +1,3 @@
-#define COMSIG_MOB_CAME "mob_came"
 #define COMSIG_HEALTH_SCAN "health_scan"
 #define COMSIG_ORGAN_INSERTED "organ_inserted"
 #define COMSIG_ORGAN_REMOVED "organ_removed"

diff --git a/modular_sand/code/datums/interactions/lewd_definitions.dm b/modular_sand/code/datums/interactions/lewd_definitions.dm
@@ -796,9 +796,8 @@
 			else
 				H.mob_climax(TRUE, "sex", partner, !cumin, target_gen)
 	set_lust(0)
-	SEND_SIGNAL(src, COMSIG_MOB_CAME, target_orifice, partner, cumin, last_genital)
 
-	SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner)
+	SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital)
 
 	return TRUE
 

diff --git a/modular_splurt/code/datums/interactions/lewd/_lewd.dm b/modular_splurt/code/datums/interactions/lewd/_lewd.dm
@@ -239,7 +239,10 @@
 			else
 				H.mob_climax(TRUE, "sex", partner, !cumin, target_gen)
 	set_lust(0)
-	SEND_SIGNAL(src, COMSIG_MOB_CAME, target_orifice, partner, cumin, last_genital)
+
+	SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital)
+
+	return TRUE
 
 /mob/living/get_unconsenting(extreme, list/ignored_mobs, var/unholy)
 	for(var/mob/M in range(7, src))

diff --git a/modular_splurt/code/game/machinery/research_table.dm b/modular_splurt/code/game/machinery/research_table.dm
@@ -96,7 +96,7 @@
 		else
 			to_chat(user, span_warning("You fail to unbuckle [buckled_mob]."))
 		return
-	UnregisterSignal(buckled_mob, COMSIG_MOB_CAME)
+	UnregisterSignal(buckled_mob, COMSIG_MOB_POST_CAME)
 	say("User left, resetting scanners.")
 	return ..()
 
@@ -109,7 +109,7 @@
 	return TRUE
 
 /obj/machinery/research_table/buckle_mob(mob/living/buckled_mob, force, check_loc)
-	RegisterSignal(buckled_mob, COMSIG_MOB_CAME, .proc/on_cum)
+	RegisterSignal(buckled_mob, COMSIG_MOB_POST_CAME, .proc/on_cum)
 	say("New user detected, tracking data.")
 	. = ..()
 

diff --git a/modular_splurt/code/modules/arousal/organs/breasts.dm b/modular_splurt/code/modules/arousal/organs/breasts.dm
@@ -5,13 +5,13 @@
 	. = ..()
 	if(!.)
 		return
-	RegisterSignal(owner, COMSIG_MOB_CAME, .proc/splash_cum)
+	RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
 
 /obj/item/organ/genital/breasts/Remove(special)
 	. = ..()
 	var/mob/living/carbon/human/C = .
 	if(!QDELETED(C))
-		UnregisterSignal(C, COMSIG_MOB_CAME)
+		UnregisterSignal(C, COMSIG_MOB_POST_CAME)
 
 /obj/item/organ/genital/breasts/get_features(mob/living/carbon/human/H)
 	var/datum/dna/D = H.dna

diff --git a/modular_splurt/code/modules/arousal/organs/penis.dm b/modular_splurt/code/modules/arousal/organs/penis.dm
@@ -2,13 +2,13 @@
 	. = ..()
 	if(!.)
 		return
-	RegisterSignal(owner, COMSIG_MOB_CAME, .proc/splash_cum)
+	RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
 
 /obj/item/organ/genital/penis/Remove(special)
 	. = ..()
 	var/mob/living/carbon/human/C = .
 	if(!QDELETED(C))
-		UnregisterSignal(C, COMSIG_MOB_CAME)
+		UnregisterSignal(C, COMSIG_MOB_POST_CAME)
 
 /obj/item/organ/genital/penis/get_features(mob/living/carbon/human/H)
 	. = ..()

diff --git a/modular_splurt/code/modules/arousal/organs/vagina.dm b/modular_splurt/code/modules/arousal/organs/vagina.dm
@@ -2,13 +2,13 @@
 	. = ..()
 	if(!.)
 		return
-	RegisterSignal(owner, COMSIG_MOB_CAME, .proc/splash_cum)
+	RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
 
 /obj/item/organ/genital/vagina/Remove(special)
 	. = ..()
 	var/mob/living/carbon/human/C = .
 	if(!QDELETED(C))
-		UnregisterSignal(C, COMSIG_MOB_CAME)
+		UnregisterSignal(C, COMSIG_MOB_POST_CAME)
 
 /obj/item/organ/genital/vagina/splash_cum(mob/living/carbon/human/orgasming, target_orifice, atom/partner, cumin, genital)
 	. = ..()