cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate courtroom items to the new attack chain. (#32216)

Browse Source 
* 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 <alfalfascout@users.noreply.github.com>

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add commas.

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
This commit is contained in:
Alan
2026-07-17 06:21:43 +00:00
committed by GitHub
co-authored by CRUNCH
parent 59ee534680
commit fac686542f
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/courtroom.dm
+14 -4
View File
@@ -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