Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
This commit is contained in:
@@ -552,6 +552,8 @@
|
||||
//if the vomit combined, apply toxicity and reagents to the old vomit
|
||||
if (QDELETED(V))
|
||||
V = locate() in src
|
||||
if(!V) //the decal was spawned on a wall or groundless turf and promptly qdeleted.
|
||||
return
|
||||
// Make toxins and blazaam vomit look different
|
||||
if(toxvomit == VOMIT_PURPLE)
|
||||
V.icon_state = "vomitpurp_[pick(1,4)]"
|
||||
|
||||
@@ -504,7 +504,7 @@
|
||||
toxpwr = 0
|
||||
|
||||
/datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
|
||||
if(method == TOUCH || method == VAPOR)
|
||||
if((method == TOUCH || method == VAPOR) && M.reagents)
|
||||
M.reagents.add_reagent(/datum/reagent/toxin/itching_powder, reac_volume)
|
||||
|
||||
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
|
||||
|
||||
Reference in New Issue
Block a user