From ed5332fe136d4f9a75bdbcf7426238300ca64c78 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Thu, 22 Jun 2023 10:56:20 +0200 Subject: [PATCH] resync, reinclude chomp edits --- code/modules/clothing/clothing.dm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0b914a6a8c..1d8baeb9be 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -627,6 +627,14 @@ if(usr.stat || usr.restrained() || usr.incapacitated()) return + + //CHOMPEdit begin + if(istype(usr, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = usr + if(H.ability_flags & 0x1) + to_chat(usr, "You cannot do that while phase shifted.") + return + //CHOMPEdit end holding.forceMove(get_turf(usr)) @@ -695,6 +703,20 @@ update_icon() return ..() +// CHOMPEdit Begin - tweaking handle_movement for inshoes steppies +/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running, var/mob/living/carbon/human/pred) + if(!recent_squish && istype(pred)) + recent_squish = 1 + spawn(40) // Cooldown reduced from 100 to 40. Faster, but not that spammy + recent_squish = 0 + for(var/mob/living/M in contents) + if(pred.step_mechanics_pref && M.step_mechanics_pref) + src.handle_inshoe_stepping(pred, M) + else if (prob(1)) // Same old inshoe mechanics + var/emote = pick(inside_emotes) + to_chat(M,emote) + return //CHOMPEDIT End + /obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running) if(prob(1) && !recent_squish) //VOREStation edit begin recent_squish = 1