Skip to content

Commit

Permalink
[MIRROR] Fixes crutches crippling you and giving infinite speedboosts (
Browse files Browse the repository at this point in the history
…#2815) (#3622)

* Fixes crutches crippling you and giving infinite speedboosts (#83660)

Fixes #83646 

Fixes crutches setting your legs to null whenever you pick them up or
drop them
Fixes slowdown reduction on crutches being permanent (this was hard to
notice because they instantly cripple you)

:cl:
fix: fixes touching a crutch permanently crippling you
fix: fixes crutches giving permanent speedboosts even when dropped
/:cl:

* Fixes crutches crippling you and giving infinite speedboosts

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Time-Green <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
4 people authored Jun 4, 2024
1 parent 6215db5 commit 28cb42f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -521,12 +521,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301

/obj/item/cane/proc/movement_support_add(mob/living/user)
RegisterSignal(user, COMSIG_CARBON_LIMPING, PROC_REF(handle_limping))
user.set_usable_legs()
return TRUE

/obj/item/cane/proc/movement_support_del(mob/living/user)
UnregisterSignal(user, list(COMSIG_CARBON_LIMPING))
user.set_usable_legs()
return TRUE

/obj/item/cane/proc/handle_limping(mob/living/user)
Expand Down Expand Up @@ -565,8 +563,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
. = ..()
if(!.)
return
user.update_usable_leg_status()
UnregisterSignal(user, list(COMSIG_LIVING_LIMBLESS_SLOWDOWN, COMSIG_CARBON_LIMPING))
user.update_usable_leg_status()
REMOVE_TRAIT(user, TRAIT_WADDLING, REF(src))

/obj/item/cane/crutch/proc/handle_slowdown(mob/living/user, limbless_slowdown, list/slowdown_mods)
Expand Down

0 comments on commit 28cb42f

Please sign in to comment.