Merge branch 'master' into upstream-merge-29859

2017-08-29 21:14:45 -07:00
parent b9c58a2914 0b82132443
commit 175224c5de
238 changed files with 5 additions and 3648 deletions
@@ -1,10 +0,0 @@
-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"
-