Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor

Simple Animal Loot Refactor
This commit is contained in:
TheDZD
2016-05-22 18:31:43 -04:00
17 changed files with 58 additions and 87 deletions
+7 -4
View File
@@ -646,11 +646,14 @@ datum/reagent/strange_reagent
metabolization_rate = 0.2
datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(istype(M, /mob/living/simple_animal))
if(isanimal(M))
if(method == TOUCH)
if(M.stat == DEAD)
M.revive()
M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
var/mob/living/simple_animal/SM = M
if(SM.stat == DEAD)
SM.revive()
SM.loot.Cut() //no abusing strange reagent for unlimited farming of resources
SM.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
if(istype(M, /mob/living/carbon))
if(method == INGEST)
if(M.stat == DEAD)