Deconflict and revert an accidental iconstate name change

This commit is contained in:
variableundefined
2019-08-31 09:18:36 -04:00
210 changed files with 3227 additions and 1747 deletions
@@ -668,6 +668,7 @@
color = "#A0E85E"
metabolization_rate = 0.2
taste_description = "life"
var/revive_type = SENTIENCE_ORGANIC //So you can't revive boss monsters or robots with it
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -680,13 +681,14 @@
if(volume < 1)
// gotta pay to play
return ..()
if(isanimal(M))
if(method == TOUCH)
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(isanimal(M) && method == TOUCH)
var/mob/living/simple_animal/SM = M
if(SM.sentience_type != revive_type) // No reviving Ash Drakes for you
return
if(SM.stat == DEAD)
SM.revive()
SM.loot.Cut() //no abusing strange reagent for farming unlimited resources
SM.visible_message("<span class='warning'>[SM] seems to rise from the dead!</span>")
if(iscarbon(M))
if(method == INGEST || (method == TOUCH && prob(25)))
@@ -993,10 +993,10 @@
C.adjustToxLoss(lethality)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(IS_PLANT in H.dna.species.species_traits) //plantmen take a LOT of damage
H.adjustToxLoss(50)
if(IS_PLANT in H.dna.species.species_traits) //plantmen take extra damage
H.adjustToxLoss(3)
..()
else if(istype(M, /mob/living/simple_animal/diona)) //plantmen monkeys (diona) take EVEN MORE damage
else if(istype(M, /mob/living/simple_animal/diona)) //nymphs take EVEN MORE damage
var/mob/living/simple_animal/diona/D = M
D.adjustHealth(100)
..()