Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

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

@@ -77,6 +77,12 @@
 	display_name = "drop pouches, white (Medical)"
 	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
 
+/datum/gear/accessory/bluespace
+	display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)"
+	path = /obj/item/clothing/accessory/storage/bluespace
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner")
+	cost = 2
+
 /datum/gear/accessory/webbing
 	cost = 1
 

code/modules/client/preference_setup/traits/trait_defines.dm

@@ -23,7 +23,12 @@
 
 // Physical traits are what they sound like, and involve the character's physical body, as opposed to their mental state.
 /datum/trait/modifier/physical
+<<<<<<< HEAD
 	category = "Physical Quirks" //VOREStation Edit
+=======
+	name = "Physical"
+	category = "Physical"
+>>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
 
 
 /datum/trait/modifier/physical/flimsy
@@ -194,6 +199,7 @@
 // 'Mental' traits are just those that only sapients can have, for now, and generally involves fears.
 // So far, all of them are just for fluff/don't have mechanical effects.
 /datum/trait/modifier/mental
+	name = "Mental"
 	category = "Mental"
 
 /datum/trait/modifier/mental/test_for_invalidity(var/datum/category_item/player_setup_item/traits/setup)

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

@@ -45,7 +45,6 @@
 	character.weight_gain		= pref.weight_gain
 	character.weight_loss		= pref.weight_loss
 	character.fuzzy				= pref.fuzzy
-	character.appearance_flags	-= pref.fuzzy*PIXEL_SCALE
 	character.resize(pref.size_multiplier, animate = FALSE)
 
 /datum/category_item/player_setup_item/vore/size/content(var/mob/user)
@@ -70,7 +69,7 @@
 
 	else if(href_list["toggle_fuzzy"])
 		pref.fuzzy = pref.fuzzy ? 0 : 1;
-		return TOPIC_REFRESH
+		return TOPIC_REFRESH_UPDATE_PREVIEW
 
 	else if(href_list["weight"])
 		var/new_weight = input(user, "Choose your character's relative body weight.\n\

code/modules/client/preference_setup/vore/07_traits.dm

@@ -286,6 +286,9 @@
 				pref.gross_meatbag = 0	//Just to be sure
 				return TOPIC_REFRESH
 
+			if(pref.species in instance.banned_species)
+				alert("The trait you've selected cannot be taken by the species you've chosen!","Error")
+				return TOPIC_REFRESH
 
 			if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits)
 				conflict = instance.name