From 2feab0a4110262b235fb86d376a402e25ae6a0fd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 5 Jun 2017 23:18:40 -0500
Subject: [PATCH] cleanup

---
 code/game/objects/items/weapons/storage/belt.dm   | 10 +++++-----
 .../objects/items/weapons/storage/belt.dm.rej     | 10 ----------
 tgstation.dme                                     |  2 ++
 tgstation.dme.rej                                 | 15 ---------------
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 code/game/objects/items/weapons/storage/belt.dm.rej
 delete mode 100644 tgstation.dme.rej

diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index f2e9ca9fc6..53e1a591de 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -200,7 +200,7 @@
 		/obj/item/weapon/storage/pill_bottle,
 		/obj/item/weapon/ore,
 		/obj/item/weapon/reagent_containers/food/drinks,
-		/obj/item/organ/hivelord_core,
+		/obj/item/organ/regenerative_core,
 		/obj/item/device/wormhole_jaunter,
 		/obj/item/weapon/storage/bag/plants,
 
@@ -247,10 +247,10 @@
 		)
 
 /obj/item/weapon/storage/belt/military
-	name = "chest rig"
-	desc = "A set of tactical webbing worn by Syndicate boarding parties."
-	icon_state = "explorer1"
-	item_state = "explorer1"
+	name = "chest rig"
+	desc = "A set of tactical webbing worn by Syndicate boarding parties."
+	icon_state = "explorer1"
+	item_state = "explorer1"
 	max_w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/weapon/storage/belt/military/abductor
diff --git a/code/game/objects/items/weapons/storage/belt.dm.rej b/code/game/objects/items/weapons/storage/belt.dm.rej
deleted file mode 100644
index 7057ccddec..0000000000
--- a/code/game/objects/items/weapons/storage/belt.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm	(rejected hunks)
-@@ -200,7 +200,7 @@
- 		/obj/item/weapon/storage/pill_bottle,
- 		/obj/item/weapon/ore,
- 		/obj/item/weapon/reagent_containers/food/drinks,
--		/obj/item/organ/hivelord_core,
-+		/obj/item/organ/regenerative_core,
- 		/obj/item/device/wormhole_jaunter,
- 		/obj/item/weapon/storage/bag/plants,
- 		/obj/item/stack/marker_beacon
diff --git a/tgstation.dme b/tgstation.dme
index b3613ec1f9..642499895a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1487,9 +1487,11 @@
 #include "code\modules\mining\satchel_ore_boxdm.dm"
 #include "code\modules\mining\shelters.dm"
 #include "code\modules\mining\equipment\explorer_gear.dm"
+#include "code\modules\mining\equipment\goliath_hide.dm"
 #include "code\modules\mining\equipment\kinetic_crusher.dm"
 #include "code\modules\mining\equipment\lazarus_injector.dm"
 #include "code\modules\mining\equipment\mineral_scanner.dm"
+#include "code\modules\mining\equipment\regenerative_core.dm"
 #include "code\modules\mining\equipment\resonator.dm"
 #include "code\modules\mining\equipment\vendor_items.dm"
 #include "code\modules\mining\equipment\wormhole_jaunter.dm"
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
deleted file mode 100644
index 6df2de4244..0000000000
--- a/tgstation.dme.rej
+++ /dev/null
@@ -1,15 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -1446,11 +1446,13 @@
- #include "code\modules\mining\satchel_ore_boxdm.dm"
- #include "code\modules\mining\shelters.dm"
- #include "code\modules\mining\equipment\explorer_gear.dm"
-+#include "code\modules\mining\equipment\goliath_hide.dm"
- #include "code\modules\mining\equipment\kinetic_crusher.dm"
- #include "code\modules\mining\equipment\lazarus_injector.dm"
- #include "code\modules\mining\equipment\marker_beacons.dm"
- #include "code\modules\mining\equipment\mineral_scanner.dm"
- #include "code\modules\mining\equipment\mining_tools.dm"
-+#include "code\modules\mining\equipment\regenerative_core.dm"
- #include "code\modules\mining\equipment\resonator.dm"
- #include "code\modules\mining\equipment\survival_pod.dm"
- #include "code\modules\mining\equipment\vendor_items.dm"