shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #482 from Citadel-Station-13/upstream-merge-26360

Browse Source 
[MIRROR] Fixes a nullrod runtime
This commit is contained in:
LetterJay
2017-04-19 18:31:55 -05:00
committed by GitHub
parent ce4c2428a8 0b9ed09965
commit 97e6297a00
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/civilian_chaplain.dm
+3 -2
View File
@@ -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
satchel = /obj/item/weapon/storage/backpack/cultpack