shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace all secondary flags with bitflags stored in the flags_2 var

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/dirtystation.dm
+2 -2
View File
@@ -11,7 +11,7 @@
if(prob(66)) //fastest possible exit 2/3 of the time
return
if(!(flags & CAN_BE_DIRTY))
if(!(flags_1 & CAN_BE_DIRTY_1))
return
if(locate(/obj/structure/grille) in contents)
@@ -19,7 +19,7 @@
var/area/A = get_area(src)
if(A && !(A.flags & CAN_BE_DIRTY))
if(A && !(A.flags_1 & CAN_BE_DIRTY_1))
return
//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
code/game/turfs/simulated/floor/fancy_floor.dm
+1 -1
View File
@@ -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()
..()
code/game/turfs/simulated/floor/fancy_floor.dm.rej
+10
View File
@@ -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"
code/game/turfs/simulated/floor/plating/asteroid.dm
+1 -1
View File
@@ -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"
code/game/turfs/simulated/floor/plating/misc_plating.dm
+1 -1
View File
@@ -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)
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -1
View File
@@ -175,7 +175,7 @@
desc = "A light-weight titanium wall used in shuttles."
icon = 'icons/turf/walls/shuttle_wall.dmi'
icon_state = "map-shuttle"
flags = CAN_BE_DIRTY | CHECK_RICOCHET
flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)