Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

marrow weavers inject toxins again #7227

Merged
alexkar598 merged 1 commit into from
Dec 4, 2019
Merged

marrow weavers inject toxins again #7227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions yogstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/marrow_weaver.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
pass_flags = PASSTABLE
attack_sound = 'sound/weapons/bite.ogg'
deathmessage = "rolls over, frothing at the mouth before stilling."
var/poison_type = "toxin"
var/poison_type = /datum/reagent/toxin
var/poison_per_bite = 5
var/buttmad = 0
var/melee_damage_lower_angery0 = 13
Expand All @@ -42,7 +42,7 @@
melee_damage_upper = melee_damage_upper_angery1
move_to_delay = 8
speed = 3
poison_type = "spore"
poison_type = /datum/reagent/toxin/spore
poison_per_bite = 5
else if(buttmad == 1)
if(health > maxHealth/2)
Expand Down Expand Up @@ -87,4 +87,4 @@
for(var/obj/item/organ/O in H.internal_organs)
if(O.zone == "chest")
return TRUE
return FALSE
return FALSE