Skip to content
This repository was archived by the owner on May 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #150 from uomo91/floorfixes
Browse files Browse the repository at this point in the history
A few fixes to turfs.
  • Loading branch information
Koshenko authored Oct 29, 2020
2 parents aec43fb + e16f38b commit 1b446c4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion _maps/mammoth.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
"Up": 1,
"Down": -1,
"Baseturf": "/turf/open/transparent/openspace",
"Baseturf": "/turf/open/floor/plating/ground/mountain",
"Linkage": "Cross",
"Gravity": true
},
Expand Down
23 changes: 23 additions & 0 deletions fallout/turfs/f13_floors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -89,10 +98,24 @@

//Plasteel (generic) floor tiles.

/obj/item/stack/tile/plasteel/f13 //We need this because upstream turf code is not great.
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/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'
Expand Down

0 comments on commit 1b446c4

Please sign in to comment.