From dfe187ff1c1769ca708bf1a5e699d34545888c84 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Fri, 23 Feb 2018 05:48:56 +0000 Subject: [PATCH] Slimepeople bugfixes and rebalancing (#5649) * Patching damage down to 3x to balance for Pooj's pressure damage increase * Fixes a bug related to slime change potions * Fixing conflict --- .../mob/living/carbon/human/species_types/furrypeople.dm | 2 +- .../mob/living/carbon/human/species_types/jellypeople.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 7e30abd49c..1630b7a194 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -254,7 +254,7 @@ hair_color = "mutcolor" hair_alpha = 180 liked_food = MEAT - coldmod = 6 + coldmod = 3 heatmod = 1 burnmod = 1 diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 6c03ded69d..f32588d6b3 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -20,6 +20,8 @@ /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) regenerate_limbs.Remove(C) + if(slime_change) //CIT CHANGE + slime_change.Remove(C) //CIT CHANGE C.remove_language(/datum/language/slime) C.faction -= "slime" ..()