From 20de45cd7ec28b7c73cf14ad798c7ef7d0aad3bf Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Sun, 10 Jan 2021 16:49:43 +0000
Subject: [PATCH] Update corpse.dm

---
 code/modules/awaymissions/corpse.dm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 2884d0feaf4..6aa06ef4ec2 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -246,18 +246,6 @@
 	corpsesuit = /obj/item/clothing/suit/space/void/mining
 	corpsemask = /obj/item/clothing/mask/breath
 	corpsehelmet = /obj/item/clothing/head/helmet/space/void/mining
-<<<<<<< HEAD
-	
-//VORESTATION ADD START
-/obj/effect/landmark/corpse/vintage/pilot
-	name = "Pilot"
-	corpseuniform = /obj/item/clothing/under/color/grey
-	corpsesuit = /obj/item/clothing/suit/space/void/refurb/pilot
-	corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/pilot
-	corpseshoes = /obj/item/clothing/shoes/black
-	corpseback = /obj/item/weapon/tank/oxygen
-//VORESTATION ADD END
-=======
 	corpseback = /obj/item/weapon/tank/oxygen
 	
 /////////////////Vintage//////////////////////
@@ -272,7 +260,6 @@
 	corpseback = /obj/item/weapon/tank/oxygen
 	corpseid = 1
 	corpseidjob = "Crewmate"
->>>>>>> 831bd68... corpse landmarks update (#7801)
 
 /obj/effect/landmark/corpse/vintage/engineering
 	name = "Unknown Engineer"