cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes that one alien feature that uses mouse drag (#84916)

Browse Source 
## 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

🆑 Melbert
fix: Fixes xenos being able to do that one mechanic that involves
mouse-dragging people to you
/🆑
This commit is contained in:
MrMelbert
2024-07-18 18:35:12 -05:00
committed by GitHub
parent eb44404b95
commit 8155177d46
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/strippable.dm
+7 -1
View File
@@ -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))