The Corpsening

code/game/objects/effects/landmarks/corpsespawner.dm

@@ -16,20 +16,6 @@
 	GLOB.corpse_spawns -= src
 	return ..()
 
-/obj/effect/landmark/corpsespawner/realpirate
-	name = "Pirate"
-	equip_path = /datum/equipment_preset/corpse/realpirate
-
-/obj/effect/landmark/corpsespawner/realpirate/ranged
-	name = "Pirate Gunner"
-	equip_path = /datum/equipment_preset/corpse/realpirate/ranged
-
-/obj/effect/landmark/corpsespawner/russian
-	name = "Russian"
-	equip_path = /datum/equipment_preset/corpse/russian
-
-/obj/effect/landmark/corpsespawner/russian/ranged
-
 ///////////Civilians//////////////////////
 
 /obj/effect/landmark/corpsespawner/prisoner
@@ -57,43 +43,50 @@
 	equip_path = /datum/equipment_preset/corpse/miner
 
 /obj/effect/landmark/corpsespawner/security
-	name = "Security"
+	name = "Security Officer"
 	equip_path = /datum/equipment_preset/corpse/security
 
 /obj/effect/landmark/corpsespawner/security/marshal
-	name = "Colonial Marshal"
-	equip_path = /datum/equipment_preset/corpse/security/marshal
+	name = "Colonial Marshal Deputy"
+	equip_path = /datum/equipment_preset/corpse/security/cmb
 
 /obj/effect/landmark/corpsespawner/security/liaison
 	name = "Corporate Liaison"
-	equip_path = /datum/equipment_preset/corpse/security/liaison
+	equip_path = /datum/equipment_preset/corpse/liaison
 
 /obj/effect/landmark/corpsespawner/prison_security
 	name = "Prison Guard"
-	equip_path = /datum/equipment_preset/corpse/prison_security
+	equip_path = /datum/equipment_preset/corpse/prison_guard
 
 /////////////////Officers//////////////////////
 
 /obj/effect/landmark/corpsespawner/bridgeofficer
-	name = "Staff Officer"
-	equip_path = /datum/equipment_preset/corpse/bridgeofficer
+	name = "Colony Division Manager"
+	equip_path = /datum/equipment_preset/corpse/manager
 
-/obj/effect/landmark/corpsespawner/bridgeofficer/johnson
-	name = "Mr. Johnson Telovin"
-	equip_path = /datum/equipment_preset/corpse/bridgeofficer/johnson
+/obj/effect/landmark/corpsespawner/administrator
+	name = "Colony Administrator"
+	equip_path = /datum/equipment_preset/corpse/administrator
 
-/obj/effect/landmark/corpsespawner/commander
-	name = "Commanding Officer"
-	equip_path = /datum/equipment_preset/corpse/commander
+/obj/effect/landmark/corpsespawner/administrator/burst
+	name = "Burst Colony Administrator"
+	equip_path = /datum/equipment_preset/corpse/administrator/burst
 
 /obj/effect/landmark/corpsespawner/wysec
 	name = "Weyland-Yutani Corporate Security Guard"
 	equip_path = /datum/equipment_preset/corpse/wysec
 
 /obj/effect/landmark/corpsespawner/wygoon
-	name = "Weyland-Yutani Corporate Security Goon"
+	name = "Weyland-Yutani Corporate Security Officer"
 	equip_path = /datum/equipment_preset/corpse/pmc/goon
 
+/obj/effect/landmark/corpsespawner/wygoon/lead
+	name = "Weyland-Yutani Corporate Security Lead"
+	equip_path = /datum/equipment_preset/corpse/pmc/goon/lead
+
+/obj/effect/landmark/corpsespawner/wygoon/lead/burst
+	name = "Burst Weyland-Yutani Corporate Security Lead"
+	equip_path = /datum/equipment_preset/corpse/pmc/goon/lead/burst
 
 ///CM specific jobs///
 
@@ -165,15 +158,29 @@
 	equip_path = /datum/equipment_preset/corpse/pmc/burst
 
 /obj/effect/landmark/corpsespawner/freelancer
-	name = "Freelancer Mercenary"
+	name = "Freelancer"
 	equip_path = /datum/equipment_preset/corpse/freelancer
 
 /obj/effect/landmark/corpsespawner/freelancer/burst
-	name = "Burst Freelancer Mercenary"
+	name = "Burst Freelancer"
 	equip_path = /datum/equipment_preset/corpse/freelancer/burst
 
 // Fun Faction Corpse
 
+/obj/effect/landmark/corpsespawner/realpirate
+	name = "Pirate"
+	equip_path = /datum/equipment_preset/corpse/realpirate
+
+/obj/effect/landmark/corpsespawner/realpirate/ranged
+	name = "Pirate Gunner"
+	equip_path = /datum/equipment_preset/corpse/realpirate/ranged
+
+/obj/effect/landmark/corpsespawner/russian
+	name = "Russian"
+	equip_path = /datum/equipment_preset/corpse/russian
+
+/obj/effect/landmark/corpsespawner/russian/ranged
+
 /obj/effect/landmark/corpsespawner/dutchrifle
 	name = "Dutch Dozen Rifleman"
 	equip_path = /datum/equipment_preset/corpse/dutchrifle