Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
@@ -141,7 +141,7 @@
 	broken_states = list("damaged")
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/turf/open/floor/carpet)
-	flags = NONE
+	flags_1 = NONE

 /turf/open/floor/carpet/Initialize()
 	..()
@@ -0,0 +1,10 @@
+diff a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm	(rejected hunks)
+@@ -66,7 +66,7 @@
+ 	icon_state = "grass"
+ 	floor_tile = /obj/item/stack/tile/grass
+ 	broken_states = list("sand")
+-	flags = NONE
+	flags_1 = NONE
+ 	var/ore_type = /obj/item/ore/glass
+ 	var/turfverb = "uproot"
+ 
@@ -328,7 +328,7 @@
 	slowdown = 2
 	environment_type = "snow"
 	sand_type = /obj/item/stack/sheet/mineral/snow
-	flags = NONE
+	flags_1 = NONE

 /turf/open/floor/plating/asteroid/snow/airless
 	initial_gas_mix = "TEMP=2.7"
@@ -80,7 +80,7 @@
 /turf/open/floor/plating/beach
 	name = "beach"
 	icon = 'icons/misc/beach.dmi'
-	flags = NONE
+	flags_1 = NONE

 /turf/open/floor/plating/beach/ex_act(severity, target)
 	contents_explosion(severity, target)