From 7bf38b41f76da64b4e034055820dc1d74704de0f Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Fri, 30 Jan 2015 16:47:40 -0800 Subject: [PATCH 1/2] Fixes #7258 Fixes #7258 --- code/modules/reagents/Chemistry-Goon-Other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm index 62b5a848c9a..4664b374960 100644 --- a/code/modules/reagents/Chemistry-Goon-Other.dm +++ b/code/modules/reagents/Chemistry-Goon-Other.dm @@ -119,7 +119,7 @@ datum/reagent/colorful_reagent result_amount = 5 datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume) - if(M) + if(M && ishuman(M)) M.color = pick(potential_colors) ..() return @@ -147,4 +147,4 @@ datum/reagent/triple_citrus id = "triple_citrus" result = "triple_citrus" required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1) - result_amount = 5 \ No newline at end of file + result_amount = 5 From fa7ac922f963636eeb7757538763b72efc059492 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sat, 31 Jan 2015 10:21:44 -0800 Subject: [PATCH 2/2] changes to isliving() --- code/modules/reagents/Chemistry-Goon-Other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm index 4664b374960..963e85a214c 100644 --- a/code/modules/reagents/Chemistry-Goon-Other.dm +++ b/code/modules/reagents/Chemistry-Goon-Other.dm @@ -118,8 +118,8 @@ datum/reagent/colorful_reagent required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1) result_amount = 5 -datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume) - if(M && ishuman(M)) +datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume) + if(M && isliving(M)) M.color = pick(potential_colors) ..() return