From 400ad0b03b5acd80d26cc13176b9caa76aff1a74 Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 10 Jun 2019 09:55:23 -0400 Subject: [PATCH] added family gavel --- code/datums/traits/negative.dm | 2 +- code/game/objects/items/courtroom.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 43be1fa2a7..c7b1a34755 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/storage/briefcase/lawyer/family + heirloom_type = /obj/item/gavelhammer/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 c0e81ed3d5..04ab83b106 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -13,6 +13,10 @@ 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)