GRUG SMASH RUNTIME

This commit is contained in:
Dip
2020-10-18 04:34:21 -03:00
parent 8a911e0064
commit 6163b7c963
12 changed files with 27 additions and 17 deletions
@@ -7,13 +7,14 @@
/mob/living/carbon/human/spawn_gibs(with_bodyparts, atom/loc_override)
var/location = loc_override ? loc_override.drop_location() : drop_location()
if(dna?.species?.gib_types)
var/blood_dna = get_blood_dna_list()
var/datum/species/S = dna.species
var/length = length(S.gib_types)
if(length)
var/path = (with_bodyparts && length > 1) ? S.gib_types[2] : S.gib_types[1]
new path(location, src, get_static_viruses())
else
new S.gib_types(location, src, get_static_viruses())
new S.gib_types(location, src, get_static_viruses(), blood_dna)
else
if(with_bodyparts)
new /obj/effect/gibspawner/human(location, src, get_static_viruses())
@@ -184,8 +184,9 @@
return TRUE
/mob/living/simple_animal/bot/death(gibbed)
explode()
..()
. = ..()
if(!gibbed)
explode()
/mob/living/simple_animal/bot/proc/explode()
qdel(src)
@@ -332,8 +332,8 @@
speak_chance *= 1.27 // 20 crackers to go from 1% to 100%
speech_shuffle_rate += 10
to_chat(user, "<span class='notice'>[src] eagerly devours the cracker.</span>")
..()
return
return // the cracker was deleted
return ..()
//Bullets
/mob/living/simple_animal/parrot/bullet_act(obj/item/projectile/Proj)