From f9cf7429e1b141f7ef4090133a6923bcc8c022be Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 30 Sep 2020 02:49:21 +0100 Subject: [PATCH] icons and traits --- .../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 7bab7546a3..1c9c1390e3 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -655,7 +655,7 @@ name = "Puddle Transformation" check_flags = AB_CHECK_CONSCIOUS button_icon_state = "slimepuddle" - icon_icon = 'modular_citadel/icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/mob/actions/actions_slime.dmi' background_icon_state = "bg_alien" var/is_puddle = FALSE var/in_transformation_duration = 12 @@ -671,13 +671,18 @@ var/mob/living/carbon/human/H = owner var/mutcolor = "#" + H.dna.features["mcolor"] if(!is_puddle) + //traits used here to disable their arms ADD_TRAIT(H, TRAIT_PARALYSIS_L_ARM, "SLIME_PUDDLE_PARALYSIS_L_ARM") ADD_TRAIT(H, TRAIT_PARALYSIS_R_ARM, "SLIME_PUDDLE_PARALYSIS_R_ARM") + ADD_TRAIT(H, TRAIT_PASSTABLE, "SLIME_PUDDLE_TABLE_PASS") + ADD_TRAIT(H, TRAIT_SPRINT_LOCKED, "SLIME_PUDDLE_SPRINT_LOCK") + ADD_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, "SLIME_PUDDLE_COMBAT_LOCK") is_puddle = TRUE owner.cut_overlays() var/obj/effect/puddle_effect = new puddle_into_effect(get_turf(owner), owner.dir) puddle_effect.color = mutcolor H.Stun(in_transformation_duration, ignore_canstun = TRUE) + H.KnockToFloor(TRUE, TRUE, TRUE) sleep(in_transformation_duration) var/mutable_appearance/puddle_overlay = mutable_appearance(icon = puddle_icon, icon_state = puddle_state) puddle_overlay.color = mutcolor @@ -691,6 +696,9 @@ sleep(out_transformation_duration) REMOVE_TRAIT(H, TRAIT_PARALYSIS_L_ARM, "SLIME_PUDDLE_PARALYSIS_L_ARM") REMOVE_TRAIT(H, TRAIT_PARALYSIS_R_ARM, "SLIME_PUDDLE_PARALYSIS_R_ARM") + REMOVE_TRAIT(H, TRAIT_PASSTABLE, "SLIME_PUDDLE_TABLE_PASS") + REMOVE_TRAIT(H, TRAIT_SPRINT_LOCKED, "SLIME_PUDDLE_SPRINT_LOCK") + REMOVE_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, "SLIME_PUDDLE_COMBAT_LOCK") is_puddle = FALSE owner.regenerate_icons()