diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index ec8bfc2335..7e90647c23 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -44,45 +44,29 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 /datum/quirk/family_heirloom/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/heirloom_type
-	switch(quirk_holder.mind.assigned_role)
-		if("Scribe")
-			heirloom_type = pick(/obj/item/trash/f13/electronic/toaster, /obj/item/screwdriver/crude, /obj/item/toy/tragicthegarnering)
-		if("Knight")
-			heirloom_type = /obj/item/gun/ballistic/automatic/toy/pistol
-		if("BoS Off-Duty")
-			heirloom_type = /obj/item/toy/figure/borg
-		if("Sheriff")
+	if(quirk_holder.mind.assigned_role)
+		if(quirk_holder.mind.assigned_role in list("Elder", "Head Paladin", "Paladin", "Head Knight", "Senior Knight", "Knight", "Head Scribe", "Scribe", "Lancer", "Initiate", "BoS Off-Duty"))
+			heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog, /obj/item/trash/f13/electronic/toaster)
+		if(quirk_holder.mind.assigned_role in list("Enclave Lieutenant", "Enclave Gunnery Sergeant", "Enclave Pilot", "Enclave Sergeant", "Enclave Armored Infantry", "Enclave Specialist", "Enclave Scientist", "Enclave Private", "Enclave Bunker Duty"))
+			heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog/enclave, /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/lighter, /obj/item/toy/cards/deck)
+		if(quirk_holder.mind.assigned_role in list("High Priest", "Servitor", "Acolyte", "Neophyte"))
+			heirloom_type = pick(/obj/item/book/manual/thebook, /obj/item/book/manual/ritualbook)
+		if(quirk_holder.mind.assigned_role in list("NCR Captain", "NCR Lieutenant", "NCR Staff Sergeant", "NCR Veteran Ranger", "NCR Representative", "NCR Ranger", "NCR Heavy Trooper", "NCR Military Police", "NCR Pilot", "NCR Sergeant", "NCR Corporal", "NCR Combat Medic", "NCR Combat Engineer", "NCR Trooper", "NCR Medical Officer", "NCR Off-Duty"))
+			heirloom_type = pick(/obj/item/melee/onehanded/knife/bayonet, /obj/item/lighter, /obj/item/toy/cards/deck, /obj/item/card/id/rusted)
+		if(quirk_holder.mind.assigned_role in list("Legion Centurion", "Legion Frumentarius", "Legion Veteran Decanus", "Legion Prime Decanus", "Legion Recruit Decanus", "Legion Vexillarius", "Legion Explorer", "Veteran Legionary", "Prime Legionary", "Recruit Legionary"))
+			heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/card/id/rusted/rustedmedallion, /obj/item/clothing/accessory/talisman,/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/warpaint_bowl)
+		if(quirk_holder.mind.assigned_role == "Militia Commander")
 			heirloom_type = /obj/item/clothing/accessory/medal/silver
-		if("Deputy")
+		if(quirk_holder.mind.assigned_role == "Militian")
 			heirloom_type = /obj/item/clothing/accessory/medal/bronze_heart
-		if("Shopkeeper")
+		if(quirk_holder.mind.assigned_role == "Merchant")
 			heirloom_type = /obj/item/coin/plasma
-		if("Followers Doctor")
-			heirloom_type = pick(/obj/item/clothing/neck/stethoscope,/obj/item/toy/tragicthegarnering)
-		if("Followers Administrator")
-			heirloom_type = pick(/obj/item/toy/nuke, /obj/item/wrench/medical, /obj/item/clothing/neck/tie/horrible)
-		if("Prime Legionary")
-			heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/clothing/accessory/talisman, /obj/item/toy/plush/mr_buckety)
-		if("Recruit Legionary")
-			heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/clothing/accessory/talisman,/obj/item/clothing/accessory/skullcodpiece/fake)
-		if("Den Mob Boss")
+		if(quirk_holder.mind.assigned_role == "Den Mob Boss")
 			heirloom_type = /obj/item/lighter/gold
-		if("Den Doctor")
+		if(quirk_holder.mind.assigned_role == "Den Doctor")
 			heirloom_type = /obj/item/card/id/dogtag/MDfakepermit
-		if("Farmer")
-			heirloom_type = pick(/obj/item/hatchet, /obj/item/shovel/spade, /obj/item/toy/plush/beeplushie)
-		if("Janitor")
-			heirloom_type = /obj/item/mop
-		if("Security Officer")
-			heirloom_type = /obj/item/clothing/accessory/medal/silver/valor
-		if("Scientist")
-			heirloom_type = /obj/item/toy/plush/slimeplushie
-		if("Assistant")
-			heirloom_type = /obj/item/clothing/gloves/cut/family
-		if("Chaplain")
-			heirloom_type = /obj/item/camera/spooky/family
-		if("Captain")
-			heirloom_type = /obj/item/clothing/accessory/medal/gold/captain/family
+		if(quirk_holder.mind.assigned_role == "Tribal")
+			heirloom_type = pick(/obj/item/clothing/accessory/skullcodpiece/fake, /obj/item/clothing/accessory/talisman, /obj/item/warpaint_bowl) 
 	if(!heirloom_type)
 		heirloom_type = pick(
 		/obj/item/toy/cards/deck,
@@ -90,8 +74,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 		/obj/item/card/id/rusted,
 		/obj/item/card/id/rusted/fadedvaultid,
 		/obj/item/clothing/gloves/ring/silver,
-		/obj/item/toy/figure/detective,
-		/obj/item/toy/tragicthegarnering,
 		)
 	heirloom = new heirloom_type(get_turf(quirk_holder))
 	GLOB.family_heirlooms += heirloom
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
index cf79054e81..dce603ad6c 100644
--- a/code/game/objects/effects/spawners/f13lootdrop.dm
+++ b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -1590,7 +1590,7 @@
 	name = "r84 spawner"
 	items = list(
 		/obj/item/gun/ballistic/automatic/r84,
-		/obj/item/ammo_box/magazine/m556/rifle/extended/
+		/obj/item/ammo_box/magazine/lmg
 	)
 
 /obj/effect/spawner/bundle/f13/bozar
diff --git a/icons/fallout/mobs/monsters/deathclaw.dmi b/icons/fallout/mobs/monsters/deathclaw.dmi
index 7044f204b4..526f957290 100644
Binary files a/icons/fallout/mobs/monsters/deathclaw.dmi and b/icons/fallout/mobs/monsters/deathclaw.dmi differ