From b761ff5fcf360bc4b8ffad0cc58ca9e486658b91 Mon Sep 17 00:00:00 2001
From: Kelenius <kelenius@ya.ru>
Date: Sat, 6 Sep 2014 21:34:00 +0400
Subject: [PATCH] Fixes floor tiles

Laugh.
---
 code/TriDimension/Turfs.dm         | 10 ++++---
 code/game/turfs/simulated/floor.dm | 44 ++++++++++++++++--------------
 code/game/turfs/space/space.dm     | 10 ++++---
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/code/TriDimension/Turfs.dm b/code/TriDimension/Turfs.dm
index b68884a634..385c590092 100644
--- a/code/TriDimension/Turfs.dm
+++ b/code/TriDimension/Turfs.dm
@@ -112,10 +112,12 @@
 		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
 		if(L)
 			var/obj/item/stack/tile/plasteel/S = C
-			if (S.use(1))
-				del(L)
-				playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
-				S.build(src)
+			if (S.get_amount() < 1)
+				return
+			del(L)
+			playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+			S.build(src)
+			S.use(1)
 			return
 		else
 			user << "\red The plating is going to need some support."
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 85dbfa16c5..5a74c80b6f 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -508,27 +508,29 @@ turf/simulated/floor/proc/update_icon()
 		if(is_plating())
 			if(!broken && !burnt)
 				var/obj/item/stack/tile/T = C
-				if (T.use(1))
-					floor_tile = new T.type
-					intact = 1
-					if(istype(T,/obj/item/stack/tile/light))
-						var/obj/item/stack/tile/light/L = T
-						var/obj/item/stack/tile/light/F = floor_tile
-						F.state = L.state
-						F.on = L.on
-					if(istype(T,/obj/item/stack/tile/grass))
-						for(var/direction in cardinal)
-							if(istype(get_step(src,direction),/turf/simulated/floor))
-								var/turf/simulated/floor/FF = get_step(src,direction)
-								FF.update_icon() //so siding gets updated properly
-					else if(istype(T,/obj/item/stack/tile/carpet))
-						for(var/direction in list(1,2,4,8,5,6,9,10))
-							if(istype(get_step(src,direction),/turf/simulated/floor))
-								var/turf/simulated/floor/FF = get_step(src,direction)
-								FF.update_icon() //so siding gets updated properly
-					update_icon()
-					levelupdate()
-					playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+				if (T.get_amount() < 1)
+					return
+				floor_tile = new T.type
+				intact = 1
+				if(istype(T,/obj/item/stack/tile/light))
+					var/obj/item/stack/tile/light/L = T
+					var/obj/item/stack/tile/light/F = floor_tile
+					F.state = L.state
+					F.on = L.on
+				if(istype(T,/obj/item/stack/tile/grass))
+					for(var/direction in cardinal)
+						if(istype(get_step(src,direction),/turf/simulated/floor))
+							var/turf/simulated/floor/FF = get_step(src,direction)
+							FF.update_icon() //so siding gets updated properly
+				else if(istype(T,/obj/item/stack/tile/carpet))
+					for(var/direction in list(1,2,4,8,5,6,9,10))
+						if(istype(get_step(src,direction),/turf/simulated/floor))
+							var/turf/simulated/floor/FF = get_step(src,direction)
+							FF.update_icon() //so siding gets updated properly
+				T.use(1)
+				update_icon()
+				levelupdate()
+				playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 			else
 				user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage."
 
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 2ebb88fc9e..ff3f50206a 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -48,10 +48,12 @@
 		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
 		if(L)
 			var/obj/item/stack/tile/plasteel/S = C
-			if (S.use(1))
-				del(L)
-				playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
-				S.build(src)
+			if (S.get_amount() < 1)
+				return
+			del(L)
+			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			S.build(src)
+			S.use(1)
 			return
 		else
 			user << "\red The plating is going to need some support."