Merge remote-tracking branch 'upstream/master'

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -34,7 +34,7 @@
 	display_name = "wallet, polychromic"
 	path = /obj/item/weapon/storage/wallet/poly
 	cost = 0 //VOREStation Edit
-	
+
 
 /datum/gear/accessory/wallet/womens
 	display_name = "wallet, womens"
@@ -209,6 +209,8 @@
 	..()
 	var/list/sweaters = list()
 	for(var/sweater in typesof(/obj/item/clothing/accessory/sweater))
+		if(sweater in typesof(/obj/item/clothing/accessory/sweater/fluff))	//VOREStation addition
+			continue														//VOREStation addition
 		var/obj/item/clothing/suit/sweater_type = sweater
 		sweaters[initial(sweater_type.name)] = sweater_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))

code/modules/client/preference_setup/loadout/loadout_smoking.dm

@@ -27,6 +27,8 @@
 	..()
 	var/list/zippos = list()
 	for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo))
+		if(zippo in typesof(/obj/item/weapon/flame/lighter/zippo/fluff))	//VOREStation addition
+			continue														//VOREStation addition
 		var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo
 		zippos[initial(zippo_type.name)] = zippo_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos))

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -106,6 +106,8 @@ datum/gear/suit/duster
 	..()
 	var/list/hazards = list()
 	for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest))
+		if(hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest/fluff))	//VOREStation addition
+			continue																	//VOREStation addition
 		var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style
 		hazards[initial(hazardvest.name)] = hazardvest
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards))

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -65,6 +65,8 @@
 	..()
 	var/list/skirts = list()
 	for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
+		if(skirt in typesof(/obj/item/clothing/under/skirt/fluff))	//VOREStation addition
+			continue												//VOREStation addition
 		var/obj/item/clothing/under/skirt/skirt_type = skirt
 		skirts[initial(skirt_type.name)] = skirt_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts))
@@ -223,6 +225,8 @@
 	..()
 	var/list/msuits = list()
 	for(var/msuit in typesof(/obj/item/clothing/under/suit_jacket))
+		if(msuit in typesof(/obj/item/clothing/under/suit_jacket/female/fluff))	//VOREStation addition
+			continue															//VOREStation addition
 		var/obj/item/clothing/suit/msuit_type = msuit
 		msuits[initial(msuit_type.name)] = msuit_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(msuits))

code/modules/client/preference_setup/loadout/loadout_utility.dm

@@ -123,7 +123,7 @@
 	display_name = "implant, tracking"
 	path = /obj/item/weapon/implant/tracking/weak
 	cost = 0 //VOREStation Edit. Changed cost to 0
-/* VOREStation Edit - Make languages great again
+
 /datum/gear/utility/implant/language
 	cost = 2
 	exploitable = 0
@@ -137,7 +137,7 @@
 	display_name = "vocal synthesizer, Skrellian"
 	description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it."
 	path = /obj/item/weapon/implant/language/skrellian
-*/
+
 /datum/gear/utility/pen
 	display_name = "Fountain Pen"
 	path = /obj/item/weapon/pen/fountain

code/modules/client/preference_setup/vore/02_size.dm

@@ -46,6 +46,7 @@
 	character.weight_loss		= pref.weight_loss
 	character.fuzzy				= pref.fuzzy
 	character.appearance_flags	-= pref.fuzzy*PIXEL_SCALE
+	character.appearance_flags	|= KEEP_TOGETHER
 	character.resize(pref.size_multiplier, animate = FALSE)
 
 /datum/category_item/player_setup_item/vore/size/content(var/mob/user)