From 9368c1f5a9e888d3299f02642da502123fd3dc1d Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 23 Nov 2014 17:27:05 +0100 Subject: [PATCH] Adding sparks, sound and messages when a bluespace crystal is crushed or thrown. Fixes the crushing message appearing after the mob is teleported when it should appear before. --- code/modules/telesci/bscrystal.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 4cbb4573dc5..9249d0c9ccd 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -9,15 +9,19 @@ origin_tech = "bluespace=4;materials=3" var/blink_range = 8 // The teleport range when crushed/thrown at someone. + /obj/item/bluespace_crystal/New() ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) + /obj/item/bluespace_crystal/attack_self(var/mob/user) + user.visible_message("[user] crushes [src]!") + new /obj/effect/effect/sparks(src.loc) + playsound(src.loc, "sparks", 50, 1) blink_mob(user) user.drop_item() - user.visible_message("[user] crushes the [src]!") qdel(src) /obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L) @@ -25,6 +29,9 @@ /obj/item/bluespace_crystal/throw_impact(atom/hit_atom) ..() + visible_message("[src] fizzles and disappears upon impact!") + new /obj/effect/effect/sparks(src.loc) + playsound(src.loc, "sparks", 50, 1) if(isliving(hit_atom)) blink_mob(hit_atom) qdel(src)