From 36399d3cb9fcb7f282d1b0f211cfe0aa79e86b0e Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Mon, 21 Nov 2016 10:48:28 +0000 Subject: [PATCH] fixed floorlayer compile errors, added can_burn to wood floors (#18) Fixes some compile errors with the floor layer, and adds the can_burn tag to wooden floors. For some reason tiles had it and wood didnt --- code/game/machinery/floorlayer.dm | 4 ++-- code/game/turfs/flooring/flooring.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/floorlayer.dm b/code/game/machinery/floorlayer.dm index fd9907f85c7..70a49a74b35 100644 --- a/code/game/machinery/floorlayer.dm +++ b/code/game/machinery/floorlayer.dm @@ -84,9 +84,9 @@ var/turf/simulated/floor/T = new_turf if(!T.is_plating()) if(!T.broken && !T.burnt) - new T.floor_type(T) + new T.flooring.build_type() T.make_plating() - return !new_turf.intact + return T.is_plating() return 0 /obj/machinery/floorlayer/proc/TakeNewStack() diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 0932ae560ff..03534d65760 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -143,7 +143,7 @@ var/list/flooring_types damage_temperature = T0C+200 descriptor = "planks" build_type = /obj/item/stack/tile/wood - flags = TURF_CAN_BREAK | TURF_IS_FRAGILE | TURF_REMOVE_SCREWDRIVER + flags = TURF_CAN_BREAK | TURF_IS_FRAGILE | TURF_REMOVE_SCREWDRIVER | TURF_CAN_BURN /decl/flooring/reinforced name = "reinforced floor"