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'"

code/game/objects/effects/spiders.dm

@@ -41,6 +41,9 @@
 	else if(isliving(mover))
 		if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider))
 			return TRUE
+		if(mover.pulledby)
+			if(HAS_TRAIT(mover.pulledby, TRAIT_WEB_WEAVER))
+				return TRUE
 		if(prob(50))
 			to_chat(mover, "<span class='danger'>You get stuck in \the [src] for a moment.</span>")
 			return FALSE

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -483,6 +483,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
 	new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
 	new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
+	null, \
+	new/datum/stack_recipe("open/closed sign", /obj/item/service_sign), \
 	))
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap //it's cardboard you fuck

code/modules/client/preferences.dm

@@ -1059,6 +1059,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Weight Gain - Weapons:</b><a href='?_src_=prefs;preference=weight_gain_weapons'>[weight_gain_weapons == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 			dat += "<b>Weight Gain - Magic:</b><a href='?_src_=prefs;preference=weight_gain_magic'>[weight_gain_magic == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 			dat += "<b>Weight Gain - Viruses:</b><a href='?_src_=prefs;preference=weight_gain_viruses'>[weight_gain_viruses == TRUE ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "<b>Extreme Weight Gain:</b><a href='?_src_=prefs;preference=weight_gain_extreme'>[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 
 			//Add the Hyper stuff below here
 			dat += "<h2>Hyper Preferences</h2>"
@@ -2623,6 +2624,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					weight_gain_magic = !weight_gain_magic
 				if("weight_gain_viruses")
 					weight_gain_viruses = !weight_gain_viruses
+				if("weight_gain_extreme")
+					weight_gain_extreme = !weight_gain_extreme
 				if("noncon_weight_gain")
 					noncon_weight_gain = !noncon_weight_gain
 				if("max_fatness")

code/modules/client/preferences_savefile.dm

@@ -153,6 +153,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["weight_gain_magic"] >> weight_gain_magic
 	S["weight_gain_viruses"] >> weight_gain_viruses
 	S["weight_gain_weapons"] >> weight_gain_weapons
+	S["weight_gain_extreme"] >> weight_gain_extreme
 	S["wg_rate"] >> wg_rate
 	S["wl_rate"] >> wl_rate
 	S["noncon_weight_gain"] >> noncon_weight_gain
@@ -292,6 +293,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["weight_gain_viruses"], weight_gain_viruses)
 	WRITE_FILE(S["weight_gain_chems"], weight_gain_chems)
 	WRITE_FILE(S["weight_gain_weapons"], weight_gain_weapons)
+	WRITE_FILE(S["weight_gain_extreme"], weight_gain_extreme)
 	WRITE_FILE(S["wg_rate"], wg_rate)
 	WRITE_FILE(S["wl_rate"], wl_rate)
 	WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain)

hyperstation/code/modules/clothing/sizeaccessories.dm

@@ -83,6 +83,7 @@
 	icon = 'hyperstation/icons/obj/clothing/sizeaccessories.dmi'
 	icon_state = "pendant"
 	item_state = "pendant"
+	w_class = WEIGHT_CLASS_SMALL //Gainstation Edit: Small, not normal sized. 
 
 //For neck items
 /obj/item/clothing/neck/syntech/equipped(mob/living/user, slot)