diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 67247cdc..9c17a9d3 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -904,7 +904,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Ghosts of Others: [button_name]
"
dat += "
"
- //dat += "FPS: [clientfps]
"
+ dat += "FPS: [clientfps]
"
dat += "Parallax (Fancy Space): "
switch (parallax)
if (PARALLAX_LOW)
@@ -2133,11 +2133,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if (pickedmap)
preferred_map = maplist[pickedmap]
-// if ("clientfps")
-// var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
-// if (!isnull(desiredfps))
-// clientfps = desiredfps
-// parent.fps = desiredfps
+ if ("clientfps")
+ var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
+ if (!isnull(desiredfps))
+ clientfps = desiredfps
+ parent.fps = desiredfps
//Hyperstation Body Size
diff --git a/interface/menu.dm b/interface/menu.dm
index 66d88ef4..1f2ccde8 100644
--- a/interface/menu.dm
+++ b/interface/menu.dm
@@ -74,54 +74,6 @@ GLOBAL_LIST_EMPTY(menulist)
else
winset(C, null, list2params(list("command" = replacetext(verbpath.name, " ", "-"))))
-//Hypestation 13 changes
-
-/datum/verbs/menu/Settings/FPS
- checkbox = CHECKBOX_GROUP
- default = /datum/verbs/menu/Settings/FPS/verb/twentyfiveframes
-
-/datum/verbs/menu/Settings/FPS/verb/twentyframes()
- set name = "Low-End (20) FPS"
- set desc = "&20 fps"
- set category = "Preferences"
- set hidden = 1
- usr.client.prefs.clientfps = 20
- usr.client.prefs.parent.fps = 20
-
-
-/datum/verbs/menu/Settings/FPS/verb/twentyfiveframes()
- set name = "High-End (25) FPS"
- set desc = "&25 fps"
- set category = "Preferences"
- set hidden = 1
- usr.client.prefs.clientfps = 25
- usr.client.prefs.parent.fps = 25
-
-
-/datum/verbs/menu/Settings/FPS/verb/thirtyframes()
- set name = "Higher-End (30) FPS"
- set desc = "&30 fps"
- set category = "Preferences"
- set hidden = 1
- usr.client.prefs.clientfps = 30
- usr.client.prefs.parent.fps = 30
-
-/datum/verbs/menu/Settings/FPS/verb/fortyframes()
- set name = "Very Higher-End (40) FPS"
- set desc = "&40 fps"
- set category = "Preferences"
- set hidden = 1
- usr.client.prefs.clientfps = 40
- usr.client.prefs.parent.fps = 40
-
-
-/datum/verbs/menu/Settings/FPS/verb/sixtyframes()
- set name = "Very Very Higher-End (60) FPS"
- set desc = "&60 fps"
- set category = "Preferences"
- set hidden = 1
- usr.client.prefs.clientfps = 60
- usr.client.prefs.parent.fps = 60
/datum/verbs/menu/Settings/ChatOutput
checkbox = CHECKBOX_GROUP
diff --git a/tgstation.dme b/tgstation.dme
index cf10f10c..ceb253f7 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2903,6 +2903,7 @@
#include "hyperstation\code\obj\pregnancytester.dm"
#include "hyperstation\code\obj\rewards.dm"
#include "hyperstation\code\obj\rope.dm"
+#include "hyperstation\code\obj\transferconsole.dm"
#include "interface\interface.dm"
#include "interface\menu.dm"
#include "interface\stylesheet.dm"