diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 4fe7fa656ad..95784a38cfa 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -46,7 +46,6 @@ var/list/gamemode_cache = list() var/allow_Metadata = 0 // Metadata is supported. var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1. var/Ticklag = 0.4 - var/Tickcomp = 0 var/antag_hud_allowed = 0 // Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round. var/antag_hud_restricted = 0 // Ghosts that turn on Antagovision cannot rejoin the round. var/list/mode_names = list() @@ -682,9 +681,6 @@ var/list/gamemode_cache = list() if("antag_hud_restricted") config.antag_hud_restricted = 1 - if("tickcomp") - Tickcomp = 1 - if("ipc_timelock_active") ipc_timelock_active = TRUE diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 58b35772009..1dc91f2bfd5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,5 +1,8 @@ /atom/movable layer = 3 + glide_size = 6 + animate_movement = SLIDE_STEPS + var/last_move = null var/anchored = 0 var/movable_flags diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index 6b844ece5e6..eaed465be6c 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -14,9 +14,5 @@ message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0) world.tick_lag = newtick feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No")) - if("Yes") config.Tickcomp = 1 - else config.Tickcomp = 0 else to_chat(src, "Error: ticklag(): Invalid world.ticklag value. No changes made.") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index af4b3a0e2d6..fcec599787e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -154,7 +154,7 @@ var/list/preferences_datums = list() // SPAAAACE var/toggles_secondary = PROGRESS_BARS | FLOATING_MESSAGES | HOTKEY_DEFAULT - var/clientfps = 0 + var/clientfps = 40 var/floating_chat_color var/speech_bubble_type = "normal" diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f154b5c1aba..96220b46be4 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -948,15 +948,10 @@ // AIs are a bit slower than regular and ignore move intent. wearer_move_delay = world.time + ai_controlled_move_delay - var/tickcomp = 0 - if(config.Tickcomp) - tickcomp = ((1/(world.tick_lag))*1.3) - 1.3 - wearer_move_delay += tickcomp - if(istype(wearer.buckled_to, /obj/vehicle)) //manually set move_delay for vehicles so we don't inherit any mob movement penalties //specific vehicle move delays are set in code\modules\vehicles\vehicle.dm - wearer_move_delay = world.time + tickcomp + wearer_move_delay = world.time return wearer.buckled_to.relaymove(wearer, direction) if(istype(wearer.machine, /obj/machinery)) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a5953e971a0..b27e11f1a5c 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -326,12 +326,6 @@ if(crawl_tally >= 120) return FALSE - var/tickcomp = 0 //moved this out here so we can use it for vehicles - if(config.Tickcomp) - // move_delay -= 1.3 //~added to the tickcomp calculation below - tickcomp = ((1/(world.tick_lag))*1.3) - 1.3 - move_delay = move_delay + tickcomp - if(istype(mob.machine, /obj/machinery)) if(mob.machine.relaymove(mob,direct)) return diff --git a/code/world.dm b/code/world.dm index 477fbe6dc92..16672125621 100644 --- a/code/world.dm +++ b/code/world.dm @@ -56,7 +56,7 @@ var/global/datum/global_init/init = new () cache_lifespan = 0 //stops player uploaded stuff from being kept in the rsc past the current session maxx = WORLD_MIN_SIZE // So that we don't get map-window-popin at boot. DMMS will expand this. maxy = WORLD_MIN_SIZE - fps = 20 + fps = 30 #define RECOMMENDED_VERSION 510 /world/New() diff --git a/config/example/config.txt b/config/example/config.txt index 7a08af7226a..537a1d3cee8 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -305,9 +305,6 @@ ALLOW_HOLIDAYS ##Defines the ticklag for the world. 0.33 (30 FPS) is the normal one, though you can go as low as 0.2 (50 FPS) for low-load servers. TICKLAG 0.33 -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. -#TICKCOMP - ## Uncomment this to activate the five day from character creation timelock on modifying IPC tags #IPC_TIMELOCK_ACTIVE diff --git a/config/ut/config-db.txt b/config/ut/config-db.txt index 1814248ea78..aa69a49aaf3 100644 --- a/config/ut/config-db.txt +++ b/config/ut/config-db.txt @@ -300,9 +300,6 @@ ALLOW_HOLIDAYS ##Defines the ticklag for the world. 0.33 (30 FPS) is the normal one, though you can go as low as 0.2 (50 FPS) for low-load servers. TICKLAG 0.33 -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. -#TICKCOMP - ## Uncomment this to activate the five day from character creation timelock on modifying IPC tags #IPC_TIMELOCK_ACTIVE diff --git a/config/ut/config-nodb.txt b/config/ut/config-nodb.txt index aedc8d38eca..98b11567b4d 100644 --- a/config/ut/config-nodb.txt +++ b/config/ut/config-nodb.txt @@ -300,9 +300,6 @@ ALLOW_HOLIDAYS ##Defines the ticklag for the world. 0.33 (30 FPS) is the normal one, though you can go as low as 0.2 (50 FPS) for low-load servers. TICKLAG 0.33 -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. -#TICKCOMP - ## Uncomment this to activate the five day from character creation timelock on modifying IPC tags #IPC_TIMELOCK_ACTIVE diff --git a/html/changelogs/mattatlas-glide.yml b/html/changelogs/mattatlas-glide.yml new file mode 100644 index 00000000000..04a29d23408 --- /dev/null +++ b/html/changelogs/mattatlas-glide.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Movement should feel smoother."