From 4ca3ea90e17160a25d38f9949c0bd46bd7b772f7 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Tue, 9 May 2017 21:31:58 -0400
Subject: [PATCH] Preserve decals between prying flooring up and putting it
 back down.

---
 code/game/turfs/simulated/floor.dm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 556a7ff59e..f2c640d53a 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -20,6 +20,8 @@
 		'sound/effects/footstep/plating4.ogg',
 		'sound/effects/footstep/plating5.ogg'))
 
+	var/list/old_decals = null // VOREStation Edit - Remember what decals we had between being pried up and replaced.
+
 	// Flooring data.
 	var/flooring_override
 	var/initial_flooring
@@ -46,6 +48,11 @@
 	make_plating(defer_icon_update = 1)
 	flooring = newflooring
 	footstep_sounds = newflooring.footstep_sounds
+	// VOREStation Edit - Remember decals from before we were pried up
+	if(islist(old_decals))
+		decals = old_decals
+		old_decals = null
+	// VOREStation Edit End
 	update_icon(1)
 	levelupdate()
 
@@ -55,7 +62,10 @@
 
 	overlays.Cut()
 	if(islist(decals))
-		decals.Cut()
+		// VOREStation Edit - Don't forget decals when pried up
+		if(flooring)
+			old_decals = decals
+		// VOREStation Edit End
 		decals = null
 
 	name = base_name