From 27c5897c4d44b35296507e871828afc6fdf99ee7 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 1 Oct 2020 00:17:17 +0100 Subject: [PATCH] update button icon and stand up --- .../living/carbon/human/species_types/jellypeople.dm | 10 +++++++++- 1 file 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 b074b5a778..f55f53083b 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -668,9 +668,16 @@ var/datum/component/squeak/squeak var/transforming = FALSE +/datum/action/innate/slime_puddle/IsAvailable() + if(!transforming) + return ..() + else + return FALSE + /datum/action/innate/slime_puddle/Activate() - if(isjellyperson(owner) && !transforming) + if(isjellyperson(owner) && IsAvailable()) transforming = TRUE + UpdateButtonIcon() var/mob/living/carbon/human/H = owner var/mutcolor = "#" + H.dna.features["mcolor"] if(!is_puddle) @@ -702,6 +709,7 @@ var/obj/effect/puddle_effect = new puddle_from_effect(get_turf(owner), owner.dir) puddle_effect.color = mutcolor H.rotate_on_lying = FALSE + H.set_resting(0, TRUE, TRUE) // yes, it's 0, not FALSE H.Stun(out_transformation_duration, ignore_canstun = TRUE) sleep(out_transformation_duration) REMOVE_TRAIT(H, TRAIT_PARALYSIS_L_ARM, "SLIME_PUDDLE_PARALYSIS_L_ARM")