From 0a96f377be2514cce93a8747510b7cca6891a852 Mon Sep 17 00:00:00 2001 From: uomo91 Date: Tue, 27 Oct 2020 16:05:20 -0500 Subject: [PATCH 1/2] Fix the first major bug, no more purple checkmark patterns. --- fallout/turfs/f13_floors.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fallout/turfs/f13_floors.dm b/fallout/turfs/f13_floors.dm index 13b1171c521..e33940ab804 100644 --- a/fallout/turfs/f13_floors.dm +++ b/fallout/turfs/f13_floors.dm @@ -89,10 +89,14 @@ //Plasteel (generic) floor tiles. +/obj/item/stack/tile/plasteel/f13 + turf_type = /turf/open/floor/plasteel/f13 + /turf/open/floor/plasteel/f13 icon = 'fallout/icons/turf/floors_2.dmi' icon_state = "floor" + floor_tile = /obj/item/stack/tile/plasteel/f13 /turf/open/floor/plasteel/f13/_dirty icon = 'fallout/icons/turf/floors_2.dmi' From e16f38bfc7fd8b669e4cea680128c72cbb0d5269 Mon Sep 17 00:00:00 2001 From: uomo91 Date: Tue, 27 Oct 2020 17:42:49 -0500 Subject: [PATCH 2/2] Small fix to Mammoth's JSON, fix burn/broken proc. --- _maps/mammoth.json | 2 +- fallout/turfs/f13_floors.dm | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/_maps/mammoth.json b/_maps/mammoth.json index 1730e95ea3d..38103815525 100644 --- a/_maps/mammoth.json +++ b/_maps/mammoth.json @@ -18,7 +18,7 @@ { "Up": 1, "Down": -1, - "Baseturf": "/turf/open/transparent/openspace", + "Baseturf": "/turf/open/floor/plating/ground/mountain", "Linkage": "Cross", "Gravity": true }, diff --git a/fallout/turfs/f13_floors.dm b/fallout/turfs/f13_floors.dm index e33940ab804..4f8e2be2493 100644 --- a/fallout/turfs/f13_floors.dm +++ b/fallout/turfs/f13_floors.dm @@ -10,6 +10,15 @@ if(icon_state == "housewood1") icon_state = "housewood[rand(1,3)]" //This automatically gives wooden floors a nice varied pattern. +/turf/open/floor/wood/f13/burn_tile() + burnt = 1 + return //We lack sprites for this. To do: make overlay here instead. + +/turf/open/floor/wood/f13/break_tile() + broken = 1 + return + + /turf/open/floor/wood/f13/broken icon_state = "housebase" desc = "Rotting wooden flooring." @@ -89,7 +98,7 @@ //Plasteel (generic) floor tiles. -/obj/item/stack/tile/plasteel/f13 +/obj/item/stack/tile/plasteel/f13 //We need this because upstream turf code is not great. turf_type = /turf/open/floor/plasteel/f13 @@ -98,6 +107,16 @@ icon_state = "floor" floor_tile = /obj/item/stack/tile/plasteel/f13 + +/turf/open/floor/plasteel/f13/burn_tile() + burnt = 1 + return //We're not spriting damage variations for the millions of tiles we have. To do: make overlay here instead. + +/turf/open/floor/plasteel/f13/break_tile() + broken = 1 + return + + /turf/open/floor/plasteel/f13/_dirty icon = 'fallout/icons/turf/floors_2.dmi' icon_state = "floordirty"