Skip to content

Commit

Permalink
Silverscale statue destruction fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMelbert committed Jan 15, 2024
1 parent 74cfd92 commit 11966fd
Showing 1 changed file with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
statue.flags_ricochet |= RICOCHET_SHINY
RegisterSignal(statue, COMSIG_ATOM_ENTERED, PROC_REF(statue_entered))
RegisterSignal(statue, COMSIG_ATOM_EXITED, PROC_REF(statue_exited))
RegisterSignal(statue, COMSIG_OBJ_DECONSTRUCT, PROC_REF(statue_deconstructed))

/datum/action/item_action/organ_action/statue/Trigger(trigger_flags)
if(owner.loc != statue)
Expand Down Expand Up @@ -188,6 +189,17 @@
// Matches up dirs again, someone could've rotated our statue
lizard.setDir(statue.dir)

/datum/action/item_action/organ_action/statue/statue_destroyed(datum/source)
statue = null
qdel(src)

/datum/action/item_action/organ_action/statue/proc/statue_deconstructed(datum/source, disassembled)
SIGNAL_HANDLER
to_chat(owner, span_userdanger("You watch as your statue [disassembled ? "is broken apart" : "is taken apart, piece by piece"] - and with it, your life force!"))
statue.loc.visible_message(span_warning("[statue] shatters into dust!"))
owner.forceMove(statue.loc)
owner.dust(drop_items = TRUE)

Check failure on line 201 in maplestation_modules/code/modules/mob/living/carbon/human/species_types/silverscale.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined proc: "dust" on /mob

/datum/armor/silverscale_statue_armor
melee = 50
bullet = 50
Expand Down

0 comments on commit 11966fd

Please sign in to comment.