shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15656 from deathride58/animfix

Browse Source 
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
This commit is contained in:
Lin
2022-06-07 18:05:07 +00:00
committed by GitHub
parent 1d897cd4ed dac4e9b974
commit 6f97ec2b1d
27 changed files with 89 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/bouncy.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/atom/movable/A = parent
switch(rand(1, 3))
if(1)
A.do_jiggle(45 + rand(-10, 10) * bouncy_mod, 14)
A.do_jiggle(25 + rand(-5, 5) * bouncy_mod, 14)
if(2)
var/min_b = 0.6/bouncy_mod
var/max_b = 1.2 * bouncy_mod
code/datums/components/storage/storage.dm
+5 -4
View File
@@ -431,25 +431,26 @@
if(M.incapacitated() || !M.canUseStorage())
return
var/atom/A = parent
A.add_fingerprint(M)
// this must come before the screen objects only block, dunno why it wasn't before
if(over_object == M)
user_show_to_mob(M, trigger_on_found = TRUE)
if(isrevenant(M))
INVOKE_ASYNC(GLOBAL_PROC, .proc/RevenantThrow, over_object, M, source)
return
if(check_locked(null, M) || !M.CanReach(A) || (!M.CanReach(over_object) && !istype(over_object, /atom/movable/screen)))
return
playsound(A, "rustle", 50, TRUE, -5)
A.do_jiggle()
A.add_fingerprint(M)
if(!istype(over_object, /atom/movable/screen))
INVOKE_ASYNC(src, .proc/dump_content_at, over_object, M)
return
if(A.loc != M)
return
playsound(A, "rustle", 50, TRUE, -5)
A.do_jiggle()
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(A, H.held_index)
return
A.add_fingerprint(M)
/datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE, trigger_on_found = FALSE)
var/atom/A = parent