From 833841ec6de542ac19fe2fda48ddde4a797aaa8f Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Tue, 22 Nov 2022 19:06:00 -0300 Subject: [PATCH] Tajaran, Unathi and Vulpkanin can now eat bees! (#19663) * whos crazy enough to eat bees?! * examine text tweak * Update code/modules/mob/mob_grab.dm Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com> * facid for syndiebee * moved examine text * message tweak 2 * Apply suggestions from code review Co-authored-by: Farie82 * using bee reagent Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com> Co-authored-by: Farie82 --- code/modules/mob/living/carbon/human/examine.dm | 1 - .../mob/living/carbon/human/species/tajaran.dm | 2 +- .../modules/mob/living/carbon/human/species/unathi.dm | 2 +- .../mob/living/carbon/human/species/vulpkanin.dm | 2 +- code/modules/mob/mob_grab.dm | 11 ++++++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f26495df571..662d842bcf6 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -160,7 +160,6 @@ if(!foundghost) msg += " and [p_their()] soul has departed" msg += "...\n" - if(!get_int_organ(/obj/item/organ/internal/brain)) msg += "It appears that [p_their()] brain is missing...\n" diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm index 482e640e268..ed546cc5356 100644 --- a/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -45,7 +45,7 @@ unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/ ) - allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot) + allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/hostile/poison/bees) suicide_messages = list( "is attempting to bite their tongue off!", diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm index 31bbc332391..a3f32ea106e 100644 --- a/code/modules/mob/living/carbon/human/species/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/unathi.dm @@ -48,7 +48,7 @@ ) allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot) + /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/hostile/poison/bees) suicide_messages = list( "is attempting to bite their tongue off!", diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm index c3f4b4646c1..8dcd93ff2c0 100644 --- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm +++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm @@ -40,7 +40,7 @@ ) allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot) + /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/hostile/poison/bees) suicide_messages = list( "is attempting to bite their tongue off!", diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 283cbec97bd..0d90fa7294d 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -382,7 +382,16 @@ user.visible_message("[user] devours \the [affecting]!") if(affecting.mind) add_attack_logs(attacker, affecting, "Devoured") - + if(istype(affecting, /mob/living/simple_animal/hostile/poison/bees)) //Eating a bee will end up damaging you + var/obj/item/organ/external/mouth = user.get_organ(BODY_ZONE_PRECISE_MOUTH) + var/mob/living/simple_animal/hostile/poison/bees/B = affecting + mouth.receive_damage(1) + if(B.beegent) + B.beegent.reaction_mob(assailant, REAGENT_INGEST) + assailant.reagents.add_reagent(B.beegent.id, rand(1, 5)) + else + assailant.reagents.add_reagent("spidertoxin", 5) + user.visible_message("[user]'s mouth became bloated.", "Your mouth has been stung, it's now bloating!") affecting.forceMove(user) LAZYADD(attacker.stomach_contents, affecting) qdel(src)