Skip to content

Commit

Permalink
Fixes that one alien feature that uses mouse drag (tgstation#84916)
Browse files Browse the repository at this point in the history
## About The Pull Request

Fixes that one alien feature that uses mouse drag

Honestly I really hate this fix, I think strippable should be
non-blocking, or alternatively, strippable should have some proc
`should_strip` to prevent people from opening the ui in some contexts.
But whatever

## Changelog

:cl: Melbert
fix: Fixes xenos being able to do that one mechanic that involves
mouse-dragging people to you
/:cl:
  • Loading branch information
MrMelbert authored Jul 18, 2024
1 parent eb44404 commit 8155177
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion code/datums/elements/strippable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,21 @@
if(!user.can_perform_action(source, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
return

// Cyborgs buckle people by dragging them onto them, unless in combat mode.
// Snowflake for cyborgs buckling people by dragging them onto them, unless in combat mode.
if (iscyborg(user))
var/mob/living/silicon/robot/cyborg_user = user
if (!cyborg_user.combat_mode)
return
// Snowflake for xeno consumption code
if (isalienadult(user))
var/mob/living/carbon/alien/adult/alien = user
if (alien.grab_state == GRAB_AGGRESSIVE && alien.pulling == source)
return

if (!isnull(should_strip_proc_path) && !call(source, should_strip_proc_path)(user))
return

// Snowflake for mob scooping
if (isliving(source))
var/mob/living/mob = source
if (mob.can_be_held && (user.grab_state == GRAB_AGGRESSIVE) && (user.pulling == source))
Expand Down

0 comments on commit 8155177

Please sign in to comment.