From 97af5083124fee810b04f6b9e862d8002a6b7c65 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 16 May 2020 19:27:45 -0700 Subject: [PATCH 1/2] Small overhaul of floor icon generation --- code/game/turfs/simulated/floor_icon.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index 5f426857d6..b70002f9cb 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -79,9 +79,15 @@ var/image/no_ceiling_image = null icon_state = "dmg[rand(1,4)]" else if(flooring) if(!isnull(broken) && (flooring.flags & TURF_CAN_BREAK)) +<<<<<<< HEAD add_overlay(get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) // VOREStation Edit - Eris overlays if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN)) add_overlay(get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) // VOREStation Edit - Eris overlays +======= + add_overlay(get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) + if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN)) + add_overlay(get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) +>>>>>>> a006370... Merge pull request #7146 from VOREStation/aro-flooricons if(update_neighbors) for(var/turf/simulated/floor/F in range(src, 1)) From 7aaf084086d7f4b2c1a31611b9ef4aa291e28e7b Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 16 May 2020 22:45:12 -0400 Subject: [PATCH 2/2] Update floor_icon.dm --- code/game/turfs/simulated/floor_icon.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index b70002f9cb..5e332ca760 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -79,15 +79,9 @@ var/image/no_ceiling_image = null icon_state = "dmg[rand(1,4)]" else if(flooring) if(!isnull(broken) && (flooring.flags & TURF_CAN_BREAK)) -<<<<<<< HEAD - add_overlay(get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) // VOREStation Edit - Eris overlays - if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN)) - add_overlay(get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) // VOREStation Edit - Eris overlays -======= add_overlay(get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN)) add_overlay(get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) ->>>>>>> a006370... Merge pull request #7146 from VOREStation/aro-flooricons if(update_neighbors) for(var/turf/simulated/floor/F in range(src, 1))