From b067ebc707bb1da98a8bacf5ec33fa83a46f18e0 Mon Sep 17 00:00:00 2001 From: diegoflores31 Date: Mon, 2 Sep 2024 00:52:35 -0500 Subject: [PATCH 1/2] frooit --- code/modules/cm_aliens/structures/fruit.dm | 20 +++++++++++++++++++- sound/effects/alien_resinfeed.ogg | Bin 0 -> 14722 bytes 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sound/effects/alien_resinfeed.ogg diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index b2a0fd27d65b..e9e8d7954f05 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -385,7 +385,25 @@ // Xenos eating fruit /obj/item/reagent_container/food/snacks/resin_fruit/attack(mob/living/carbon/xenomorph/affected_xeno, mob/user) - if(istype(user, /mob/living/carbon/xenomorph)) // Prevents xenos from feeding capped/dead marines fruit + + if(istype(affected_xeno, /mob/living/carbon/human)) + var/mob/living/carbon/human/humanus = affected_xeno + if(HAS_TRAIT(humanus, TRAIT_NESTED) && humanus.stat == !DEAD) // if they are not nested or dead they cant be feed. + user.visible_message(SPAN_BOLDWARNING("[user] starts forcefully feeding [humanus] with resin.")) + if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, affected_xeno, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + return + playsound(src, 'sound/effects/alien_resinfeed.ogg', 25, 1) + to_chat(user, SPAN_HELPFUL("We forcefully feed [humanus] with fruit.")) + to_chat(humanus, SPAN_BOLDWARNING("Your are forcefully fed with slimy resin. GROSS!")) + humanus.heal_limb_damage(30, 30) + humanus.reagents.add_reagent("fruit_resin", 10) + qdel(src) + return + if(humanus.stat == DEAD) + to_chat(user, SPAN_WARNING("[humanus] already is dead.")) + return + + if(istype(user, /mob/living/carbon/xenomorph)) var/mob/living/carbon/xenomorph/feeding_xeno = user if(!feeding_xeno.can_not_harm(affected_xeno)) to_chat(feeding_xeno, SPAN_WARNING("[affected_xeno] refuses to eat [src].")) diff --git a/sound/effects/alien_resinfeed.ogg b/sound/effects/alien_resinfeed.ogg new file mode 100644 index 0000000000000000000000000000000000000000..dad4621907e992f0cf78b6b399473a049a69f137 GIT binary patch literal 14722 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 J2!~U^{{VgqwH5#X literal 0 HcmV?d00001 From 51a7b944d6640f4a5d0509df79a8b6358c384521 Mon Sep 17 00:00:00 2001 From: Diegoflores31 <47069269+Diegoflores31@users.noreply.github.com> Date: Sun, 8 Sep 2024 20:55:52 -0500 Subject: [PATCH 2/2] Update code/modules/cm_aliens/structures/fruit.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- code/modules/cm_aliens/structures/fruit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index e9e8d7954f05..649fb66fa977 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -388,7 +388,7 @@ if(istype(affected_xeno, /mob/living/carbon/human)) var/mob/living/carbon/human/humanus = affected_xeno - if(HAS_TRAIT(humanus, TRAIT_NESTED) && humanus.stat == !DEAD) // if they are not nested or dead they cant be feed. + if(HAS_TRAIT(humanus, TRAIT_NESTED) && humanus.stat != DEAD) // if they are not nested or dead they cant be feed. user.visible_message(SPAN_BOLDWARNING("[user] starts forcefully feeding [humanus] with resin.")) if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, affected_xeno, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) return