Merge pull request #777 from Fox-McCloud/foods

[Goonchem] Food Reagents
This commit is contained in:
ZomgPonies
2015-04-12 04:35:14 -04:00
16 changed files with 326 additions and 17 deletions
@@ -222,6 +222,17 @@
message = "<B>[src]</B> makes a strong noise."
m_type = 2
if ("burp")
if(miming)
message = "<B>[src]</B> opens their mouth rather obnoxiously."
m_type = 1
else
if (!muzzled)
message = "<B>[src]</B> burps."
m_type = 2
else
message = "<B>[src]</B> makes a peculiar noise."
m_type = 2
if ("clap")
if (!src.restrained())
message = "<B>[src]</B> claps."
@@ -35,7 +35,7 @@
/mob/living/simple_animal/construct/Die()
..()
new /obj/item/weapon/ectoplasm (src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm (src.loc)
for(var/mob/M in viewers(src, null))
if((M.client && !( M.blinded )))
M.show_message("\red [src] collapses in a shattered heap. ")
@@ -68,7 +68,7 @@
invisibility = pick(0,60,60,invisibility)
..()
/mob/living/simple_animal/hostile/retaliate/ghost/Die()
new /obj/item/weapon/ectoplasm(loc)
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm(loc)
del src
return
@@ -28,7 +28,7 @@
Life()
..()
if(stat == 2)
new /obj/item/weapon/ectoplasm (src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm (src.loc)
for(var/mob/M in viewers(src, null))
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
@@ -31,7 +31,7 @@
Life()
..()
if(stat == 2)
new /obj/item/weapon/ectoplasm (src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm (src.loc)
for(var/mob/M in viewers(src, null))
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")