From 0b9ed099654216611a1574a42fd72f3da6d26bbc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 19 Apr 2017 14:06:44 -0500 Subject: [PATCH] Fixes a nullrod runtime --- code/modules/jobs/job_types/civilian_chaplain.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm index 4fc532e6d5..19ae279c50 100644 --- a/code/modules/jobs/job_types/civilian_chaplain.dm +++ b/code/modules/jobs/job_types/civilian_chaplain.dm @@ -31,7 +31,8 @@ Chaplain B.item_state = SSreligion.bible_item_state to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [SSreligion.deity]. Defer to the Chaplain.") H.equip_to_slot_or_del(B, slot_in_backpack) - var/obj/item/weapon/nullrod/N = new SSreligion.holy_weapon_type(H) + var/nrt = SSreligion.holy_weapon_type || /obj/item/weapon/nullrod + var/obj/item/weapon/nullrod/N = new nrt(H) H.equip_to_slot_or_del(N, slot_in_backpack) return @@ -92,4 +93,4 @@ Chaplain uniform = /obj/item/clothing/under/rank/chaplain backpack_contents = list(/obj/item/device/camera/spooky = 1) backpack = /obj/item/weapon/storage/backpack/cultpack - satchel = /obj/item/weapon/storage/backpack/cultpack \ No newline at end of file + satchel = /obj/item/weapon/storage/backpack/cultpack