Kitchen Sink P2 TGUI Prefs (#17579)

* Kitchen Sink V2

* tsx

* Update vorestation.dme

* Update 01_basic.dm

* Update 01_basic.dm

* Deletes the character  directory

* F & M tags

* Flexible

* Update misc.dm

* ICP

* more fixes

* missing sounds

code/game/objects/items/devices/body_snatcher_vr.dm

@@ -28,19 +28,16 @@
 			to_chat(user,span_danger("The target's mind is too complex to be affected!"))
 			return
 
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H.resleeve_lock && user.ckey != H.resleeve_lock)
-				to_chat(src, span_danger("[H] cannot be impersonated!"))
-				return
-
 		if(M.stat == DEAD) //Are they dead?
 			to_chat(user,span_warning("A warning pops up on the device, informing you that [M] is dead, and, as such, the mind transfer can not be done."))
 			return
 
 		var/choice = tgui_alert(user,"This will swap your mind with the target's mind. This will result in them controlling your body, and you controlling their body. Continue?","Confirmation",list("Continue","Cancel"))
 		if(choice == "Continue" && user.get_active_hand() == src && user.Adjacent(M))
-
+			if(M.ckey && !M.client)
+				log_and_message_admins("attempted to body swap with [key_name(M)] while they were SSD!")
+			else
+				log_and_message_admins("attempted to body swap with [key_name(M)].")
 			user.visible_message(span_warning("[user] pushes the device up their forehead and [M]'s head, the device beginning to let out a series of light beeps!"),span_notice("You begin swap minds with [M]!"))
 			if(do_after(user,35 SECONDS,M))
 				if(user.mind && M.mind && M.stat != DEAD && user.stat != DEAD)
@@ -51,6 +48,12 @@
 					var/target_ooc_notes = M.ooc_notes
 					var/target_likes = M.ooc_notes_likes
 					var/target_dislikes = M.ooc_notes_dislikes
+					var/target_favs = M.ooc_notes_favs
+					var/target_maybes = M.ooc_notes_maybes
+					var/target_style = M.ooc_notes_style
+					var/user_favs = user.ooc_notes_favs
+					var/user_maybes = user.ooc_notes_maybes
+					var/user_style = user.ooc_notes_style
 					var/user_ooc_notes = user.ooc_notes
 					var/user_likes = user.ooc_notes_likes
 					var/user_dislikes = user.ooc_notes_dislikes
@@ -67,6 +70,20 @@
 					M.ooc_notes = user_ooc_notes //Let's keep their OOC notes over to their new body.
 					M.ooc_notes_likes = user_likes
 					M.ooc_notes_dislikes = user_dislikes
+					M.ooc_notes_favs = user_favs
+					M.ooc_notes_maybes = user_maybes
+					M.ooc_notes_style = user_style
+					user.ooc_notes_favs = target_favs
+					user.ooc_notes_maybes = target_maybes
+					user.ooc_notes_style = target_style
+					if(M.tf_mob_holder == user)
+						M.tf_mob_holder = null
+					else
+						M.tf_mob_holder = user
+					if(user.tf_mob_holder == M)
+						user.tf_mob_holder = null
+					else
+						user.tf_mob_holder = M
 					user.ooc_notes = target_ooc_notes
 					user.ooc_notes_likes = target_likes
 					user.ooc_notes_dislikes = target_dislikes

code/game/objects/items/devices/scanners/sleevemate.dm

@@ -18,8 +18,11 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
 	var/datum/mind/stored_mind
 
 	var/ooc_notes = null //For holding prefs
+	var/ooc_notes_favs = null
 	var/ooc_notes_likes = null
+	var/ooc_notes_maybes = null
 	var/ooc_notes_dislikes = null
+	var/ooc_notes_style = FALSE
 
 	// Resleeving database this machine interacts with. Blank for default database
 	// Needs a matching /datum/transcore_db with key defined in code
@@ -45,6 +48,9 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
 	ooc_notes = M.ooc_notes
 	ooc_notes_likes = M.ooc_notes_likes
 	ooc_notes_dislikes = M.ooc_notes_dislikes
+	ooc_notes_favs = M.ooc_notes_favs
+	ooc_notes_maybes = M.ooc_notes_maybes
+	ooc_notes_style = M.ooc_notes_style
 	stored_mind = M.mind
 	M.ghostize()
 	stored_mind.current = null
@@ -56,6 +62,9 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
 	M.ooc_notes = ooc_notes
 	M.ooc_notes_likes = ooc_notes_likes
 	M.ooc_notes_dislikes = ooc_notes_dislikes
+	M.ooc_notes_favs = ooc_notes_favs
+	M.ooc_notes_maybes = ooc_notes_maybes
+	M.ooc_notes_style = ooc_notes_style
 	clear_mind()
 
 

code/game/sound.dm

@@ -308,6 +308,7 @@
 					'sound/effects/mech/powerloader_step2.ogg')
 	return soundin
 
+
 //Are these even used?	//Yes
 GLOBAL_LIST_INIT(keyboard_sound, list('sound/effects/keyboard/keyboard1.ogg','sound/effects/keyboard/keyboard2.ogg','sound/effects/keyboard/keyboard3.ogg', 'sound/effects/keyboard/keyboard4.ogg'))
 GLOBAL_LIST_INIT(bodyfall_sound, list('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg'))
@@ -328,6 +329,11 @@ GLOBAL_LIST_INIT(goon_speak_pugg_sound, list('sound/talksounds/goon/pugg.ogg', '
 GLOBAL_LIST_INIT(goon_speak_roach_sound, list('sound/talksounds/goon/roach.ogg', 'sound/talksounds/goon/roach_ask.ogg', 'sound/talksounds/goon/roach_exclaim.ogg'))
 GLOBAL_LIST_INIT(goon_speak_skelly_sound, list('sound/talksounds/goon/skelly.ogg', 'sound/talksounds/goon/skelly_ask.ogg', 'sound/talksounds/goon/skelly_exclaim.ogg'))
 
+GLOBAL_LIST_INIT(wf_speak_lure_sound, list ('sound/talksounds/wf/lure_1.ogg', 'sound/talksounds/wf/lure_2.ogg', 'sound/talksounds/wf/lure_3.ogg', 'sound/talksounds/wf/lure_4.ogg', 'sound/talksounds/wf/lure_5.ogg'))
+GLOBAL_LIST_INIT(wf_speak_lyst_sound, list ('sound/talksounds/wf/lyst_1.ogg', 'sound/talksounds/wf/lyst_2.ogg', 'sound/talksounds/wf/lyst_3.ogg', 'sound/talksounds/wf/lyst_4.ogg', 'sound/talksounds/wf/lyst_5.ogg', 'sound/talksounds/wf/lyst_6.ogg'))
+GLOBAL_LIST_INIT(wf_speak_void_sound, list ('sound/talksounds/wf/void_1.ogg', 'sound/talksounds/wf/void_2.ogg', 'sound/talksounds/wf/void_3.ogg'))
+GLOBAL_LIST_INIT(wf_speak_vomva_sound, list ('sound/talksounds/wf/vomva_1.ogg', 'sound/talksounds/wf/vomva_2.ogg', 'sound/talksounds/wf/vomva_3.ogg', 'sound/talksounds/wf/vomva_4.ogg'))
+GLOBAL_LIST_INIT(xeno_speak_sound, list('sound/talksounds/xeno/xenotalk.ogg', 'sound/talksounds/xeno/xenotalk2.ogg', 'sound/talksounds/xeno/xenotalk3.ogg'))
 
 #define canine_sounds list("cough" = null, "sneeze" = null, "scream" = list('sound/voice/scream/canine/wolf_scream.ogg', 'sound/voice/scream/canine/wolf_scream2.ogg', 'sound/voice/scream/canine/wolf_scream3.ogg', 'sound/voice/scream/canine/wolf_scream4.ogg', 'sound/voice/scream/canine/wolf_scream5.ogg', 'sound/voice/scream/canine/wolf_scream6.ogg'), "pain" = list('sound/voice/pain/canine/wolf_pain.ogg', 'sound/voice/pain/canine/wolf_pain2.ogg', 'sound/voice/pain/canine/wolf_pain3.ogg', 'sound/voice/pain/canine/wolf_pain4.ogg'), "gasp" = list('sound/voice/gasp/canine/wolf_gasp.ogg'), "death" = list('sound/voice/death/canine/wolf_death1.ogg', 'sound/voice/death/canine/wolf_death2.ogg', 'sound/voice/death/canine/wolf_death3.ogg', 'sound/voice/death/canine/wolf_death4.ogg', 'sound/voice/death/canine/wolf_death5.ogg'))
 #define feline_sounds list("cough" = null, "sneeze" = null, "scream" = list('sound/voice/scream/feline/feline_scream.ogg'), "pain" = list('sound/voice/pain/feline/feline_pain.ogg'), "gasp" = list('sound/voice/gasp/feline/feline_gasp.ogg'), "death" = list('sound/voice/death/feline/feline_death.ogg'))