Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin

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

@@ -135,6 +135,12 @@ 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/mob_tooltips
 	description ="Mob tooltips"
 	key = "MOB_TOOLTIPS"

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

@@ -0,0 +1,14 @@
+/datum/gear_tweak/collar_tag/get_contents(var/metadata)
+	return "Tag: [metadata]"
+
+/datum/gear_tweak/collar_tag/get_default()
+	return ""
+
+/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata)
+	return sanitize( input(user, "Choose the tag text", "Character Preference", metadata) as text , MAX_NAME_LEN )
+
+/datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata)
+	if(metadata == "")
+		return
+	else
+		C.initialize_tag(metadata)

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

@@ -271,4 +271,7 @@ var/list/gear_datums = list()
 	var/item = new gd.path(gd.location)
 	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.
+		M.amend_exploitable(item)
 	return item

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

@@ -6,6 +6,10 @@
 	slot = slot_tie
 	sort_category = "Accessories"
 
+/datum/gear/collar/New()
+	..()
+	gear_tweaks = list(gear_tweak_collar_tag)
+
 /datum/gear/collar/golden
 	display_name = "collar, golden"
 	path = /obj/item/clothing/accessory/collar/gold

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

@@ -34,6 +34,12 @@
 	ckeywhitelist = list("aegisoa")
 	character_name = list("Xander Bevin")
 
+/datum/gear/fluff/xander_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Xander's Conduct Medal"
+	ckeywhitelist = list("aegisoa")
+	character_name = list("Xander Bevin")
+
 /datum/gear/fluff/lynn_penlight
 	path = /obj/item/device/flashlight/pen/fluff/lynn
 	display_name = "Lynn's Penlight"
@@ -85,6 +91,12 @@
 	ckeywhitelist = list("beyondmylife")
 	character_name = list("Ne'tra Ky'ram")
 
+/datum/gear/fluff/nolan_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Nolan's Unity Medal"
+	ckeywhitelist = list("blakeryan")
+	character_name = list("Nolan Conaway")
+
 /datum/gear/fluff/xin_sovietuniform
 	path = /obj/item/clothing/under/soviet
 	display_name = "Xin's Soviet Uniform"
@@ -98,6 +110,24 @@
 	ckeywhitelist = list("bwoincognito")
 	character_name = list("Tasald Corlethian")
 
+/datum/gear/fluff/tasald_cartographer_jumpsuit
+	path = /obj/item/clothing/under/solgov/utility/sifguard/officer/exploration
+	display_name = "Tasald's Cartographer's uniform - jumpsuit"
+	ckeywhitelist = list("bwoincognito")
+	character_name = list("Tasald Corlethian")
+
+/datum/gear/fluff/tasald_cartographer_jacket
+	path = /obj/item/clothing/suit/storage/service/sifguard/command
+	display_name = "Tasald's Cartographer's uniform - jacket"
+	ckeywhitelist = list("bwoincognito")
+	character_name = list("Tasald Corlethian")
+
+/datum/gear/fluff/tasald_cartographer_beret
+	path = /obj/item/clothing/head/beret/sol/expedition/command
+	display_name = "Tasald's Cartographer's uniform - beret"
+	ckeywhitelist = list("bwoincognito")
+	character_name = list("Tasald Corlethian")
+
 /datum/gear/fluff/octavius_box
 	path = /obj/item/weapon/storage/box/fluff/octavious
 	display_name = "Octavious' Box"
@@ -210,6 +240,12 @@
 	ckeywhitelist = list("epigraphzero")
 	character_name = list("Verd Woodrow")
 
+/datum/gear/fluff/erik_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Erik's Unity Medal"
+	ckeywhitelist = list("erikthedog")
+	character_name = list("Erik Ramadwood")
+
 //  F CKEYS
 
 //  G CKEYS
@@ -708,6 +744,12 @@
 	ckeywhitelist = list("techtypes")
 	character_name = list("Lasshseeki Korss")
 
+/datum/gear/fluff/nick_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Nick's Conduct Medal"
+	ckeywhitelist = list("thedavestdave")
+	character_name = list("Nick Sloan")
+
 /datum/gear/fluff/konor_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
 	display_name = "Konor's Unity Medal"
@@ -897,3 +939,9 @@
 	display_name = "Nehi's Radio"
 	ckeywhitelist = list("zodiacshadow")
 	character_name = list("Nehi Maximus")
+
+/datum/gear/fluff/star_sweater
+	path = /obj/item/clothing/accessory/sweater/fluff/star
+	display_name = "Star Sweater"
+	ckeywhitelist = list("bacon12366")
+	character_name = list("Elly Brown")

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

@@ -127,7 +127,7 @@
 /datum/gear/utility/implant/neural
 	display_name = "implant, neural assistance web"
 	description = "A complex web implanted into the subject, medically in order to compensate for neurological disease."
-	path = /obj/item/weapon/implant/neural/roundstart
+	path = /obj/item/weapon/implant/neural
 	cost = 6
 
 /datum/gear/utility/implant/dud1