diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm
new file mode 100644
index 00000000..1362084c
--- /dev/null
+++ b/GainStation13/code/modules/mob/living/emote.dm
@@ -0,0 +1,20 @@
+
+/datum/emote/living/gurgle
+ key = "gurgle"
+ key_third_person = "gurgles"
+ message = "'s belly gurgles"
+ emote_type = EMOTE_AUDIBLE
+
+
+/datum/emote/living/gurgle/run_emote(mob/living/user, params)
+ if(ishuman(user))
+ if(prob(50))
+ playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1)
+ else
+ playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1)
+ . = ..()
+
+/datum/emote/living/burp/run_emote(mob/living/user, params)
+ if(ishuman(user))
+ playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1)
+ . = ..()
diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm
index 3a233cac..65865a4d 100644
--- a/GainStation13/code/modules/vending/mealdor.dm
+++ b/GainStation13/code/modules/vending/mealdor.dm
@@ -11,7 +11,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/birthday = 10,
/obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice = 10,
/obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 5,
- /obj/item/reagent_containers/food/snacks/donut/purefat = 10,
+// /obj/item/reagent_containers/food/snacks/donut/purefat = 10,
/obj/item/reagent_containers/food/snacks/fries = 8,
/obj/item/reagent_containers/food/snacks/donut = 5,
/obj/item/reagent_containers/food/snacks/candiedapple = 2,
diff --git a/GainStation13/sound/voice/burp1.ogg b/GainStation13/sound/voice/burp1.ogg
new file mode 100644
index 00000000..d0653f06
Binary files /dev/null and b/GainStation13/sound/voice/burp1.ogg differ
diff --git a/GainStation13/sound/voice/gurgle1.ogg b/GainStation13/sound/voice/gurgle1.ogg
new file mode 100644
index 00000000..2007b68f
Binary files /dev/null and b/GainStation13/sound/voice/gurgle1.ogg differ
diff --git a/GainStation13/sound/voice/gurgle2.ogg b/GainStation13/sound/voice/gurgle2.ogg
new file mode 100644
index 00000000..3b4ee55f
Binary files /dev/null and b/GainStation13/sound/voice/gurgle2.ogg differ
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 0db1cde1..2c4ca7a4 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -173,6 +173,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if (clientfps == 0) clientfps = world.fps*2
body_size = sanitize_integer(body_size, 90, 110, 0)
can_get_preg = sanitize_integer(can_get_preg, 0, 1, 0)
+ starting_weight = sanitize_integer(starting_weight, 0, 2000, 0)
parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
auto_fit_viewport = sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
@@ -321,6 +322,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["gender"] >> gender
S["age"] >> age
S["body_size"] >> body_size
+ S["starting_weight"] >> starting_weight
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
S["eye_color"] >> eye_color
@@ -395,6 +397,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_mcolor3"] >> features["mcolor3"]
S["feature_mam_body_markings"] >> features["mam_body_markings"]
S["body_size"] >> features["body_size"]
+ S["starting_weight"] >> features["starting_weight"]
S["feature_mam_tail"] >> features["mam_tail"]
S["feature_mam_ears"] >> features["mam_ears"]
S["feature_mam_tail_animated"] >> features["mam_tail_animated"]
@@ -586,6 +589,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["facial_style_name"] , facial_hair_style)
WRITE_FILE(S["underwear"] , underwear)
WRITE_FILE(S["body_size"] , body_size)
+ WRITE_FILE(S["starting_weight"] , starting_weight)
WRITE_FILE(S["undie_color"] , undie_color)
WRITE_FILE(S["undershirt"] , undershirt)
WRITE_FILE(S["shirt_color"] , shirt_color)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index a38f58ab..dfafc218 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -6,6 +6,7 @@
/obj/vehicle/ridden/scooter/Initialize()
. = ..()
var/datum/component/riding/D = LoadComponent(/datum/component/riding)
+ D.vehicle_move_delay = 1.5
D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0), TEXT_SOUTH = list(-2), TEXT_EAST = list(0), TEXT_WEST = list( 2)))
@@ -49,7 +50,7 @@
/obj/vehicle/ridden/scooter/skateboard/Initialize()
. = ..()
var/datum/component/riding/D = LoadComponent(/datum/component/riding)
- D.vehicle_move_delay = 2
+ D.vehicle_move_delay = 1
D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER)
D.set_vehicle_dir_layer(NORTH, OBJ_LAYER)
D.set_vehicle_dir_layer(EAST, OBJ_LAYER)
@@ -97,11 +98,11 @@
. = ..()
var/datum/component/riding/R = src.GetComponent(/datum/component/riding)
if (!adjusted_speed)
- R.vehicle_move_delay = 2
+ R.vehicle_move_delay = 0.5
to_chat(user, "You adjust the wheels on [src] to make it go faster.")
adjusted_speed = TRUE
else
- R.vehicle_move_delay = 2.5
+ R.vehicle_move_delay = 1
to_chat(user, "You adjust the wheels on [src] to make it go slower.")
adjusted_speed = FALSE
return TRUE
@@ -177,7 +178,7 @@
/obj/vehicle/ridden/scooter/wheelys/Initialize()
. = ..()
var/datum/component/riding/D = LoadComponent(/datum/component/riding)
- D.vehicle_move_delay = 2.5
+ D.vehicle_move_delay = 2
D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER)
D.set_vehicle_dir_layer(NORTH, OBJ_LAYER)
D.set_vehicle_dir_layer(EAST, OBJ_LAYER)
diff --git a/tgstation.dme b/tgstation.dme
index c5b958a8..9debda01 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,7 +14,7 @@
// BEGIN_INCLUDE
#include "_maps\_basemap.dm"
-#include "_maps\layeniastation.dm"
+#include "_maps\metastation.dm"
#include "_maps\map_files\generic\CentCom.dmm"
#include "code\_compile_options.dm"
#include "code\world.dm"
@@ -3065,6 +3065,7 @@
#include "code\modules\VR\vr_sleeper.dm"
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
+#include "GainStation13\code\modules\mob\living\emote.dm"
#include "GainStation13\code\modules\vending\mealdor.dm"
#include "hyperstation\code\__DEFINES\economy.dm"
#include "hyperstation\code\__DEFINES\wendigo.dm"