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

# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme

code/modules/client/preference_setup/general/04_equipment.dm

@@ -42,7 +42,7 @@
 		pref.backbag = 1 //Same as above
 	character.backbag = pref.backbag
 
-	if(pref.pdachoice > 4 || pref.pdachoice < 1)
+	if(pref.pdachoice > 5 || pref.pdachoice < 1)
 		pref.pdachoice = 1
 	character.pdachoice = pref.pdachoice
 

code/modules/client/preference_setup/global/setting_datums.dm

@@ -135,11 +135,11 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
-/datum/client_preference/air_pump_noise 
-	description ="Air Pump Ambient Noise" 
-	key = "SOUND_AIRPUMP" 
-	enabled_description = "Audible" 
-	disabled_description = "Silent" 
+/datum/client_preference/air_pump_noise
+	description ="Air Pump Ambient Noise"
+	key = "SOUND_AIRPUMP"
+	enabled_description = "Audible"
+	disabled_description = "Silent"
 
 /datum/client_preference/mob_tooltips
 	description ="Mob tooltips"
@@ -153,6 +153,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
+/datum/client_preference/precision_placement
+	description ="Precision Placement"
+	key = "PRECISE_PLACEMENT"
+	enabled_description = "Active"
+	disabled_description = "Inactive"
+
 /datum/client_preference/hotkeys_default
 	description ="Hotkeys Default"
 	key = "HUD_HOTKEYS"

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

@@ -272,12 +272,12 @@ var/list/gear_datums = list()
 
 /datum/gear/proc/spawn_item(var/location, var/metadata)
 	var/datum/gear_data/gd = new(path, location)
-	for(var/datum/gear_tweak/gt in gear_tweaks)
-		if(gear_tweaks.len)
+	if(length(gear_tweaks) && metadata)
+		for(var/datum/gear_tweak/gt in gear_tweaks)
 			gt.tweak_gear_data(metadata["[gt]"], gd)
 	var/item = new gd.path(gd.location)
-	for(var/datum/gear_tweak/gt in gear_tweaks)
-		if(gear_tweaks.len)
+	if(length(gear_tweaks) && metadata)
+		for(var/datum/gear_tweak/gt in gear_tweaks)
 			gt.tweak_item(item, metadata["[gt]"])
 	var/mob/M = location
 	if(istype(M) && exploitable) //Update exploitable info records for the mob without creating a duplicate object at their feet.

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

@@ -467,6 +467,12 @@
 	ckeywhitelist = list("killerdragn")
 	character_name = list("Excess")
 
+/datum/gear/fluff/excess_uniform
+	path = /obj/item/clothing/under/fluff/excess
+	display_name = "Excess's Uniform"
+	ckeywhitelist = list("killerdragn")
+	character_name = list("Excess")
+
 /datum/gear/fluff/lassara_sheath
 	path = /obj/item/clothing/accessory/storage/knifeharness
 	display_name = "Lassara's Knife Harness"
@@ -593,6 +599,12 @@
 	ckeywhitelist = list("phoaly")
 	character_name = list("Lily Maximus")
 
+/datum/gear/fluff/pip_cloak
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip
+	display_name = "Pip's Cloak"
+	ckeywhitelist = list("phoaly")
+	character_name = list("Pip Shyner")
+
 /datum/gear/fluff/lucuis_battery
 	path = /obj/item/weapon/fluff/dragor_dot
 	display_name = "Lucuis' Spare Battery"

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

@@ -6,6 +6,14 @@
 	display_name = "white cane"
 	path = /obj/item/weapon/cane/whitecane
 
+/datum/gear/cane/white2
+	display_name = "telescopic white cane"
+	path = /obj/item/weapon/melee/collapsable_whitecane
+
+/datum/gear/crutch
+	display_name = "crutch"
+	path = /obj/item/weapon/cane/crutch
+
 /datum/gear/dice
 	display_name = "dice pack"
 	path = /obj/item/weapon/storage/pill_bottle/dice

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

@@ -8,4 +8,10 @@
 
 /datum/gear/head/headbando/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+//Detective alternative
+/datum/gear/head/detective_alt
+	display_name = "cyberscope headgear, detective"
+	path = /obj/item/clothing/head/helmet/detective_alt
+	allowed_roles = list("Head of Security", "Detective")

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

@@ -190,6 +190,11 @@ datum/gear/suit/duster
 		ponchos[initial(poncho.name)] = poncho
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
 
+/datum/gear/suit/roles/poncho
+	display_name = "poncho, cargo"
+	path = /obj/item/clothing/accessory/poncho/roles/cargo
+	cost = 1
+
 /datum/gear/suit/roles/poncho/security
 	display_name = "poncho, security"
 	path = /obj/item/clothing/accessory/poncho/roles/security
@@ -206,10 +211,6 @@ datum/gear/suit/duster
 	display_name = "poncho, science"
 	path = /obj/item/clothing/accessory/poncho/roles/science
 
-/datum/gear/suit/roles/poncho/cargo
-	display_name = "poncho, cargo"
-	path = /obj/item/clothing/accessory/poncho/roles/cargo
-
 /datum/gear/suit/roles/poncho/cloak/hos
 	display_name = "cloak, head of security"
 	path = /obj/item/clothing/accessory/poncho/roles/cloak/hos

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

@@ -172,4 +172,10 @@ Swimsuits
 
 /datum/gear/uniform/suit/v_nanovest
 	display_name = "Varmacorp nanovest"
-	path = /obj/item/clothing/under/fluff/v_nanovest
+	path = /obj/item/clothing/under/fluff/v_nanovest
+
+//Detective alternative
+/datum/gear/uniform/detective_alt
+	display_name = "sleek modern coat, detective"
+	path = /obj/item/clothing/under/detective_alt
+	allowed_roles = list("Head of Security", "Detective")