Skip to content

Simians can now safe climb #11026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SirNightKnight merged 1 commit into from
Mar 7, 2026
Merged

Simians can now safe climb #11026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/datums/elements/climbable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
structure_climber.visible_message(span_warning("[structure_climber] is knocked off [climbed_thing]."), span_warning("You're knocked off [climbed_thing]!"), span_hear("You hear a cry from [structure_climber], followed by a slam."))


/datum/element/climbable/proc/climb_structure(atom/climbed_thing, mob/living/user, params)
/datum/element/climbable/proc/climb_structure(atom/climbed_thing, mob/living/user, params, can_vault = FALSE)
if(!can_climb(climbed_thing, user) || DOING_INTERACTION(user, DOAFTER_SOURCE_CLIMBING))
return
climbed_thing.add_fingerprint(user)
Expand All @@ -79,7 +79,7 @@
if(QDELETED(climbed_thing)) //Checking if structure has been destroyed
return

if(HAS_TRAIT(user, TRAIT_VAULTING) && (user.m_intent == MOVE_INTENT_RUN || user.m_intent == MOVE_INTENT_SPRINT))//monkestation edit: simians can fling themselves off climbable structures
if(HAS_TRAIT(user, TRAIT_VAULTING) && can_vault && (user.m_intent == MOVE_INTENT_RUN || user.m_intent == MOVE_INTENT_SPRINT))//monkestation edit: simians can fling themselves off climbable structures
vault_over_object(climbed_thing, user, params)
if(climb_stun)
user.Immobilize(climb_stun)
Expand Down Expand Up @@ -154,7 +154,7 @@
return
var/mob/living/living_target = dropped_atom
if(living_target.mobility_flags & MOBILITY_MOVE)
INVOKE_ASYNC(src, PROC_REF(climb_structure), climbed_thing, living_target, params)
INVOKE_ASYNC(src, PROC_REF(climb_structure), climbed_thing, living_target, params, FALSE)
return COMPONENT_CANCEL_MOUSEDROPPED_ONTO

///Tries to climb onto the target if the forced movement of the mob allows it
Expand All @@ -165,7 +165,7 @@
if(bumpee.force_moving?.allow_climbing)
do_climb(source, bumpee)
if(bumpee.m_intent == MOVE_INTENT_SPRINT)
INVOKE_ASYNC(src, PROC_REF(climb_structure), source, bumpee)
INVOKE_ASYNC(src, PROC_REF(climb_structure), source, bumpee, null, TRUE)

///Tries to climb onto the target if the forced movement of the mob allows it
/datum/element/climbable/proc/attempt_sprint_climb(datum/source, mob/bumpee)
Expand Down
Loading