From 203246ece74e69b231101dab8b81901d2243fd19 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 1 Oct 2020 23:40:57 +0100 Subject: [PATCH] FUCK --- .../mob/living/carbon/human/species_types/jellypeople.dm | 6 +++++- code/modules/movespeed/modifiers/innate.dm | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 5c1ef7a0a4..5fb6fe2b53 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -657,7 +657,7 @@ button_icon_state = "slimepuddle" icon_icon = 'icons/mob/actions/actions_slime.dmi' background_icon_state = "bg_alien" - required_mobility_flags = MOBILITY_USE | MOBILITY_STAND + required_mobility_flags = MOBILITY_STAND var/is_puddle = FALSE var/in_transformation_duration = 12 var/out_transformation_duration = 7 @@ -695,6 +695,7 @@ ADD_TRAIT(H, TRAIT_SPRINT_LOCKED, SLIMEPUDDLE_TRAIT) ADD_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, SLIMEPUDDLE_TRAIT) ADD_TRAIT(H, TRAIT_MOBILITY_NOREST, SLIMEPUDDLE_TRAIT) + H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle) H.update_disabled_bodyparts(silent = TRUE) squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg')) sleep(in_transformation_duration) @@ -721,6 +722,7 @@ REMOVE_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, SLIMEPUDDLE_TRAIT) REMOVE_TRAIT(H, TRAIT_MOBILITY_NOREST, SLIMEPUDDLE_TRAIT) H.update_disabled_bodyparts(silent = TRUE) + H.remove(/datum/movespeed_modifier/slime_puddle) is_puddle = FALSE if(squeak) squeak.RemoveComponent() @@ -747,6 +749,8 @@ var/extract_cooldown = 0 /datum/species/jelly/luminescent/on_species_loss(mob/living/carbon/C) + if(slime_puddle && slime_puddle.is_puddle) + slime_puddle.Activate() ..() if(current_extract) current_extract.forceMove(C.drop_location()) diff --git a/code/modules/movespeed/modifiers/innate.dm b/code/modules/movespeed/modifiers/innate.dm index a0357ddf0f..946d93e96b 100644 --- a/code/modules/movespeed/modifiers/innate.dm +++ b/code/modules/movespeed/modifiers/innate.dm @@ -18,3 +18,7 @@ blacklisted_movetypes = (FLOATING|CRAWLING) variable = TRUE flags = IGNORE_NOSLOW + +/datum/movespeed_modifier/slime_puddle + multiplicative_slowdown = 2 + flags = IGNORE_NOSLOW