Pliant Soul Port From TA

code/__DEFINES/traits.dm

@@ -313,6 +313,10 @@
 #define TRAIT_MASTER_MASON "Master Masonry"
 #define TRAIT_FOOD_STIPEND "Vomitorium-known"
 
+//duds for TAT system
+#define TRAIT_OUTLANDER "Outlander"
+#define TRAIT_PARRYEXPERT "Parry Expert"// CC + TA TAT system perk, maybe port related ronin class if needed
+
 // If you want description to show up you gotta have the trait name defined BEFORE this lol
 
 GLOBAL_LIST_INIT(roguetraits, list(
@@ -572,6 +576,8 @@ GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_ROOT_WALKER = span_info("After offering lux, I can now travel along heartroot trees."),
 	TRAIT_WHITE_STAG = span_info("The power of the white stag lives on inside of me!"),
 	TRAIT_EDIT_DESCRIPTORS = span_info("I can change my appearance at a magic mirror in a thorough manner."),
+	TRAIT_OUTLANDER = span_info("The locals see me as not of their land."),
+	TRAIT_PARRYEXPERT = span_info("I am much better at parrying incoming strikes, having a more high probability of deflecting a blow with my weapon."),
 ))
 
 // trait accessor defines

code/modules/admin/admin_verbs.dm

@@ -117,6 +117,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
 GLOBAL_LIST_INIT(admin_verbs_ban, list(
 	/client/proc/unban_panel,
 	/client/proc/ban_panel,
+	/client/proc/tat_role_locks_panel,
 	/client/proc/stickybanpanel,
 	/client/proc/check_pq,
 	/client/proc/adjust_pq,

code/modules/client/preferences.dm

@@ -261,6 +261,7 @@ GLOBAL_LIST_EMPTY(chosen_names)
 	var/audio_preload
 	var/preloaded = FALSE //Bool Check
 
+	var/datum/tat_build/tat_build //CC + TA edit
 	//CC Edit - Roleplay Guidance Pref, whether you encourage PvP and wish to fight others if invited or discourage PvP and wish to avoid fighting,
 			//but does not exempt you from combat or the consequences of your own actions.
 	var/rp_guidance = 3 //Defaults to Default by Default. 
@@ -269,6 +270,7 @@ GLOBAL_LIST_EMPTY(chosen_names)
 	parent = C
 	migrant  = new /datum/migrant_pref(src)
 	familiar_prefs = new /datum/familiar_prefs(src)
+	tat_build = new(src) //CC + TA edit
 
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		custom_names[custom_name_id] = get_default_name(custom_name_id)
@@ -718,7 +720,7 @@ GLOBAL_LIST_EMPTY(chosen_names)
 			dat += "<br><B>NSFW Image Gallery:</b> <a href='?_src_=prefs;preference=nsfw_img_gallery;task=input'>Add</a>"
 			dat += "<a href='?_src_=prefs;preference=clear_nsfw_gallery;task=input'>Clear Gallery</a>"
 			dat += "<br><a href='?_src_=prefs;preference=ooc_preview;task=input'><b>Preview Examine</b></a>"
-
+			dat += "<br><b>Pliant Soul Settings:</b> <a href='?_src_=prefs;preference=tat_build;task=input'>Change</a>" //CC + TA edit
 			dat += "<br><b>Loadout:</b> <a href='?_src_=prefs;preference=open_loadout;task=input'>Open Menu</a>"
 			dat += "</td>"
 			dat += "</td>"
@@ -2386,6 +2388,11 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr
 					var/datum/loadout_menu/LM = new(user.client)
 					LM.ui_interact(user)
 					return
+
+				//CC + TA edit
+				if("tat_build")
+					tat_build.ui_interact(user)
+				//CC + TA edit end
 				//CC Edit - Roleplay Guidance, this option should be FALSE BY DEFAULT, to encourage Conflict you MUST go into the Game Settings to enable it.
 				if("roleplay_guidance")
 					var/list/choices = list("Conflict Encouraged + Hunted", "Conflict Encouraged", "Conflict Discouraged", "Default")

code/modules/client/preferences_savefile.dm

@@ -229,7 +229,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	///Caustic edit end
 	// Custom hotkeys
 	S["key_bindings"]		>> key_bindings
+	//CC + TA edit
+	var/list/L
+	S["tat_build"] >> L
 
+	if(!tat_build)
+		tat_build = new(src)
+	//CC + TA edit end
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
 		update_preferences(needs_update, S)		//needs_update = savefile_version if we need an update (positive integer)
@@ -273,6 +279,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	pda_color		= sanitize_hexcolor(pda_color, 6, 1, initial(pda_color))
 	key_bindings 	= sanitize_islist(key_bindings, list())
 	masked_examine  = sanitize_integer(masked_examine, 0, 1, initial(masked_examine))
+	tat_build.load_from_list(sanitize_islist(L, list())) //CC + TA edit
 	//ROGUETOWN
 	parallax = PARALLAX_INSANE
 
@@ -381,6 +388,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["audio_preload"], audio_preload)
 	WRITE_FILE(S["rp_guidance"], rp_guidance)
 	///Caustic edit end
+
+	WRITE_FILE(S["tat_build"], tat_build.export_to_list()) //CC + TA edit
 
 	return TRUE
 

code/modules/mob/living/carbon/human/examine.dm

@@ -76,6 +76,8 @@
 		on_examine_face(user)
 		var/used_name = name
 		var/used_title = get_role_title()
+		if(tat_pliant_title) // CC + TA edit
+			used_title = tat_pliant_title // CC + TA edit
 		if(SSticker.regentmob == src)
 			used_title = "[used_title]" + " Regent"
 		var/display_as_wanderer = FALSE
@@ -100,14 +102,14 @@
 			displayed_headshot = src.headshot_link
 
 		if ((valid_headshot_link(src, displayed_headshot, TRUE)) && (user.client?.prefs.chatheadshot))
-			if(display_as_wanderer)
+			if(display_as_wanderer && !tat_pliant_title) // CC + TA edit
 				. = list(span_info("ø ------------ ø\n<img src=[displayed_headshot] width=100 height=100/>\nThis is <EM>[used_name]</EM>, the wandering [race_name]."))
 			else if(used_title)
 				. = list(span_info("ø ------------ ø\n<img src=[displayed_headshot] width=100 height=100/>\nThis is <EM>[used_name]</EM>, the [race_name] [used_title]."))
 			else
 				. = list(span_info("ø ------------ ø\n<img src=[displayed_headshot] width=100 height=100/>\nThis is the <EM>[used_name]</EM>, the [race_name]."))
 		else
-			if(display_as_wanderer)
+			if(display_as_wanderer && !tat_pliant_title) // CC + TA edit
 				. = list(span_info("ø ------------ ø\nThis is <EM>[used_name]</EM>, the wandering [race_name]."))
 			else if(used_title)
 				. = list(span_info("ø ------------ ø\nThis is <EM>[used_name]</EM>, the [race_name] [used_title]."))

code/modules/mob/living/carbon/life.dm

@@ -641,6 +641,14 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 					if(armor_blocked && !fallingas)
 						to_chat(src, span_warning("I can't sleep like this. My armor is burdening me."))
 						fallingas = TRUE
+					// CC + TA edit
+					if(HAS_TRAIT(src, TRAIT_NUDE_SLEEPER) && (H.wear_armor || H.wear_pants || H.wear_shirt || H.wear_wrists || H.cloak || H.gloves || H.shoes))
+						message = "I am unable to sleep in clothes. I should remove them."
+						if(!fallingas)
+							to_chat(src, span_warning(message))
+						fallingas = TRUE
+						return
+					// CC + TA edit end
 				if(!armor_blocked)
 					if (sleepy_mod > 1)
 						sleep_threshold = 30

code/modules/mob/living/combat/parry.dm

@@ -225,7 +225,10 @@
 	if(HAS_TRAIT(U, TRAIT_ARMOUR_LIKED))
 		if(HAS_TRAIT(U, TRAIT_FENCERDEXTERITY))
 			prob2defend -= 5
-
+	//CC + TA edit
+	if(HAS_TRAIT(src, TRAIT_PARRYEXPERT)) 
+		prob2defend += 30
+	//CC + TA edit
 	prob2defend = clamp(prob2defend, 5, 90)
 	if(HAS_TRAIT(user, TRAIT_HARDSHELL) && H.client)	//Dwarf-merc specific limitation w/ their armor on in pvp
 		prob2defend = clamp(prob2defend, 5, 70)