From 213bd2fc6b1daa72e3df86da5de775993364194b Mon Sep 17 00:00:00 2001
From: Linzolle <linzolle@gmail.com>
Date: Thu, 12 Sep 2019 23:35:21 -0500
Subject: [PATCH] fixes

---
 _maps/map_files/generic/CentCom.dmm          | 4 ++--
 code/game/objects/effects/spawners/bundle.dm | 2 +-
 code/game/objects/items/holy_weapons.dm      | 7 +------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index f2e0599ae6..bd23d5a98b 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1264,9 +1264,9 @@
 /area/holodeck/rec_center/chapelcourt)
 "dw" = (
 /obj/structure/table/wood/fancy,
-/obj/item/clothing/suit/nun,
+/obj/item/clothing/suit/chaplain/nun,
 /obj/item/clothing/head/nun_hood,
-/obj/item/clothing/suit/holidaypriest,
+/obj/item/clothing/suit/chaplain/holidaypriest,
 /turf/open/floor/holofloor{
 	dir = 8;
 	icon_state = "dark"
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index 2fe8d2a460..b9acba70d9 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -133,7 +133,7 @@
 /obj/effect/spawner/bundle/costume/holiday_priest
 	name = "holiday priest costume spawner"
 	items = list(
-		/obj/item/clothing/suit/holidaypriest)
+		/obj/item/clothing/suit/chaplain/holidaypriest)
 
 /obj/effect/spawner/bundle/costume/marisawizard
 	name = "marisa wizard costume spawner"
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 109b0bf78a..5e8250ea00 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -247,12 +247,7 @@
 	if(GLOB.holy_weapon_type)
 		return
 	var/obj/item/holy_weapon
-	var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list(
-	/obj/item/twohanded/dualsaber/hypereutactic/chaplain,
-	/obj/item/gun/energy/laser/redtag/hitscan/chaplain,
-	/obj/item/multitool/chaplain,
-	/obj/item/melee/baseball_bat/chaplain
-	)
+	var/list/holy_weapons_list = subtypesof(/obj/item/nullrod) + list(HOLY_WEAPONS)
 	var/list/display_names = list()
 	for(var/V in holy_weapons_list)
 		var/obj/item/nullrod/rodtype = V