From 5a448d9cd595073ceb9daa94214d68dc026af020 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 3 Jul 2018 22:13:12 -0700 Subject: [PATCH] Merge pull request #5387 from Hawk-v3/master Chaplain PDA Bug Fix & Atmos Dedupe --- code/game/jobs/job/civilian_chaplain.dm | 2 ++ code/game/objects/items/weapons/storage/belt.dm | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 2eece781ec8..e24e462fdf0 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -149,5 +149,7 @@ feedback_set_details("religion_book","[new_book_style]") return 1 +/* If you uncomment this, every time the mob preview updates it makes a new PDA. It seems to work just fine and display without it, so why this exists, haven't a clue. -Hawk /datum/job/chaplain/equip_preview(var/mob/living/carbon/human/H, var/alt_title) return equip(H, alt_title, FALSE) +*/ diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 633b4dc6562..72ce933da3a 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -87,7 +87,6 @@ /obj/item/weapon/weldingtool, /obj/item/weapon/crowbar, /obj/item/weapon/wirecutters, - /obj/item/device/t_scanner ) /obj/item/weapon/storage/belt/utility/chief