Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
@@ -86,8 +86,8 @@
 	transform = matrix()*2
 	var/matrix/M = transform
 	M.Turn(90)
-	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL)
-	animate(src, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL)
+	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+	animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)

 /obj/effect/temp_visual/ratvar/ocular_warden
 	name = "warden's gaze"
@@ -65,8 +65,8 @@
 	var/matrix/M = transform
 	M.Turn(turnedness)
 	transform = M
-	animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL)
-	animate(src, transform = oldtransform, time = duration, flags_1 = ANIMATION_PARALLEL)
+	animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+	animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL)

 /obj/effect/temp_visual/cult/rune_spawn/rune1
 	icon_state = "rune1words"
@@ -377,7 +377,7 @@
 		M = size_matrix*0.1
 	else
 		M = size_matrix*2
-	animate(src, alpha = 20, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL)
+	animate(src, alpha = 20, transform = M, time = duration, flags = ANIMATION_PARALLEL)

 /obj/effect/temp_visual/bleed/explode
 	icon_state = "bleed10"