diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm
index 311af660..7a968916 100644
--- a/GainStation13/code/modules/client/preferences/preferences.dm
+++ b/GainStation13/code/modules/client/preferences/preferences.dm
@@ -19,10 +19,8 @@
var/blueberry_inflation = FALSE
///Extreme weight gain
var/weight_gain_extreme = FALSE
- /// At what weight will you start to get stuck in airlocks?
+ ///stuckage
var/stuckage = FALSE
- /// At what weight will you start to break chairs?
- var/chair_breakage = FALSE
// Helplessness, a set of prefs that make things extra tough at higher weights. If set to FALSE, they won't do anything.
///What fatness level disables movement?
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 7719b4c4..c449eeed 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -12,11 +12,7 @@
if(!istype(L))
return ..()
- var/stuckage_weight = L?.client?.prefs?.stuckage
- if(!stuckage_weight)
- return ..() // They aren't able to get stuck
-
- if(L.fatness > (stuckage_weight * 2))
+ if(L.fatness > 5000 && L.client?.prefs?.stuckage)
if(rand(1, 3) == 1)
L.doorstuck = 1
L.visible_message("[L] gets stuck in the doorway!")
@@ -26,7 +22,7 @@
L.Knockdown(1)
return ..()
- else if(L.fatness > stuckage_weight)
+ else if(L.fatness > 3000 && L.client?.prefs?.stuckage)
if(rand(1, 5) == 1)
L.doorstuck = 1
L.visible_message("[L] gets stuck in the doorway!")
@@ -39,13 +35,13 @@
to_chat(L, "With great effort, you manage to squeeze your massive form through \the [src]. It's a tight fit, but you successfully navigate the narrow opening, barely avoiding getting stuck.")
return ..()
- else if(L.fatness > (stuckage_weight / 2))
+ else if(L.fatness > 1890 && L.client?.prefs?.stuckage)
if(rand(1, 5) == 1)
L.visible_message("[L]'s hips brush against the doorway...")
to_chat(L, "As you pass through \the [src], you feel a slight brushing against your hips. The [src] frame accommodates your form, but it's a close fit..")
return ..()
-
- return ..()
+ else
+ return ..()
/obj/machinery/door/airlock/abandoned
abandoned = TRUE
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index f35443e3..f45755bb 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -113,40 +113,34 @@
add_fingerprint(user)
. = buckle_mob(M, check_loc = check_loc)
- if(!.)
- return
-
- var/breaking_weight = M?.client?.prefs?.chair_breakage
- if(!breaking_weight || (M != user) || ((breaking_weight / 3) > M.fatness))
- M.visible_message(\
- "[user] buckles [M] to [src]!",\
- "[user] buckles you to [src]!",\
- "You hear metal clanking.")
- return
-
- if ((M.fatness >= breaking_weight) && istype(src, /obj/structure/chair)) //GS13 stuff - chair breaking mechanics
- M.visible_message(\
- "[M] slowly buckles [M.p_them()]self to [src]. their movements slow and deliberate. As [M] settles into the seat, a sudden, violent crash echoes through the air. [M]'s massive weight mercilessly crushes the poor [src], reducing it to pieces! ",\
- "You slowly try to buckle yourself to [src]. But it breaks under your massive ass!",\
- "You hear metal clanking.")
- playsound(loc, 'sound/effects/snap.ogg', 50, 1)
- playsound(loc, 'sound/effects/woodhit.ogg', 50, 1)
- playsound(loc, 'sound/effects/bodyfall4.ogg', 50, 1)
- // Destroy the src object
- src.Destroy()
- else if(M.fatness >= (breaking_weight / 2))
- M.visible_message(\
- "[M] buckles [M.p_them()]self to the creaking [src]. The [src] protests audibly under the weight as [M]'s ample form settles onto its surface. .",\
- "You buckle yourself to [src].The [src] is cracking and is barely able to hold your weight ",\
- "You hear metal clanking.")
- playsound(loc, 'sound/effects/crossed.ogg', 50, 1)
- else if(M.fatness >= (breaking_weight / 3))
- M.visible_message(\
- "[M] buckles [M.p_them()]self to the creaking [src] as their weight spreads all over it.",\
- "You buckle yourself to [src].The [src] is creaking as you shuffle a bit ",\
- "You hear metal clanking.")
- playsound(loc, 'sound/effects/crossed.ogg', 50, 1)
-
+ if(.)
+ if (M == user && M.fatness >= 3440 && istype(src, /obj/structure/chair)) //GS13 stuff - chair breaking mechanics
+ M.visible_message(\
+ "[M] slowly buckles [M.p_them()]self to [src]. their movements slow and deliberate. As [M] settles into the seat, a sudden, violent crash echoes through the air. [M]'s massive weight mercilessly crushes the poor [src], reducing it to pieces! ",\
+ "You slowly try to buckle yourself to [src]. But it breaks under your massive ass!",\
+ "You hear metal clanking.")
+ playsound(loc, 'sound/effects/snap.ogg', 50, 1)
+ playsound(loc, 'sound/effects/woodhit.ogg', 50, 1)
+ playsound(loc, 'sound/effects/bodyfall4.ogg', 50, 1)
+ // Destroy the src object
+ src.Destroy()
+ else if(M == user && M.fatness >= 1840)
+ M.visible_message(\
+ "[M] buckles [M.p_them()]self to the creaking [src]. The [src] protests audibly under the weight as [M]'s ample form settles onto its surface. .",\
+ "You buckle yourself to [src].The [src] is cracking and is barely able to hold your weight ",\
+ "You hear metal clanking.")
+ playsound(loc, 'sound/effects/crossed.ogg', 50, 1)
+ else if(M == user && M.fatness >= 840)
+ M.visible_message(\
+ "[M] buckles [M.p_them()]self to the creaking [src] as their weight spreads all over it.",\
+ "You buckle yourself to [src].The [src] is creaking as you shuffle a bit ",\
+ "You hear metal clanking.")
+ playsound(loc, 'sound/effects/crossed.ogg', 50, 1)
+ else
+ M.visible_message(\
+ "[user] buckles [M] to [src]!",\
+ "[user] buckles you to [src]!",\
+ "You hear metal clanking.")
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
var/mob/living/M = unbuckle_mob(buckled_mob)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 8c91d27d..eeeb311e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1069,8 +1069,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Blueberry Inflation:[blueberry_inflation == TRUE ? "Enabled" : "Disabled"]
"
dat += "