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

Better recoil visuals (#93904)

Browse Source 
## About The Pull Request
Port of https://github.com/shiptest-ss13/Shiptest/pull/3330
Partial port of https://github.com/shiptest-ss13/Shiptest/pull/1601

Makes two changes to how guns handle recoil.
- Changes recoil from an erratic shaking to a kicking of your screen
relative to your firing angle
- Adds a small cosmetic recoil to all ballistics (with an accompanying
pref option to tweak or disable it)

Primary recoil still is only used as a balance lever for a very small
handful of guns (and sawoff)

## Why It's Good For The Game

Cosmetic recoil makes guns feel a lot more punchier. People who think
its a competitive disadvantage (nerds/loosers) or people with a
legitimate sickness to screen shake or similar can just turn it off.

Old recoil was just reused explosion, while new recoil feels like its
actually recoil
This commit is contained in:
FalloutFalcon
2025-12-07 16:51:37 -06:00
committed by GitHub
parent a85ea2e631
commit e7615580ac
6 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_helpers.dm
+27 -1
View File
@@ -174,9 +174,10 @@
if(C.prefs?.read_preference(/datum/preference/toggle/screen_shake_darken))
var/type = /atom/movable/screen/fullscreen/flash/black
var/shake_dur = max(duration, 2 SECONDS)
M.overlay_fullscreen("flash", type)
addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, clear_fullscreen), "flash", 3 SECONDS), 3 SECONDS)
addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, clear_fullscreen), "flash", 1 SECONDS), shake_dur)
//How much time to allot for each pixel moved
var/time_scalar = (1 / ICON_SIZE_ALL) * TILES_PER_SECOND
@@ -206,6 +207,31 @@
#undef TILES_PER_SECOND
/// Helper proc for a similar function to shake_camera, expect this one kicks the camera back at an opposite angle rather then skake_camera's irratic jittering.
/proc/recoil_camera(mob/recoiled_mob, duration, backtime_duration, strength, angle)
if(!recoiled_mob || !recoiled_mob.client || duration < 1)
return
var/client/my_client = recoiled_mob.client
strength *= world.icon_size
var/client/client_to_shake = recoiled_mob.client
var/oldx = client_to_shake.pixel_x
var/oldy = client_to_shake.pixel_y
//get pixels to move the camera in an angle
var/mpx = sin(angle) * strength
var/mpy = cos(angle) * strength
if(my_client.prefs?.read_preference(/datum/preference/toggle/screen_shake_darken))
var/type = /atom/movable/screen/fullscreen/flash/black
var/shake_dur = max(duration, 2 SECONDS)
recoiled_mob.overlay_fullscreen("flash", type)
addtimer(CALLBACK(recoiled_mob, TYPE_PROC_REF(/mob, clear_fullscreen), "flash", 1 SECONDS), shake_dur)
animate(client_to_shake, pixel_x = oldx+mpx, pixel_y = oldy+mpy, time = duration, flags = ANIMATION_RELATIVE)
animate(pixel_x = oldx, pixel_y = oldy, time = backtime_duration, easing = BACK_EASING)
///Find if the message has the real name of any user mob in the mob_list
/proc/findname(msg)
if(!istext(msg))