diff --git a/code/datums/character_flaw/_character_flaw.dm b/code/datums/character_flaw/_character_flaw.dm
index 20fa7d4e6b3..5d81b7e648b 100644
--- a/code/datums/character_flaw/_character_flaw.dm
+++ b/code/datums/character_flaw/_character_flaw.dm
@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(character_flaws, list(
 	//Caustic edit
 	"Bottomless"=/datum/charflaw/bottomless,
 	"Asundered Mind"=/datum/charflaw/mind_broken,
+	"Combat Adverse"=/datum/charflaw/combat_adverse,
 	//Caustic edit end
 	"Hunted"=/datum/charflaw/hunted,
 	/datum/charflaw/mind_broken::name = /datum/charflaw/mind_broken,
diff --git a/code/game/objects/structures/crates_lockers/roguetown.dm b/code/game/objects/structures/crates_lockers/roguetown.dm
index 347ecda5e6e..070198f4e6a 100644
--- a/code/game/objects/structures/crates_lockers/roguetown.dm
+++ b/code/game/objects/structures/crates_lockers/roguetown.dm
@@ -70,6 +70,39 @@
 		var/I = pickweight(loot)
 		new I(src)
 
+//Caustic Edit
+/obj/structure/closet/crate/chest/gravechest
+
+/obj/structure/closet/crate/chest/gravechest/PopulateContents()
+	var/list/loot = list(/obj/item/rogueweapon/huntingknife/idagger/steel=10,
+		/obj/item/rogueweapon/mace/steel=10,
+		/obj/item/rogueweapon/pick=20,
+		/obj/item/rogueweapon/shovel=20,
+		/obj/item/clothing/suit/roguetown/armor/gambeson=15,
+		/obj/item/clothing/suit/roguetown/armor/leather=15,
+		/obj/item/ingot/iron=20,
+		/obj/item/ingot/gold=5,
+		/obj/item/ingot/silver=3,
+		/obj/item/riddleofsteel=1,
+		/obj/item/roguegem/ruby=2,
+		/obj/item/roguegem/blue=3,
+		/obj/item/roguegem/violet=4,
+		/obj/item/roguegem/green=6,
+		/obj/item/roguegem/yellow=10,
+		/obj/item/roguecoin/silver/pile=2,
+		/obj/item/roguecoin/gold/pile=6,
+		/obj/item/storage/belt/rogue/pouch/coins/mid=8,
+		/obj/item/storage/belt/rogue/pouch/coins/rich=8,
+		/obj/item/storage/backpack/rogue/satchel/otavan=30,
+		/obj/item/roguestatue/gold/loot=1,
+		/obj/item/clothing/neck/roguetown/talkstone=2)
+	
+	var/i
+	for(i=0, i<3, i++)
+		var/I = pickweight(loot)
+		new I(src)
+//Caustic Edit End
+
 /obj/structure/closet/crate/roguecloset
 	name = "closet"
 	desc = "A simple wooden closet, used to store whatever it is you would like out of sight."
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 12af9d1630f..4b9bfcb9023 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -49,16 +49,16 @@
 		else
 			to_chat(src, "Screen shake disabled.")
 
-/client/verb/masked_examine()
+/client/verb/masked_examine() //Caustic Edit - Just... fixing this up everywhere it's used to be consistent. And not stupidly inversed? If this is true, it's ALLOWING the info.
 	set category = "Options"
 	set name = "Toggle Masked Examine"
 	if(prefs)
 		prefs.masked_examine = !prefs.masked_examine
 		prefs.save_preferences()
-		if(!prefs.masked_examine)
+		if(prefs.masked_examine)
 			to_chat(src, "Your character information will be viewable when masked.")
 		else
-			to_chat(src, "Your character information will no longer be viewable when masked.")
+			to_chat(src, "Your character information will no longer be viewable when masked.") //Caustic Edit End
 
 /client/verb/mute_animal_emotes()
 	set category = "Options"
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 95540fc883d..4b4573f736f 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -195,3 +195,7 @@
 	var/can_do_sex = TRUE
 
 	fovangle = FOV_DEFAULT
+
+	//Caustic Edit
+	var/time_of_last_move = 0
+	//Caustic Edit End
diff --git a/code/modules/mob/living/carbon/human/human_topic.dm b/code/modules/mob/living/carbon/human/human_topic.dm
index a992df2b4f3..fe9dd217c13 100644
--- a/code/modules/mob/living/carbon/human/human_topic.dm
+++ b/code/modules/mob/living/carbon/human/human_topic.dm
@@ -215,7 +215,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
 			// NEXT ROW
 			dat += "<tr>"
 			dat += "<td style='width:16%;text-align:left;vertical-align: text-top'>"
-			if(intellectual && (!obscured_name || !H.client?.prefs.masked_examine))
+			if(intellectual && (!obscured_name || H.client?.prefs.masked_examine))
 				dat += "<b>STATS:</b><br><br>"
 				if(!is_guarded)
 					dat +=("STR: \Roman [H.STASTR]<br>")
@@ -366,7 +366,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
 			dat += "</td>"
 
 			dat += "<td style='width:40%;text-align:center;vertical-align: text-top'>"
-			if(!is_guarded && !is_stupid && (!obscured_name || !H.client?.prefs.masked_examine))	//We don't see Guarded people's skills at all.
+			if(!is_guarded && !is_stupid && (!obscured_name || H.client?.prefs.masked_examine))	//We don't see Guarded people's skills at all.
 				dat += "<b>SKILLS:</b><br><br>"
 				var/list/wornstuff = list(H.backr, H.backl, H.beltl, H.beltr)
 				if(!is_normal && !is_smart)	//At minimum we get to see the skills of the weapons the person is holding, if we have them.
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 22b40c5c8d1..f1f1b8e126f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -104,6 +104,9 @@
 //Caustic Edit - Adding an on_moved call for flaws!
 /mob/living/carbon/human/Moved(atom/OldLoc, Dir)
 	. = ..()
+	if(mind)
+		time_of_last_move = world.time //This keeps track of the tick count since the human mob last moved, to be referenced later at any time! Only bothering to track it if the mob has a mind, IE a player (for stopping hunger and thirst loss currently!)
+	
 	if(charflaw && !charflaw.ephemeral && mind)
 		charflaw.flaw_on_moved(src, OldLoc, Dir)
 //Caustic Edit End
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 137330014c5..2456048b5ae 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -976,7 +976,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				H.Jitter(5)
 			hunger_rate = 10 * HUNGER_FACTOR*/
 //		hunger_rate *= H.physiology.hunger_mod
-		H.adjust_nutrition(-hunger_rate)
+		if(!H.mind || world.time < H.time_of_last_move + 10 MINUTES)
+			H.adjust_nutrition(-hunger_rate)
 
 		var/obj/item/organ/breasts/breasts = H.has_breasts()
 		if(breasts)
@@ -994,7 +995,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		// THEY HUNGER
 		var/hunger_rate = HUNGER_FACTOR
 //		hunger_rate *= H.physiology.hunger_mod
-		H.adjust_hydration(-hunger_rate)
+		if(!H.mind || world.time < H.time_of_last_move + 10 MINUTES)
+			H.adjust_hydration(-hunger_rate)
 
 
 	if (H.nutrition > NUTRITION_LEVEL_FULL)
diff --git a/code/modules/mob/living/simple_animal/rogue/creacher/undead_animal_helpers.dm b/code/modules/mob/living/simple_animal/rogue/creacher/undead_animal_helpers.dm
index 13776b281b7..8f120753a60 100644
--- a/code/modules/mob/living/simple_animal/rogue/creacher/undead_animal_helpers.dm
+++ b/code/modules/mob/living/simple_animal/rogue/creacher/undead_animal_helpers.dm
@@ -43,8 +43,11 @@ GLOBAL_LIST_INIT(animal_to_undead, list(
 /datum/component/deadite_animal_reanimation
 	var/reanimation_timer
 	var/undead_to_spawn
+	var/attempt_later_reanimate //Caustic Edit - Var to only attempt a loop of the timer this many times
 
 /datum/component/deadite_animal_reanimation/Initialize()
+	attempt_later_reanimate = 3 //Caustic Edit - Init the loop counter
+
 	if(!istype(parent, /mob/living/simple_animal))
 		return COMPONENT_INCOMPATIBLE
 
@@ -59,6 +62,21 @@ GLOBAL_LIST_INIT(animal_to_undead, list(
 
 /datum/component/deadite_animal_reanimation/proc/reanimate()
 	var/mob/living/simple_animal/mob = parent
+
+	//Caustic Edit - Add a prevention and loop the timer if someone living is nearby
+	if(attempt_later_reanimate > 0)
+		var/client_mobs = get_hearers_in_range(6, mob, SPATIAL_GRID_CONTENTS_TYPE_CLIENTS)
+		if(length(client_mobs))
+			for(var/mob/living/player_mob as anything in client_mobs)
+				if(player_mob.stat == CONSCIOUS)
+					attempt_later_reanimate--
+					if(attempt_later_reanimate >= 0)
+						reanimation_timer = addtimer(CALLBACK(src, PROC_REF(reanimate)), 1.5 MINUTES, TIMER_STOPPABLE)
+					else
+						UnregisterFromParent()
+					return
+	//Caustic Edit End
+
 	if(!prob(get_reanimation_chance()) || QDELETED(mob) || mob.stat != DEAD)
 		UnregisterFromParent()
 		return
diff --git a/code/modules/roguetown/roguejobs/gravedigger/hole.dm b/code/modules/roguetown/roguejobs/gravedigger/hole.dm
index 8011b590335..dc78288cfe3 100644
--- a/code/modules/roguetown/roguejobs/gravedigger/hole.dm
+++ b/code/modules/roguetown/roguejobs/gravedigger/hole.dm
@@ -66,12 +66,14 @@
 
 /obj/structure/closet/dirthole/closed/loot/Initialize()
 	. = ..()
-	lootroll = rand(1,4)
+	lootroll = rand(1,10)	//Caustic Edit - Make the loot a bit more interesting. 1 - Skeleton, 2 - Buried Loot
+							//3 - 5 - Bones, small chance of decrepit item, 6 - 8 - Commoner Body, 9 - Noble Body, 10 - Nothing
 
 /obj/structure/closet/dirthole/closed/loot
 	var/looted = FALSE
 	var/lootroll = 0
 
+//Caustic Edit - Making the drops more interesting!
 /obj/structure/closet/dirthole/closed/loot/open()
 	if(!looted)
 		looted = TRUE
@@ -79,9 +81,258 @@
 			if(1)
 				new /mob/living/carbon/human/species/skeleton/npc(mastert)
 			if(2)
-				new /obj/structure/closet/crate/chest/lootbox(mastert)
+				new /obj/structure/closet/crate/chest/gravechest(mastert)
+			if(3)
+				corpse_bones()
+				decrepit_chance()
+			if(4)
+				corpse_bones()
+				decrepit_chance()
+			if(5)
+				corpse_bones()
+				decrepit_chance()
+			if(6)
+				corpse_bones()
+				towner_chance()
+			if(7)
+				corpse_bones()
+				towner_chance()
+			if(8)
+				corpse_bones()
+				towner_chance()
+			if(9)
+				corpse_bones()
+				noble_chance()
 	..()
 
+/obj/structure/closet/dirthole/closed/loot/proc/corpse_bones()
+	new /obj/item/skull(mastert)
+	var/num_bones = rand(2,5)
+
+	var/i
+	for(i=0, i<num_bones, i++)
+		new /obj/item/natural/bone(mastert)
+
+/obj/structure/closet/dirthole/closed/loot/proc/decrepit_chance()
+	var/num_item = rand(0,2)
+	if(num_item == 0)
+		return
+	
+	var/list/loot = list(/obj/item/rogueweapon/huntingknife/idagger/adagger=6,
+		/obj/item/rogueweapon/mace/alloy=5,
+		/obj/item/rogueweapon/spear/aalloy=9,
+		/obj/item/rogueweapon/pitchfork/aalloy=4,
+		/obj/item/rogueweapon/sickle/aalloy=5,
+		/obj/item/rogueweapon/shovel/aalloy=8,
+		/obj/item/rogueweapon/hammer/aalloy=7,
+		/obj/item/clothing/suit/roguetown/armor/chainmail/aalloy=1,
+		/obj/item/clothing/under/roguetown/chainlegs/kilt/aalloy=1,
+		/obj/item/reagent_containers/glass/cup/aalloygob=2,
+		/obj/item/reagent_containers/glass/bowl/aalloy=2,
+		/obj/item/clothing/ring/aalloy=3)
+	
+	var/i
+	for(i=0, i<num_item, i++)
+		var/J = pickweight(loot)
+		new J(mastert)
+
+/obj/structure/closet/dirthole/closed/loot/proc/towner_chance()
+	var/num_weapon = rand(1,2)
+	
+	var/list/weapon_loot = list(/obj/item/rogueweapon/huntingknife/idagger=5,
+		/obj/item/rogueweapon/huntingknife/idagger/steel=2,
+		/obj/item/rogueweapon/mace=4,
+		/obj/item/rogueweapon/mace/steel=1,
+		/obj/item/rogueweapon/shield/buckler=2,
+		/obj/item/rogueweapon/shield/heater=1,
+		/obj/item/rogueweapon/stoneaxe/battle=5,
+		/obj/item/rogueweapon/stoneaxe/woodcut/wardenpick=2,
+		/obj/item/rogueweapon/flail/militia=3,
+		/obj/item/rogueweapon/spear=6,
+		/obj/item/rogueweapon/pitchfork/aalloy=4,
+		/obj/item/rogueweapon/pick/militia=3,
+		/obj/item/rogueweapon/sword/falchion/militia=4,
+		/obj/item/rogueweapon/sword/iron=3,
+		/obj/item/rogueweapon/sword/falx=1,
+		/obj/item/rogueweapon/sword/long/shotel/iron=1,
+		/obj/item/rogueweapon/sword/short/iron=4,
+		/obj/item/rogueweapon/sword/short/falchion=2,
+		/obj/item/rogueweapon/sword/short/messer=3,
+		/obj/item/rogueweapon/pitchfork=7,
+		/obj/item/rogueweapon/sickle=6,
+		/obj/item/rogueweapon/shovel=9,
+		/obj/item/rogueweapon/hammer/iron=6,
+		/obj/item/rogueweapon/tongs=4,
+		/obj/item/rogueweapon/pick=6)
+	
+	var/i
+	for(i=0, i<num_weapon, i++)
+		var/W = pickweight(weapon_loot)
+		new W(mastert)
+	
+	if(prob(80))
+		var/list/armor_loot = list(/obj/item/clothing/suit/roguetown/armor/gambeson=5,
+			/obj/item/clothing/suit/roguetown/armor/gambeson/heavy=2,
+			/obj/item/clothing/suit/roguetown/armor/chainmail/iron=3,
+			/obj/item/clothing/wrists/roguetown/bracers=3,
+			/obj/item/clothing/wrists/roguetown/bracers/leather/heavy=1,
+			/obj/item/clothing/gloves/roguetown/leather=2,
+			/obj/item/clothing/gloves/roguetown/chain/iron=2,
+			/obj/item/clothing/head/roguetown/helmet/leather/advanced=2,
+			/obj/item/clothing/head/roguetown/helmet=3,
+			/obj/item/clothing/neck/roguetown/chaincoif=2,
+			/obj/item/clothing/under/roguetown/heavy_leather_pants=2,
+			/obj/item/clothing/under/roguetown/splintlegs/iron=3,
+			/obj/item/clothing/under/roguetown/chainlegs/iron=3,
+			/obj/item/clothing/shoes/roguetown/boots/leather/reinforced=2,
+			/obj/item/clothing/shoes/roguetown/boots/armor/iron=3)
+		
+		var/A = pickweight(armor_loot)
+		new A(mastert)
+
+		if(prob(50))
+			var/A_bonus = pickweight(armor_loot)
+			new A_bonus(mastert)
+	
+	var/num_other = rand(0,3)
+	if(num_other == 0)
+		return
+	
+	var/list/other_loot = list(/obj/item/clothing/neck/roguetown/psicross=3,
+		/obj/item/clothing/neck/roguetown/psicross/undivided=1,
+		/obj/item/clothing/neck/roguetown/psicross/noc=1,
+		/obj/item/clothing/neck/roguetown/psicross/abyssor=1,
+		/obj/item/clothing/neck/roguetown/psicross/dendor=1,
+		/obj/item/clothing/neck/roguetown/psicross/necra=1,
+		/obj/item/clothing/neck/roguetown/psicross/pestra=1,
+		/obj/item/clothing/neck/roguetown/psicross/ravox=1,
+		/obj/item/clothing/neck/roguetown/psicross/malum=1,
+		/obj/item/clothing/neck/roguetown/psicross/eora=1,
+		/obj/item/clothing/neck/roguetown/psicross/xylix=1,
+		/obj/item/clothing/ring/band=8,
+		/obj/item/clothing/ring/aalloy=6,
+		/obj/item/clothing/ring/silver=3,
+		/obj/item/clothing/ring/gold=5,
+		/obj/item/storage/keyring=4,
+		/obj/item/clothing/neck/roguetown/ornateamulet=2,
+		/obj/item/roguecoin/copper/pile=5,
+		/obj/item/roguecoin/silver/pile=3,
+		/obj/item/roguecoin/aalloy/pile=7,
+		/obj/item/roguecoin/inqcoin/pile=2,
+		/obj/item/reagent_containers/glass/bottle/rogue/beer/murkwine=2,
+		/obj/item/reagent_containers/glass/bottle/rogue/beer/rtoper=2,
+		/obj/item/reagent_containers/glass/bottle/rogue/beer/hagwoodbitter=2,
+		/obj/item/reagent_containers/glass/cup=4,
+		/obj/item/reagent_containers/glass/cup/silver/pewter=3,
+		/obj/item/reagent_containers/glass/bowl/iron=4)
+	
+	for(i=0, i<num_other, i++)
+		var/O = pickweight(other_loot)
+		new O(mastert)
+
+/obj/structure/closet/dirthole/closed/loot/proc/noble_chance()
+	var/num_weapon = rand(1,2)
+	
+	var/list/weapon_loot = list(/obj/item/rogueweapon/sword/decorated/blacksteel=1,
+		/obj/item/rogueweapon/sword/decorated=3,
+		/obj/item/rogueweapon/sword/long/dec=2,
+		/obj/item/rogueweapon/sword/sabre/dec=3,
+		/obj/item/rogueweapon/sword/rapier/dec=3,
+		/obj/item/rogueweapon/huntingknife/idagger/silver/stake=1,
+		/obj/item/rogueweapon/huntingknife/idagger/silver/elvish/poopknife=1,
+		/obj/item/rogueweapon/huntingknife/idagger/silver/elvish=3,
+		/obj/item/rogueweapon/huntingknife/idagger/steel/parrying/vaquero=2,
+		/obj/item/rogueweapon/huntingknife/throwingknife/bauernwehr=2,
+		/obj/item/rogueweapon/mace/cudgel/justice=1,
+		/obj/item/rogueweapon/mace/parasol/noble=1,
+		/obj/item/rogueweapon/mace/steel=4,
+		/obj/item/rogueweapon/mace/maul/grand=2,
+		/obj/item/rogueweapon/stoneaxe/woodcut/steel/slayer=1,
+		/obj/item/rogueweapon/stoneaxe/woodcut/steel/atgervi=3,
+		/obj/item/rogueweapon/stoneaxe/battle/steppesman=3,
+		/obj/item/rogueweapon/greataxe/steel/gilded=2,
+		/obj/item/rogueweapon/spear/lance=4,
+		/obj/item/rogueweapon/hammer/blacksteel=2)
+	
+	var/i
+	for(i=0, i<num_weapon, i++)
+		var/W = pickweight(weapon_loot)
+		new W(mastert)
+	
+	var/list/armor_loot = list(/obj/item/clothing/mask/rogue/lordmask=3,
+		/obj/item/clothing/mask/rogue/facemask/goldmask=2,
+		/obj/item/clothing/suit/roguetown/shirt/dress/royal/hand_m=1,
+		/obj/item/clothing/suit/roguetown/shirt/dress/emerald=2,
+		/obj/item/clothing/suit/roguetown/shirt/dress/royal/princess=1,
+		/obj/item/clothing/suit/roguetown/shirt/dress/royal/prince=1,
+		/obj/item/clothing/suit/roguetown/shirt/dress/silkydress/random=3,
+		/obj/item/clothing/suit/roguetown/shirt/fancyjacket=2,
+		/obj/item/clothing/suit/roguetown/armor/plate/cuirass/elven=2,
+		/obj/item/clothing/suit/roguetown/armor/plate/cuirass/fencer=3,
+		/obj/item/clothing/suit/roguetown/armor/plate/otavan=1,
+		/obj/item/clothing/suit/roguetown/armor/armordress/winterdress/monarch=2,
+		/obj/item/clothing/suit/roguetown/armor/leather/vest/winterjacket=3,
+		/obj/item/clothing/head/roguetown/helmet/heavy/knight/gilded=2,
+		/obj/item/clothing/head/roguetown/helmet/sallet/visored/gilded=2,
+		/obj/item/clothing/head/roguetown/helmet/otavan=2,
+		/obj/item/clothing/head/roguetown/nyle/consortcrown=3,
+		/obj/item/clothing/head/roguetown/circlet=3,
+		/obj/item/clothing/gloves/roguetown/nomagic=1,
+		/obj/item/clothing/gloves/roguetown/otavan/psygloves=3,
+		/obj/item/clothing/gloves/roguetown/otavan=3,
+		/obj/item/clothing/under/roguetown/heavy_leather_pants/otavan=3,
+		/obj/item/clothing/under/roguetown/heavy_leather_pants/grenzelpants=3,
+		/obj/item/clothing/shoes/roguetown/boots/psydonboots=3,
+		/obj/item/clothing/shoes/roguetown/boots/leather/atgervi=2,
+		/obj/item/clothing/shoes/roguetown/boots/otavan=2,
+		/obj/item/clothing/shoes/roguetown/boots/nobleboot=3,
+		/obj/item/clothing/climbing_gear=1)
+	
+	var/A = pickweight(armor_loot)
+	new A(mastert)
+
+	if(prob(55))
+		var/A_bonus = pickweight(armor_loot)
+		new A_bonus(mastert)
+	
+	var/num_other = rand(1,3)
+	
+	var/list/other_loot = list(/obj/item/clothing/neck/roguetown/psicross=2,
+		/obj/item/clothing/neck/roguetown/psicross/astrata=3,
+		/obj/item/clothing/ring/band=3,
+		/obj/item/clothing/ring/emerald=2,
+		/obj/item/clothing/ring/ruby=1,
+		/obj/item/clothing/ring/topaz=3,
+		/obj/item/clothing/ring/quartz=3,
+		/obj/item/clothing/ring/sapphire=2,
+		/obj/item/clothing/ring/diamond=1,
+		/obj/item/clothing/ring/emeralds=2,
+		/obj/item/clothing/ring/rubys=1,
+		/obj/item/clothing/ring/topazs=3,
+		/obj/item/clothing/ring/quartzs=3,
+		/obj/item/clothing/ring/sapphires=2,
+		/obj/item/clothing/ring/diamonds=1,
+		/obj/item/clothing/neck/roguetown/ornateamulet/noble=2,
+		/obj/item/clothing/neck/roguetown/skullamulet=2,
+		/obj/item/clothing/neck/roguetown/skullamulet/gemerald=1,
+		/obj/item/roguecoin/gold/pile=3,
+		/obj/item/roguecoin/silver/pile=5,
+		/obj/item/roguecoin/aalloy/pile=2,
+		/obj/item/roguecoin/inqcoin/pile=3,
+		/obj/item/reagent_containers/glass/bottle/rogue/elfblue=3,
+		/obj/item/reagent_containers/glass/bottle/rogue/elfred=3,
+		/obj/item/reagent_containers/glass/cup/silver=3,
+		/obj/item/reagent_containers/glass/cup/golden=4,
+		/obj/item/reagent_containers/glass/bowl/silver=2,
+		/obj/item/reagent_containers/glass/bowl/gold=3,
+		/obj/item/clothing/neck/roguetown/talkstone=1,
+		/obj/item/scomstone=1)
+	
+	for(i=0, i<num_other, i++)
+		var/O = pickweight(other_loot)
+		new O(mastert)
+//Caustic Edit End
+
 /obj/structure/closet/dirthole/closed/loot/examine(mob/user)
 	. = ..()
 	if(HAS_TRAIT(user, TRAIT_SOUL_EXAMINE))
diff --git a/modular_causticcove/code/modules/dcbot/proactivebits/newroundstarted.dm b/modular_causticcove/code/modules/dcbot/proactivebits/newroundstarted.dm
index 858d3e2d83f..e26af7b0d44 100644
--- a/modular_causticcove/code/modules/dcbot/proactivebits/newroundstarted.dm
+++ b/modular_causticcove/code/modules/dcbot/proactivebits/newroundstarted.dm
@@ -4,7 +4,7 @@
 		var/list/actors = list()
 		var/list/sortedActors = get_sorted_actors_list()
 		for(var/X in sortedActors)
-			actors += ("[sortedActors[X]["data"]["name"]]" + " as " + "[sortedActors[X]["data"]["rank"]]")
+			actors += ("\n[sortedActors[X]["data"]["name"]]" + " as " + "[sortedActors[X]["data"]["rank"]]")
 		
 		var/data = "?actors=" + url_encode(json_encode(list(actors))) + "&totalplayers=[GLOB.clients.len]"
 		var/list/response = world.Export(constring + data)
diff --git a/modular_causticcove/code/modules/dcbot/topichandlers/fetchmanifest.dm b/modular_causticcove/code/modules/dcbot/topichandlers/fetchmanifest.dm
index 1a8185a6fd8..a5a6bf05a81 100644
--- a/modular_causticcove/code/modules/dcbot/topichandlers/fetchmanifest.dm
+++ b/modular_causticcove/code/modules/dcbot/topichandlers/fetchmanifest.dm
@@ -6,5 +6,5 @@
 	var/dat
 	var/list/sortedActors = get_sorted_actors_list()
 	for(var/X in sortedActors)
-		dat += ("[sortedActors[X]["data"]["name"]]" + " as " + "[sortedActors[X]["data"]["rank"]]")
+		dat += ("[sortedActors[X]["data"]["name"]]" + " as " + "[sortedActors[X]["data"]["rank"]]\n")
 	return dat
diff --git a/modular_causticcove/code/modules/vices/combat_adverse.dm b/modular_causticcove/code/modules/vices/combat_adverse.dm
new file mode 100644
index 00000000000..799f8393007
--- /dev/null
+++ b/modular_causticcove/code/modules/vices/combat_adverse.dm
@@ -0,0 +1,62 @@
+/datum/stressevent/cablood
+	timer = 20 SECONDS
+	stressadd = 3
+	desc = span_red("There is so much blood around... What happened here?!")
+
+/datum/stressevent/caincombat
+	timer = 30 SECONDS
+	stressadd = 5
+	desc = span_red("I'm in the heat of battle! I need to get to safety!")
+
+/datum/stressevent/cawornblood
+	timer = 1 MINUTES
+	stressadd = 2
+	max_stacks = 3
+	stressadd_per_extra_stack = 1
+	desc = span_red("I got blood all over my clothes! I need to get it off of me!")
+
+/datum/charflaw/combat_adverse
+	name = "Combat Adverse"
+	desc = "I really do not enjoy fighting or combat. Blood and extended battles really stress me out."
+	var/last_check = 0
+	var/last_gear_check = 0
+	var/combat_mode_ticks = 0
+
+/datum/charflaw/combat_adverse/flaw_on_life(mob/user)
+	if(world.time < last_check + 10 SECONDS)
+		return
+	last_check = world.time
+	if(!user)
+		return
+	var/cnt = 0
+	for(var/obj/effect/decal/cleanable/blood/B in view(7, user)) //Run the check for blood around the player!
+		cnt++
+		if(cnt > 6)
+			break
+	if(cnt > 6)
+		user.add_stress(/datum/stressevent/cablood)
+	
+	var/mob/living/carbon/human/human_user = user //Cast to human!
+	if(!istype(human_user))
+		return
+
+	if(human_user.cmode) //Check if the player is in combat mode, and increment the ticker...
+		if(combat_mode_ticks < 3)
+			combat_mode_ticks++
+		else
+			user.add_stress(/datum/stressevent/caincombat) //If it hits 3 ticks, IE 30 seconds in combat mode, you are considered in the heat of battle!
+	else
+		combat_mode_ticks = 0 //Reset the counter when cmode is turned off!
+
+	if(world.time < last_gear_check + 30 SECONDS) //Run the gear check every 30 seconds instead of every 10, so for every 3 checks of the prior two, this one is checked 1 time
+		return
+	last_gear_check = world.time
+	cnt = 0
+	var/equipped = human_user.get_equipped_items()
+	for(var/obj/item/gear in equipped) //Check all worn gear (not held!) for if it currently has blood on it! If so, add a stack up to 3.
+		var/datum/component/decal/blood/bloodcomp = gear.GetComponent(/datum/component/decal/blood)
+		if(bloodcomp)
+			cnt++
+			user.add_stress(/datum/stressevent/cawornblood)
+		if(cnt > 2)
+			break
diff --git a/roguetown.dme b/roguetown.dme
index aea436f04d4..47eb6304e03 100644
--- a/roguetown.dme
+++ b/roguetown.dme
@@ -3062,6 +3062,7 @@
 #include "modular_causticcove\code\modules\spells\components\temper_clothing.dm"
 #include "modular_causticcove\code\modules\taurs\taur_bodyparts.dm"
 #include "modular_causticcove\code\modules\taurs\taur_markings.dm"
+#include "modular_causticcove\code\modules\vices\combat_adverse.dm"
 #include "modular_causticcove\code\modules\vices\mind_broken.dm"
 #include "modular_causticcove\code\modules\vices\bottomless\bottomless.dm"
 #include "modular_causticcove\code\modules\vices\bottomless\maxfood.dm"