From 8088ce38ccb4bf8fe3c0045dbb18bdcab53c46d8 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 25 Apr 2017 01:15:04 -0500
Subject: [PATCH] rej file cleanup

---
 .../map_files/Cerestation/cerestation.dmm.rej  | 18 ------------------
 _maps/map_files/TgStation/broken.rej           |  1 -
 .../living/carbon/human/human_defense.dm.rej   | 14 --------------
 tgstation.dme.rej                              | 11 -----------
 4 files changed, 44 deletions(-)
 delete mode 100644 _maps/map_files/Cerestation/cerestation.dmm.rej
 delete mode 100644 _maps/map_files/TgStation/broken.rej
 delete mode 100644 code/modules/mob/living/carbon/human/human_defense.dm.rej
 delete mode 100644 tgstation.dme.rej

diff --git a/_maps/map_files/Cerestation/cerestation.dmm.rej b/_maps/map_files/Cerestation/cerestation.dmm.rej
deleted file mode 100644
index 07dbf25750..0000000000
--- a/_maps/map_files/Cerestation/cerestation.dmm.rej
+++ /dev/null
@@ -1,18 +0,0 @@
-diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm	(rejected hunks)
-@@ -156169,11 +156302,11 @@ cKF
- cKF
- aaa
- aaa
--aaa
--aaa
--aaa
--btw
--aaa
-+cKF
-+cKF
-+cKF
-+cKF
-+cKF
- aaa
- aaa
- aaa
diff --git a/_maps/map_files/TgStation/broken.rej b/_maps/map_files/TgStation/broken.rej
deleted file mode 100644
index 8b13789179..0000000000
--- a/_maps/map_files/TgStation/broken.rej
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm.rej b/code/modules/mob/living/carbon/human/human_defense.dm.rej
deleted file mode 100644
index b62723dbc7..0000000000
--- a/code/modules/mob/living/carbon/human/human_defense.dm.rej
+++ /dev/null
@@ -1,14 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm	(rejected hunks)
-@@ -682,10 +682,10 @@
- 					status += "numb"
- 				if(status == "")
- 					status = "OK"
--				to_chat(src, " [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
-+				to_chat(src, "\t [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
- 
- 				for(var/obj/item/I in LB.embedded_objects)
--					to_chat(src, " <a href='byond://?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
-+					to_chat(src, "\t <a href='byond://?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
- 
- 			for(var/t in missing)
- 				to_chat(src, "<span class='boldannounce'>Your [parse_zone(t)] is missing!</span>")
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
deleted file mode 100644
index 320974d163..0000000000
--- a/tgstation.dme.rej
+++ /dev/null
@@ -1,11 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -656,8 +656,8 @@
- #include "code\game\objects\effects\mines.dm"
- #include "code\game\objects\effects\misc.dm"
- #include "code\game\objects\effects\overlays.dm"
--#include "code\game\objects\effects\proximity.dm"
- #include "code\game\objects\effects\portals.dm"
-+#include "code\game\objects\effects\proximity.dm"
- #include "code\game\objects\effects\spiders.dm"
- #include "code\game\objects\effects\step_triggers.dm"
- #include "code\game\objects\effects\wanted_poster.dm"