From 13853ac6bf38442d71d1d1cbbda4c64fab5a8bc5 Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 10 Jun 2019 10:16:32 -0400 Subject: [PATCH] removes family gavel, readds briefcase --- code/datums/traits/negative.dm | 2 +- code/game/objects/items/courtroom.dm | 4 ---- code/game/objects/items/storage/briefcase.dm | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c7b1a34755..43be1fa2a7 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -52,7 +52,7 @@ if("Atmospheric Technician") heirloom_type = /obj/item/extinguisher/mini/family if("Lawyer") - heirloom_type = /obj/item/gavelhammer/family + heirloom_type = /obj/item/storage/briefcase/lawyer/family if("Janitor") heirloom_type = /obj/item/mop if("Security Officer") diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index 04ab83b106..c0e81ed3d5 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -13,10 +13,6 @@ attack_verb = list("bashed", "battered", "judged", "whacked") resistance_flags = FLAMMABLE -/obj/item/gavelhammer/family - name = "gavel hammer" - desc = "The gavel of your forefathers. Treat with care." - /obj/item/gavelhammer/suicide_act(mob/user) user.visible_message("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index f4f386b7d0..002190c341 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -40,7 +40,8 @@ /obj/item/storage/briefcase/lawyer/family name = "battered briefcase" - desc = "An old briefcase, this one has seen better days in its time. It's clear they don't make them nowadays as good as they used to. The corners are modified with metal trim adding in weight!" + desc = "An old briefcase, this one has seen better days in its time. It's clear they don't make them nowadays as good as they used to. Comes with an added belt clip!" + slot_flags = ITEM_SLOT_BELT /obj/item/storage/briefcase/lawyer/family/PopulateContents() new /obj/item/stamp/law(src)