cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tajaran, Unathi and Vulpkanin can now eat bees! (#19663)

Browse Source 
* 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 <farie82@users.noreply.github.com>

* using bee reagent

Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Henri215
2022-11-22 23:06:00 +01:00
committed by GitHub
co-authored by Coolrune206 Farie82
parent 08a9b19d19
commit 833841ec6d
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
-1
View File
@@ -160,7 +160,6 @@
if(!foundghost)
msg += " and [p_their()] soul has departed"
msg += "...</span>\n"
if(!get_int_organ(/obj/item/organ/internal/brain))
msg += "<span class='deadsay'>It appears that [p_their()] brain is missing...</span>\n"
code/modules/mob/living/carbon/human/species/tajaran.dm
+1 -1
View File
@@ -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!",
code/modules/mob/living/carbon/human/species/unathi.dm
+1 -1
View File
@@ -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!",
code/modules/mob/living/carbon/human/species/vulpkanin.dm
+1 -1
View File
@@ -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!",
code/modules/mob/mob_grab.dm
+10 -1
View File
@@ -382,7 +382,16 @@
user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
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("<span class='warning'>[user]'s mouth became bloated.</span>", "<span class='danger'>Your mouth has been stung, it's now bloating!</span>")
affecting.forceMove(user)
LAZYADD(attacker.stomach_contents, affecting)
qdel(src)