Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	config/custom_items.txt

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

@@ -33,10 +33,13 @@
 /datum/gear/accessory/wallet_poly
 	display_name = "wallet, polychromic"
 	path = /obj/item/weapon/storage/wallet/poly
+	cost = 0 //VOREStation Edit
+	
 
 /datum/gear/accessory/wallet/womens
 	display_name = "wallet, womens"
 	path = /obj/item/weapon/storage/wallet/womens
+	cost = 0 //VOREStation Edit
 
 /datum/gear/accessory/wallet/womens/New()
 	..()

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

@@ -50,6 +50,11 @@
     path = /obj/item/weapon/storage/backpack/saddlebag_common/robust
     slot = slot_back
 
+/datum/gear/accessory/saddlebag_common/vest
+    display_name = "Taur Duty Vest (backpack)"
+    path = /obj/item/weapon/storage/backpack/saddlebag_common/vest
+    slot = slot_back
+
 /datum/gear/accessory/khcrystal
 	display_name = "KH Life Crystal"
 	path = /obj/item/weapon/storage/box/khcrystal

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

@@ -5,3 +5,11 @@
 /datum/gear/eyes/arglassespres
 	display_name = "AR glasses, prescription"
 	path = /obj/item/clothing/glasses/omnihud/prescription
+
+/datum/gear/eyes/spiffygogs
+	display_name = "Slick orange goggles"
+	path = /obj/item/clothing/glasses/fluff/spiffygogs
+
+/datum/gear/eyes/science_proper
+	display_name = "Science goggles (no overlay)"
+	path = /obj/item/clothing/glasses/fluff/science_proper

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

@@ -94,7 +94,7 @@
 /datum/gear/utility/implant/tracking
 	display_name = "implant, tracking"
 	path = /obj/item/weapon/implant/tracking/weak
-	cost = 10
+	cost = 0 //VOREStation Edit. Changed cost to 0
 	slot = "implant"
 	exploitable = 1
 

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

@@ -9,8 +9,9 @@
 	var/size_multiplier = RESIZE_NORMAL
 	// Body weight stuff.
 	var/weight_vr = 137		// bodyweight of character (pounds, because I'm not doing the math again -Spades)
-	var/weight_gain = 100	// bodyweight of character (pounds, because I'm not doing the math again -Spades)
-	var/weight_loss = 50	// bodyweight of character (pounds, because I'm not doing the math again -Spades)
+	var/weight_gain = 100	// Weight gain rate.
+	var/weight_loss = 50	// Weight loss rate.
+	var/fuzzy = 1			// Preference toggle for sharp/fuzzy icon. Default sharp.
 
 // Definition of the stuff for Sizing
 /datum/category_item/player_setup_item/vore/size
@@ -22,28 +23,34 @@
 	S["weight_vr"]			>> pref.weight_vr
 	S["weight_gain"]		>> pref.weight_gain
 	S["weight_loss"]		>> pref.weight_loss
+	S["fuzzy"]				>> pref.fuzzy
 
 /datum/category_item/player_setup_item/vore/size/save_character(var/savefile/S)
 	S["size_multiplier"]	<< pref.size_multiplier
 	S["weight_vr"]			<< pref.weight_vr
 	S["weight_gain"]		<< pref.weight_gain
 	S["weight_loss"]		<< pref.weight_loss
+	S["fuzzy"]				<< pref.fuzzy
 
 /datum/category_item/player_setup_item/vore/size/sanitize_character()
 	pref.size_multiplier	= pref.size_multiplier
-	pref.weight_vr		= sanitize_integer(pref.weight_vr, WEIGHT_MIN, WEIGHT_MAX, initial(pref.weight_vr))
-	pref.weight_gain	= sanitize_integer(pref.weight_gain, WEIGHT_CHANGE_MIN, WEIGHT_CHANGE_MAX, initial(pref.weight_gain))
-	pref.weight_loss	= sanitize_integer(pref.weight_loss, WEIGHT_CHANGE_MIN, WEIGHT_CHANGE_MAX, initial(pref.weight_loss))
+	pref.weight_vr			= sanitize_integer(pref.weight_vr, WEIGHT_MIN, WEIGHT_MAX, initial(pref.weight_vr))
+	pref.weight_gain		= sanitize_integer(pref.weight_gain, WEIGHT_CHANGE_MIN, WEIGHT_CHANGE_MAX, initial(pref.weight_gain))
+	pref.weight_loss		= sanitize_integer(pref.weight_loss, WEIGHT_CHANGE_MIN, WEIGHT_CHANGE_MAX, initial(pref.weight_loss))
+	pref.fuzzy				= pref.fuzzy
 
 /datum/category_item/player_setup_item/vore/size/copy_to_mob(var/mob/living/carbon/human/character)
 	character.resize(pref.size_multiplier, FALSE)
 	character.weight			= pref.weight_vr
 	character.weight_gain		= pref.weight_gain
 	character.weight_loss		= pref.weight_loss
+	character.fuzzy				= pref.fuzzy
+	character.appearance_flags	|= pref.fuzzy*PIXEL_SCALE
 
 /datum/category_item/player_setup_item/vore/size/content(var/mob/user)
 	. += "<br>"
 	. += "<b>Scale:</b> <a href='?src=\ref[src];size_multiplier=1'>[round(pref.size_multiplier*100)]%</a><br>"
+	. += "<b>Scaled Appearance:</b> <a [pref.fuzzy ? "" : ""] href='?src=\ref[src];toggle_fuzzy=1'><b>[pref.fuzzy ? "Sharp" : "Fuzzy"]</b></a><br>"
 	. += "<br>"
 	. += "<b>Relative Weight:</b>  <a href='?src=\ref[src];weight=1'>[pref.weight_vr]</a><br>"
 	. += "<b>Weight Gain Rate:</b> <a href='?src=\ref[src];weight_gain=1'>[pref.weight_gain]</a><br>"
@@ -60,6 +67,10 @@
 			pref.size_multiplier = (new_size/100)
 			return TOPIC_REFRESH_UPDATE_PREVIEW
 
+	else if(href_list["toggle_fuzzy"])
+		pref.fuzzy = pref.fuzzy ? 0 : 1;
+		return TOPIC_REFRESH
+
 	else if(href_list["weight"])
 		var/new_weight = input(user, "Choose your character's relative body weight.\n\
 			This measurement should be set relative to a normal 5'10'' person's body and not the actual size of your character.\n\