cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] cleans up some left over things (#10168)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-14 21:32:35 -07:00
committed by GitHub
parent 90e86a173a
commit 9ffe6f5fcb
14 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/falling_object_vr.dm
View File

@@ -26,8 +26,7 @@
dropped.density = FALSE
dropped.opacity = FALSE
animate(dropped, pixel_y = initial_y, pixel_x = initial_x , time = 7)
spawn(7)
dropped.end_fall(crushing)
addtimer(CALLBACK(dropped, TYPE_PROC_REF(/atom/movable,end_fall), crushing), 0.7 SECONDS)
qdel(src)
/atom/movable/proc/end_fall(var/crushing = FALSE)

3
code/game/objects/items/toys/toys_vr.dm
View File

@@ -512,8 +512,7 @@
playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, 0)
for(var/mob/M in range(10, src)) // Checks range
if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI
sleep(2) // Short delay to match up with the explosion sound
shake_camera(M, 2, 1)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(shake_camera), M, 2, 1), 0.2 SECONDS)
else
to_chat(user, span_warning("Nothing happens."))