Resolved conflicts:

code/modules/mob/mob.dm

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -197,7 +197,7 @@
 	New()
 		..()
 		sleep(2)
-		new /obj/item/clothing/under/det(src)
+		new /obj/item/clothing/under/rank/det(src)
 		new /obj/item/clothing/suit/det_suit(src)
 		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/head/det_hat(src)

code/game/objects/structures/morgue.dm

@@ -240,10 +240,6 @@
 			return
 
 	else
-		if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear)))
-			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
-			return
-
 		for (var/mob/M in viewers(src))
 			M.show_message("\red You hear a roar as the crematorium activates.", 1)