cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
silicons
2021-01-13 13:44:46 -07:00
parent 2525334bb0
commit 3fe2776a6a
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__DEFINES/movement.dm
View File

@@ -16,10 +16,12 @@ GLOBAL_VAR_INIT(glide_size_multiplier, 1.0)
#define DELAY_TO_GLIDE_SIZE(delay) (clamp(((32 / max((delay) / world.tick_lag, 1)) * GLOB.glide_size_multiplier), MIN_GLIDE_SIZE, MAX_GLIDE_SIZE))
/// Enables smooth movement
#define SMOOTH_MOVEMENT
#ifndef SMOOTH_MOVEMENT
#define SMOOTH_MOVEMENT TRUE
#endif
/// Set appearance flags in vars
#ifdef SMOOTH_MOVEMENT
#if SMOOTH_MOVEMENT
#define SET_APPEARANCE_FLAGS(flags) appearance_flags = (flags | LONG_GLIDE)
#else
#define SET_APPEARANCE_FLAGS(flags) appearance_flags = flags

4
code/datums/components/combat_mode.dm
View File

@@ -87,7 +87,7 @@
else
to_chat(source, self_message)
if(playsound)
source.playsound_local(source, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE, use_reverb= FALSE) //Sound from interbay!
source.playsound_local(source, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!
RegisterSignal(source, COMSIG_MOB_CLIENT_MOUSEMOVE, .proc/onMouseMove)
RegisterSignal(source, COMSIG_MOVABLE_MOVED, .proc/on_move)
RegisterSignal(source, COMSIG_MOB_CLIENT_MOVE, .proc/on_client_move)
@@ -114,7 +114,7 @@
else
to_chat(source, self_message)
if(playsound)
source.playsound_local(source, 'sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE, use_reverb= FALSE) //Slightly modified version of the toggleon sound!
source.playsound_local(source, 'sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the toggleon sound!
UnregisterSignal(source, list(COMSIG_MOB_CLIENT_MOUSEMOVE, COMSIG_MOVABLE_MOVED, COMSIG_MOB_CLIENT_MOVE))
if(hud_icon)
hud_icon.combat_on = FALSE

4
code/game/atoms_movable.dm
View File

@@ -303,6 +303,7 @@
pulledby.stop_pulling()
/atom/movable/proc/set_glide_size(target = 8, recursive = TRUE)
#if SMOOTH_MOVEMENT
// SEND_SIGNAL(src, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, target)
glide_size = target
@@ -312,6 +313,9 @@
if(recursive)
recursive_pulled_glidesize_update()
#else
return
#endif
///Sets the anchored var and returns if it was sucessfully changed or not.
/atom/movable/proc/set_anchored(anchorvalue)

6
code/game/sound.dm
View File

@@ -174,7 +174,11 @@ distance_multiplier - Can be used to multiply the distance at which the sound is
if(A.sound_environment != SOUND_ENVIRONMENT_NONE)
S.environment = A.sound_environment
if(use_reverb && S.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting
if(use_reverb)
if(S.environment == SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting
S.environment = SOUND_ENVIRONMENT_CONCERT_HALL
S.echo = list(0, null, -10000, null, null, null, null, null, null, null, null, null, null, 1, 1, 1, null, null)
else
S.echo[3] = 0 //Room setting, 0 means normal reverb
S.echo[4] = 0 //RoomHF setting, 0 means normal reverb.