i mean it's allright like

ss220-space · Sep 19, 2024 · ff532d8 · ff532d8
1 parent bd17ad1
commit ff532d8
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 23 deletions.
diff --git a/code/datums/components/devour.dm b/code/datums/components/devour.dm
@@ -120,7 +120,11 @@
 /datum/component/devour/advanced/proc/adv_devour(mob/living/carbon/gourmet, mob/living/living)
     SIGNAL_HANDLER
 
-    if(!check_types(living) || !can_devour(gourmet))
+    if(!istype(living))
+        return
+    if(allowed_types && !is_type_in_list(living, allowed_types))
+        return
+    if(blacklisted_types && is_type_in_list(living, blacklisted_types))
         return
 
     var/target = isturf(living.loc) ? living : gourmet

diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -138,7 +138,8 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
 
 
 /mob/living/carbon/alien/humanoid/on_grab_quick_equip(atom/movable/grabbed_thing, current_pull_hand)
-	SEND_SIGNAL(src, COMSIG_COMPONENT_DEVOUR_INITIATE, grabbed_thing)
+	if(can_consume(grabbed_thing))
+		SEND_SIGNAL(src, COMSIG_COMPONENT_DEVOUR_INITIATE, grabbed_thing)
 
 
 /// Returns FALSE if we're not allowed to eat it, true otherwise

diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -132,14 +132,14 @@
 	)
 
 
-/datum/species/kidan/on_species_loss(mob/living/carbon/human/H)
+/datum/species/kidan/on_species_loss(mob/living/carbon/human/human)
 	. = ..()
-	remove_verb(H, list(
+	remove_verb(human, list(
 		/mob/living/carbon/human/proc/emote_click,
 		/mob/living/carbon/human/proc/emote_clack,
 		/mob/living/carbon/human/proc/emote_wiggle,
 		/mob/living/carbon/human/proc/emote_wave_k))
-	add_verb(H, list(
+	add_verb(human, list(
 		/mob/living/carbon/human/verb/emote_pale,
 		/mob/living/carbon/human/verb/emote_blink,
 		/mob/living/carbon/human/verb/emote_blink_r,
@@ -155,11 +155,14 @@
 
 	// Removing the HUD for detecting pheromones
 	var/datum/atom_hud/kidan_hud = GLOB.huds[DATA_HUD_KIDAN_PHEROMONES]
-	kidan_hud.remove_hud_from(H)
+	kidan_hud.remove_hud_from(human)
 
 	// Removing the action for creating pheromones
-	var/datum/action/innate/produce_pheromones/produce_pheromones = locate() in H.actions
-	produce_pheromones?.Remove(H)
+	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)
 
 
 /// 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
@@ -97,10 +97,13 @@
 								 /mob/living/simple_animal/tribble), \
 	)
 
-/datum/species/tajaran/on_species_loss(mob/living/carbon/human/H)
+/datum/species/tajaran/on_species_loss(mob/living/carbon/human/human)
 	. = ..()
-	remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_purr)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_purrl)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_hiss_tajaran)
+	remove_verb(human, /mob/living/carbon/human/proc/emote_wag)
+	remove_verb(human, /mob/living/carbon/human/proc/emote_swag)
+	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)
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -117,9 +117,9 @@
 	)
 
 
-/datum/species/unathi/on_species_loss(mob/living/carbon/human/H)
+/datum/species/unathi/on_species_loss(mob/living/carbon/human/human)
 	. = ..()
-	remove_verb(H, list(
+	remove_verb(human, list(
 		/mob/living/carbon/human/proc/emote_wag,
 		/mob/living/carbon/human/proc/emote_swag,
 		/mob/living/carbon/human/proc/emote_hiss_unathi,
@@ -128,8 +128,11 @@
 		/mob/living/carbon/human/proc/emote_whip,
 		/mob/living/carbon/human/proc/emote_whip_l,
 		/mob/living/carbon/human/proc/emote_rumble))
-	var/datum/action/innate/tail_cut/lash = locate() in H.actions
-	lash?.Remove(H)
+	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)
 
 
 /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
@@ -83,9 +83,12 @@
 								 /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble), \
 	)
 
-/datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/H)
+/datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/human)
 	. = ..()
-	remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_howl)
-	remove_verb(H, /mob/living/carbon/human/proc/emote_growl)
+	remove_verb(human, /mob/living/carbon/human/proc/emote_wag)
+	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)