Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

2019-12-17 20:21:49 -06:00
parent 1d3fdad459 8b61c07713
commit 70e50e57cd
681 changed files with 11917 additions and 3314 deletions
@@ -446,3 +446,10 @@
 			animate(src, alpha = 0, transform = skew, time = duration)
 	else
 		return INITIALIZE_HINT_QDEL
+
+/obj/effect/temp_visual/slugboom
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "slugboom"
+	randomdir = FALSE
+	duration = 30
+	pixel_x = -24
@@ -36,3 +36,7 @@

 /obj/effect/projectile/impact/wormhole
 	icon_state = "wormhole_g"
+
+/obj/effect/projectile/impact/laser/wavemotion
+	name = "particle impact"
+	icon_state = "impact_wavemotion"
@@ -28,3 +28,7 @@

 /obj/effect/projectile/muzzle/wormhole
 	icon_state = "wormhole_g"
+
+/obj/effect/projectile/muzzle/laser/wavemotion
+	name = "particle backblast"
+	icon_state = "muzzle_wavemotion"
@@ -66,3 +66,7 @@

 /obj/effect/projectile/tracer/wormhole
 	icon_state = "wormhole_g"
+
+/obj/effect/projectile/tracer/laser/wavemotion
+	name = "particle trail"
+	icon_state = "tracer_wavemotion"