From fac686542f1150b96e52a1049a2a5913fa86b0a2 Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 17 Jul 2026 02:21:43 -0400 Subject: [PATCH] Migrate courtroom items to the new attack chain. (#32216) * Migrate courtroom items to the new attack chain. * Apply suggestion from CRUNCH review Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan * Apply suggestion from CRUNCH review Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan * Add commas. * Apply suggestion from CRUNCH review Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan * Add fingerprints. --------- Signed-off-by: Alan Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --- code/game/objects/items/courtroom.dm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index 14a0dc4cfc7..f2fa7655558 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -11,6 +11,7 @@ w_class = WEIGHT_CLASS_SMALL attack_verb = list("bashed", "battered", "judged", "whacked") resistance_flags = FLAMMABLE + new_attack_chain = TRUE /obj/item/gavelhammer/suicide_act(mob/user) user.visible_message(SPAN_SUICIDE("[user] has sentenced [user.p_themselves()] to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -26,11 +27,20 @@ w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE var/next_gavel_hit + new_attack_chain = TRUE -/obj/item/gavelblock/attackby__legacy__attackchain(obj/item/I, mob/user, params) - if(!istype(I, /obj/item/gavelhammer)) - return +/obj/item/gavelblock/item_interaction(mob/living/user, obj/item/used, list/modifiers) + if(!istype(used, /obj/item/gavelhammer)) + return ..() if(world.time > next_gavel_hit) playsound(loc, 'sound/items/gavel.ogg', 100, 1) next_gavel_hit = world.time + 5 SECONDS - user.visible_message(SPAN_WARNING("[user] strikes \the [src] with \the [I].")) + user.visible_message( + SPAN_WARNING("[user] strikes [src] with [used]!"), + SPAN_NOTICE("You strike [src] with [used]."), + SPAN_HEAR("You hear a gavel banging!") + ) + add_fingerprint(user) + used.add_fingerprint(user) + return ITEM_INTERACT_COMPLETE +