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

2019-11-25 21:01:25 -06:00
parent f9b632019b 56bdb36058
commit cc54e5230f
654 changed files with 4610 additions and 2805 deletions
@@ -315,6 +315,11 @@
 	randomdir = 0
 	duration = 6

+/obj/effect/temp_visual/desynchronizer
+	name = "desynchronizer field"
+	icon_state = "chronofield"
+	duration = 3
+
 /obj/effect/temp_visual/impact_effect
 	icon_state = "impact_bullet"
 	duration = 5