cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] clickon signal procs cleanup (fixes inability to examine things in certain situations). [MDB IGNORE] (#8928)

Browse Source 
* clickon signal procs cleanup (fixes inability to examine things in certain situations).

* Mirror!

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2021-10-22 23:18:33 +13:00
committed by GitHub
co-authored by Ghom Funce
parent 459e74701a
commit 457644fd27
15 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/shy.dm
+3 -1
View File
@@ -79,8 +79,10 @@
/datum/component/shy/proc/on_clickon(datum/source, atom/target, params)
/datum/component/shy/proc/on_clickon(datum/source, atom/target, list/modifiers)
SIGNAL_HANDLER
if(modifiers[SHIFT_CLICK]) //let them examine their surroundings.
return
return is_shy(target) && COMSIG_MOB_CANCEL_CLICKON
/datum/component/shy/proc/on_try_pull(datum/source, atom/movable/target, force)
code/datums/components/shy_in_room.dm
+3 -1
View File
@@ -52,8 +52,10 @@
to_chat(owner, span_warning("[replacetext(message, "%ROOM", room)]"))
return TRUE
/datum/component/shy_in_room/proc/on_clickon(datum/source, atom/target, params)
/datum/component/shy_in_room/proc/on_clickon(datum/source, atom/target, list/modifiers)
SIGNAL_HANDLER
if(modifiers[SHIFT_CLICK]) //let them examine their surroundings.
return
return is_shy(target) && COMSIG_MOB_CANCEL_CLICKON
/datum/component/shy_in_room/proc/on_try_pull(datum/source, atom/movable/target, force)
code/datums/components/tackle.dm
+4 -4
View File
@@ -68,9 +68,12 @@
tackle.thrower = user
///See if we can tackle or not. If we can, leap!
/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params)
/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, list/modifiers)
SIGNAL_HANDLER
if(modifiers[ALT_CLICK] || modifiers[SHIFT_CLICK] || modifiers[CTRL_CLICK] || modifiers[MIDDLE_CLICK])
return
if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated())
return
@@ -99,9 +102,6 @@
user.face_atom(A)
var/list/modifiers = params2list(params)
if(LAZYACCESS(modifiers, ALT_CLICK) || LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, MIDDLE_CLICK))
return
tackling = TRUE
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle)