From 0e19a4d00c04bbcb7736fe53015cf3fdbdde0b9c Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 20 Nov 2017 12:11:59 -0500 Subject: [PATCH] Fixes Slime Transformation --- code/datums/diseases/transformation.dm | 2 +- code/modules/mob/living/carbon/slime/slime.dm | 4 ++++ code/modules/projectiles/projectile/magic.dm | 8 ++++---- code/modules/reagents/chemistry/recipes/slime_extracts.dm | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 7b4b0a27393..221b41abbc4 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -186,7 +186,7 @@ stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") stage4 = list("You are turning into a slime.") stage5 = list("You have become a slime.") - new_form = /mob/living/simple_animal/slime + new_form = /mob/living/carbon/slime/random /datum/disease/transformation/slime/stage_act() ..() diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 28e457fd128..d1bcb196c0e 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -66,6 +66,10 @@ coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]") ..() +/mob/living/carbon/slime/random/New() + colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black") + ..() + /mob/living/carbon/slime/Destroy() for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines) if(src in X.stored_slimes) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index ff274a48993..f42b4783e11 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -17,7 +17,7 @@ damage = 10 damage_type = BRUTE nodamage = 0 - + //explosion values var/exp_heavy = 0 var/exp_light = 2 @@ -55,7 +55,7 @@ if(ismob(target)) //multiple flavors of pain var/mob/living/M = target M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately - + /obj/item/projectile/magic/fireball/infernal name = "infernal fireball" @@ -187,7 +187,7 @@ proc/wabbajack(mob/living/M) if(ishuman(M)) Robot.mmi.transfer_identity(M) //Does not transfer key/client. if("slime") - new_mob = new /mob/living/carbon/slime(M.loc) + new_mob = new /mob/living/carbon/slime/random(M.loc) new_mob.universal_speak = 1 if("xeno") if(prob(50)) @@ -293,4 +293,4 @@ proc/wabbajack(mob/living/M) damage_type = BURN flag = "magic" dismemberment = 50 - nodamage = 0 \ No newline at end of file + nodamage = 0 \ No newline at end of file diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index b4364bd175f..249043fb148 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -681,8 +681,7 @@ /datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/mob/living/carbon/slime/S = new /mob/living/carbon/slime - S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black") + var/mob/living/carbon/slime/random/S = new /mob/living/carbon/slime/random S.forceMove(get_turf(holder.my_atom)) S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")