cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can now tip borgs over [MDB IGNORE] (#10740)

Browse Source 
* You can now tip borgs over (#64097)

I hate Silicon

Teaches Silicon that they should still live within the Crew rather than above them, otherwise people will tip you over and no one would want to help tip you back up.

The timers also, for the most part, match handcuff timers, so there's already a human counterpart of this. Even if it wasn't intentional.
Changelog

cl JohnFulpWillard and theOOZ
qol: Tipping mobs over all runs on right click, rather than running on both right and left click.
balance: You can now tip Borgs over.
/cl

* You can now tip borgs over

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2022-01-16 22:47:49 +00:00
committed by GitHub
co-authored by John Willard GoldenAlpharex
parent d61ad56eab
commit 1856360aca
3 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/tippable.dm
+11 -11
View File
@@ -18,12 +18,13 @@
var/datum/callback/post_untipped_callback
/datum/component/tippable/Initialize(
tip_time = 3 SECONDS,
untip_time = 1 SECONDS,
self_right_time = 60 SECONDS,
datum/callback/pre_tipped_callback,
datum/callback/post_tipped_callback,
datum/callback/post_untipped_callback)
tip_time = 3 SECONDS,
untip_time = 1 SECONDS,
self_right_time = 60 SECONDS,
datum/callback/pre_tipped_callback,
datum/callback/post_tipped_callback,
datum/callback/post_untipped_callback,
)
if(!isliving(parent))
return COMPONENT_INCOMPATIBLE
@@ -36,10 +37,10 @@
src.post_untipped_callback = post_untipped_callback
/datum/component/tippable/RegisterWithParent()
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/interact_with_tippable)
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, .proc/interact_with_tippable)
/datum/component/tippable/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_ATOM_ATTACK_HAND)
UnregisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY)
/datum/component/tippable/Destroy()
if(pre_tipped_callback)
@@ -55,9 +56,8 @@
*
* source - the mob being tipped over
* user - the mob interacting with source
* modifiers - list of on click modifiers (we only tip mobs over using right click!)
*/
/datum/component/tippable/proc/interact_with_tippable(mob/living/source, mob/user, modifiers)
/datum/component/tippable/proc/interact_with_tippable(mob/living/source, mob/user)
SIGNAL_HANDLER
var/mob/living/living_user = user
@@ -68,7 +68,7 @@
if(is_tipped)
INVOKE_ASYNC(src, .proc/try_untip, source, user)
else if(LAZYACCESS(modifiers, RIGHT_CLICK))
else
INVOKE_ASYNC(src, .proc/try_tip, source, user)
return COMPONENT_CANCEL_ATTACK_CHAIN