normal component removal

ss220-space · Sep 19, 2024 · f381865 · f381865
1 parent 9dd5028
commit f381865
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/code/datums/components/devour.dm b/code/datums/components/devour.dm
@@ -63,6 +63,7 @@
     target.extinguish_light()
     target.forceMove(mob)
     ADD_TRAIT(target, TRAIT_DEVOURED, UNIQUE_TRAIT_SOURCE(src))
+    SEND_SIGNAL(mob, COMSIG_COMPONENT_DEVOURED_TARGET, target)
     return mob
 
 /datum/component/devour/proc/check_types(atom/movable/atom)
@@ -97,7 +98,6 @@
         playsound(parent, 'sound/misc/demon_attack1.ogg', 100, TRUE)
         mob.visible_message(span_warning("[mob] swallows [atom] whole!"))
     add_to_contents(atom)
-    SEND_SIGNAL(mob, COMSIG_COMPONENT_DEVOURED_TARGET, atom, params)
 
 /datum/component/devour/proc/on_mob_death(gibbed)
     SIGNAL_HANDLER

diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -162,9 +162,8 @@
 	// Removing the action for creating pheromones
 	var/datum/action/innate/produce_pheromones/produce_pheromones = locate() in human.actions
 	produce_pheromones?.Remove(human)
-	var/devour_component = human.GetComponent(/datum/component/devour/advanced)
-	if(devour_component)
-		qdel(devour_component)
+	if(human.GetComponent(/datum/component/devour/advanced))
+		qdel(human.GetComponent(/datum/component/devour/advanced))
 
 
 /// Pheromones spawnable by kida, only perceivable by other kida

diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -106,6 +106,5 @@
 	remove_verb(human, /mob/living/carbon/human/proc/emote_purr)
 	remove_verb(human, /mob/living/carbon/human/proc/emote_purrl)
 	remove_verb(human, /mob/living/carbon/human/proc/emote_hiss_tajaran)
-	var/devour_component = human.GetComponent(/datum/component/devour/advanced)
-	if(devour_component)
-		qdel(devour_component)
+	if(human.GetComponent(/datum/component/devour/advanced))
+		qdel(human.GetComponent(/datum/component/devour/advanced))
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -132,9 +132,8 @@
 		/mob/living/carbon/human/proc/emote_rumble))
 	var/datum/action/innate/tail_cut/lash = locate() in human.actions
 	lash?.Remove(human)
-	var/devour_component = human.GetComponent(/datum/component/devour/advanced)
-	if(devour_component)
-		qdel(devour_component)
+	if(human.GetComponent(/datum/component/devour/advanced))
+		qdel(human.GetComponent(/datum/component/devour/advanced))
 
 
 /datum/species/unathi/handle_life(mob/living/carbon/human/H)

diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -91,6 +91,5 @@
 	remove_verb(human, /mob/living/carbon/human/proc/emote_swag)
 	remove_verb(human, /mob/living/carbon/human/proc/emote_howl)
 	remove_verb(human, /mob/living/carbon/human/proc/emote_growl)
-	var/devour_component = human.GetComponent(/datum/component/devour/advanced)
-	if(devour_component)
-		qdel(devour_component)
+	if(human.GetComponent(/datum/component/devour/advanced))
+		qdel(human.GetComponent(/datum/component/devour/advanced))