From 5c8140ee0b3844cf073766cc52380ad266cc2c4b Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 5 Sep 2017 22:52:46 -0400 Subject: [PATCH] Removes some world << output, fixes a few bugs. --- code/modules/mob/living/living.dm | 5 ----- .../modules/mob/living/simple_animal/slime/subtypes.dm | 10 +++++----- code/modules/projectiles/projectile/special.dm | 3 --- code/modules/xenobio/items/extracts.dm | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c313b1482c7..b33688e59ba 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -640,16 +640,11 @@ default behaviour is: return /mob/living/Move(a, b, flag) -// if (buckled) -// world << "[src].Move() failed; buckled." -// return if (buckled && buckled.loc != a) //not updating position if (!buckled.anchored) - world << "[src].Move(); will return [buckled].Move ." return buckled.Move(a, b) else - world << "[src].Move() failed; buckled to anchored [buckled]." return 0 if (restrained()) diff --git a/code/modules/mob/living/simple_animal/slime/subtypes.dm b/code/modules/mob/living/simple_animal/slime/subtypes.dm index 0de8c33b4cc..ec6b23644dc 100644 --- a/code/modules/mob/living/simple_animal/slime/subtypes.dm +++ b/code/modules/mob/living/simple_animal/slime/subtypes.dm @@ -662,7 +662,7 @@ /mob/living/simple_animal/slime/light_pink desc = "This slime seems a lot more peaceful than the others." color = "#FF8888" - slime_color = "light_pink" + slime_color = "light pink" coretype = /obj/item/slime_extract/light_pink description_info = "This slime is effectively always disciplined initially." @@ -670,10 +670,10 @@ discipline = 5 slime_mutation = list( - /mob/living/simple_animal/slime/green, - /mob/living/simple_animal/slime/green, - /mob/living/simple_animal/slime/emerald, - /mob/living/simple_animal/slime/emerald + /mob/living/simple_animal/slime/pink, + /mob/living/simple_animal/slime/pink, + /mob/living/simple_animal/slime/light_pink, + /mob/living/simple_animal/slime/light_pink ) // Special diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index dd268f09b72..049bdcaf783 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -66,9 +66,6 @@ new_temperature = round(new_temperature * temp_factor) L.bodytemperature = new_temperature -// L.bodytemperature = between(target_temperature,(L.bodytemperature - ((L.bodytemperature + potential_temperature_delta) * temp_factor) ), L.bodytemperature) - world << "Temperature of [L] is now [L.bodytemperature]." - return 1 /obj/item/projectile/temp/hot diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index cf3e96c52ab..901ccb8f99f 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -275,7 +275,7 @@ result_amount = 1 required = /obj/item/slime_extract/blue -/datum/chemical_reaction/slime/blue_frostoil/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slime/blue_stability/on_reaction(var/datum/reagents/holder) new /obj/item/slimepotion/stabilizer(get_turf(holder.my_atom)) ..()