Merge remote-tracking branch 'upstream/master' into Chomp-Emotes

GainStation13/code/mechanics/fatness.dm

@@ -52,6 +52,9 @@
 	else			//If it's not being hidden
 		fatness = fatness_real //Make their current fatness their real fatness
 
+	if(client?.prefs?.weight_gain_extreme)
+		xwg_resize()
+
 	return TRUE
 
 
@@ -102,11 +105,21 @@
 	fatness_hidden = TRUE
 	fatness_over = hide_amount
 	fatness = fatness_over	//To update a mob's fatness with the new amount to be shown immediately
+	if(client?.prefs?.weight_gain_extreme)
+		xwg_resize()
 
 	return TRUE
 
 /mob/living/carbon/proc/fat_show()				//If something that hides fatness is removed or expires, it'll call this method
 	fatness_hidden = FALSE
 	fatness = fatness_real	//To update a mob's fatness with their real one immediately
+	if(client?.prefs?.weight_gain_extreme)
+		xwg_resize()
 
 	return TRUE
+
+/mob/living/carbon/proc/xwg_resize()
+	var/xwg_size = sqrt(fatness/FATNESS_LEVEL_BLOB)
+	xwg_size = min(xwg_size, RESIZE_MACRO)
+	xwg_size = max(xwg_size, custom_body_size*0.01)
+	resize(xwg_size)

GainStation13/code/modules/client/preferences/preferences.dm

@@ -13,6 +13,8 @@
 	var/weight_gain_magic = FALSE
 	///Weight gain from viruses
 	var/weight_gain_viruses = FALSE
+	///Extreme weight gain
+	var/weight_gain_extreme = FALSE
 
 	///Does the person wish to be involved with non-con weight gain events?
 	var/noncon_weight_gain = FALSE

GainStation13/code/obj/items/minor_items.dm

@@ -143,3 +143,17 @@
 	icon_state = "ballgag"
 	item_state = "ballgag"
 	flags_inv = HIDEFACE
+
+/obj/item/service_sign
+	name = "service sign"
+	desc = "A sign that reads 'closed'"
+	icon = 'GainStation13/icons/obj/service_sign.dmi'
+	icon_state = "sign_closed"
+
+/obj/item/service_sign/attack_self()
+	if(icon_state == "sign_closed")
+		icon_state = "sign_open"
+		desc = "A sign that reads 'open'"
+	else
+		icon_state = "sign_closed"
+		desc = "A sign that reads 'closed'"