Merge branch 'master' into master

code/modules/client/client procs.dm

@@ -78,13 +78,13 @@
 //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.
 /client/AllowUpload(filename, filelength)
 	if(filelength > UPLOAD_LIMIT)
-		src << "<font color='red'>Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.</font>"
+		to_chat(src, "<font color='red'>Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.</font>")
 		return 0
 /*	//Don't need this at the moment. But it's here if it's needed later.
 	//Helps prevent multiple files being uploaded at once. Or right after eachother.
 	var/time_to_wait = fileaccess_timer - world.time
 	if(time_to_wait > 0)
-		src << "<font color='red'>Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.</font>"
+		to_chat(src, "<font color='red'>Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.</font>")
 		return 0
 	fileaccess_timer = world.time + FTPDELAY	*/
 	return 1
@@ -106,7 +106,7 @@
 		del(src)
 		return
 
-	src << "<font color='red'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</font>"
+	to_chat(src, "<font color='red'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</font>")
 
 
 	GLOB.clients += src
@@ -132,10 +132,10 @@
 	prefs.sanitize_preferences()
 
 	if(custom_event_msg && custom_event_msg != "")
-		src << "<h1 class='alert'>Custom Event</h1>"
-		src << "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>"
-		src << "<span class='alert'>[custom_event_msg]</span>"
-		src << "<br>"
+		to_chat(src, "<h1 class='alert'>Custom Event</h1>")
+		to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
+		to_chat(src, "<span class='alert'>[custom_event_msg]</span>")
+		to_chat(src, "<br>")
 
 
 	if(holder)
@@ -161,7 +161,7 @@
 	screen += void
 
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
-		src << "<span class='info'>You have unread updates in the changelog.</span>"
+		to_chat(src, "<span class='info'>You have unread updates in the changelog.</span>")
 		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
 		if(config.aggressive_changelog)
 			src.changes()

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

@@ -70,10 +70,13 @@ var/list/gear_datums = list()
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue
-		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit 
-			continue  //Vorestation Edit 
-		if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))  //Vorestation Edit 
-			continue  //Vorestation Edit 
+		//VOREStation Edit Start
+		if(preference_mob && preference_mob.client)
+			if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
+				continue
+			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
+				continue
+		//VOREStation Edit End
 		. += gear_name
 
 /datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -150,10 +153,13 @@ var/list/gear_datums = list()
 	. += "<tr><td colspan=3><hr></td></tr>"
 	for(var/gear_name in LC.gear)
 		var/datum/gear/G = LC.gear[gear_name]
-		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
-			continue //Vorestation Edit
-		if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
-			continue //Vorestation Edit
+		//VOREStation Edit Start
+		if(preference_mob && preference_mob.client)
+			if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
+				continue
+			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
+				continue
+		//VOREStation Edit End
 		var/ticked = (G.display_name in pref.gear)
 		. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
 		. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"
@@ -271,4 +277,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"
@@ -842,27 +884,30 @@
 	path = /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud
 	display_name = "Tempest's Medical Hud"
 	ckeywhitelist = list("wickedtemp")
-	character_name = list("Chakat Tempest Venesare")
+	character_name = list("Chakat Tempest Venosare")
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
-
+	slot = slot_glasses
+	
 /datum/gear/fluff/tempest_hypospray
 	path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
 	display_name = "Tempest's Hypospray"
 	ckeywhitelist = list("wickedtemp")
-	character_name = list("Chakat Tempest Venesare")
+	character_name = list("Chakat Tempest Venosare")
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
-
+	slot = slot_belt
+	
 /datum/gear/fluff/tempest_backpack
 	path = /obj/item/weapon/storage/backpack/saddlebag/tempest
 	display_name = "Tempest's Saddlebag"
 	ckeywhitelist = list("wickedtemp")
-	character_name = list("Chakat Tempest Venesare")
-
+	character_name = list("Chakat Tempest Venosare")
+	slot = slot_back
+	
 /datum/gear/fluff/tempest_implant
 	path = /obj/item/weapon/implanter/reagent_generator/tempest
 	display_name = "Tempest's Implant"
 	ckeywhitelist = list("wickedtemp")
-	character_name = list("Chakat Tempest Venesare")
+	character_name = list("Chakat Tempest Venosare")
 
 //  X CKEYS
 /datum/gear/fluff/penelope_box
@@ -897,3 +942,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_fluffitems_yw.dm

@@ -160,13 +160,13 @@
 //  C CKEYS
 
 //cheekycrenando
-//Srusu Rskuzu
+//Srusu Rskuzu-Ahslru
 /datum/gear/fluff/srususovietuniform
 	path = /obj/item/clothing/under/fluff/srususoviet
 	display_name = "Soviet Uniform"
 	description = "Standard issue soviet dress uniform"
 	ckeywhitelist = list("cheekycrenando")
-	character_name = list("Srusu Rskuzu")
+	character_name = list("Srusu Rskuzu-Ahslru")
 
 //captmatt4
 //Payton Joghs

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

code/modules/client/preference_setup/vore/01_ears.dm

@@ -89,10 +89,19 @@
 	pref.b_wing		= sanitize_integer(pref.b_wing, 0, 255, initial(pref.b_wing))
 	if(pref.ear_style)
 		pref.ear_style	= sanitize_inlist(pref.ear_style, ear_styles_list, initial(pref.ear_style))
+		var/datum/sprite_accessory/temp_ear_style = ear_styles_list[pref.ear_style]
+		if(temp_ear_style.apply_restrictions && (!(pref.species in temp_ear_style.species_allowed)))
+			pref.ear_style = initial(pref.ear_style)
 	if(pref.tail_style)
 		pref.tail_style	= sanitize_inlist(pref.tail_style, tail_styles_list, initial(pref.tail_style))
+		var/datum/sprite_accessory/temp_tail_style = tail_styles_list[pref.tail_style]
+		if(temp_tail_style.apply_restrictions && (!(pref.species in temp_tail_style.species_allowed)))
+			pref.tail_style = initial(pref.tail_style)
 	if(pref.wing_style)
 		pref.wing_style	= sanitize_inlist(pref.wing_style, wing_styles_list, initial(pref.wing_style))
+		var/datum/sprite_accessory/temp_wing_style = wing_styles_list[pref.wing_style]
+		if(temp_wing_style.apply_restrictions && (!(pref.species in temp_wing_style.species_allowed)))
+			pref.wing_style = initial(pref.wing_style)
 
 /datum/category_item/player_setup_item/vore/ears/copy_to_mob(var/mob/living/carbon/human/character)
 	character.ear_style			= ear_styles_list[pref.ear_style]
@@ -182,7 +191,7 @@
 		var/list/pretty_ear_styles = list("Normal" = null)
 		for(var/path in ear_styles_list)
 			var/datum/sprite_accessory/ears/instance = ear_styles_list[path]
-			if((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed))
+			if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)))
 				pretty_ear_styles[instance.name] = path
 
 		// Present choice to user
@@ -215,7 +224,7 @@
 		var/list/pretty_tail_styles = list("Normal" = null)
 		for(var/path in tail_styles_list)
 			var/datum/sprite_accessory/tail/instance = tail_styles_list[path]
-			if((!instance.ckeys_allowed) || (user.ckey in instance.ckeys_allowed))
+			if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)))
 				pretty_tail_styles[instance.name] = path
 
 		// Present choice to user
@@ -248,7 +257,7 @@
 		var/list/pretty_wing_styles = list("Normal" = null)
 		for(var/path in wing_styles_list)
 			var/datum/sprite_accessory/wing/instance = wing_styles_list[path]
-			if((!instance.ckeys_allowed) || (user.ckey in instance.ckeys_allowed))
+			if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)))
 				pretty_wing_styles[instance.name] = path
 
 		// Present choice to user

code/modules/client/preferences_toggle_procs.dm

@@ -203,7 +203,7 @@
 
 	toggle_preference(pref_path)
 
-	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear jukebox music."
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear jukebox music.")
 
 	SScharacter_setup.queue_preferences_save(prefs)
 
@@ -224,6 +224,21 @@
 
 	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/toggle_air_pump_hum() 
+	set name = "Toggle Air Pump Noise" 
+	set category = "Preferences" 
+	set desc = "Toggles Air Pumps humming" 
+
+	var/pref_path = /datum/client_preference/air_pump_noise 
+
+	toggle_preference(pref_path) 
+
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear air pumps hum, start, and stop.") 
+
+	SScharacter_setup.queue_preferences_save(prefs) 
+
+	feedback_add_details("admin_verb","TAirPumpNoise") 
+
 /client/verb/toggle_safe_firing()
 	set name = "Toggle Gun Firing Intent Requirement"
 	set category = "Preferences"

code/modules/client/preferences_vr.dm

@@ -13,7 +13,7 @@ datum/preferences
 
 	toggle_preference(pref_path)
 
-	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear eating related vore noises."
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear eating related vore noises.")
 
 	SScharacter_setup.queue_preferences_save(prefs)
 
@@ -29,7 +29,7 @@ datum/preferences
 
 	toggle_preference(pref_path)
 
-	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear digestion related vore noises."
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear digestion related vore noises.")
 
 	SScharacter_setup.queue_preferences_save(prefs)