From 49575a1e35096b1f13ce686a48038da5e8eebd13 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 30 Jul 2015 23:10:50 +0930 Subject: [PATCH] Blocked out the holodeck tiles. --- code/modules/holodeck/HolodeckObjects.dm | 31 + icons/turf/floors.dmi | Bin 39720 -> 42055 bytes maps/exodus-2.dmm | 1481 ++++++++++------------ 3 files changed, 716 insertions(+), 796 deletions(-) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 73b3c3e149e..1c39fbdb7fd 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -13,12 +13,32 @@ /turf/simulated/floor/holofloor/set_flooring() return +/turf/simulated/floor/holofloor/tiled + name = "floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "steel" + initial_flooring = /decl/flooring/tiling + +/turf/simulated/floor/holofloor/wood + name = "wooden floor" + icon = 'icons/turf/flooring/wood.dmi' + icon_state = "wood" + initial_flooring = /decl/flooring/wood + /turf/simulated/floor/holofloor/grass name = "lush grass" icon = 'icons/turf/flooring/grass.dmi' icon_state = "grass0" initial_flooring = /decl/flooring/grass +/turf/simulated/floor/holofloor/snow + name = "snow" + base_name = "snow" + icon = 'icons/turf/floors.dmi' + base_icon = 'icons/turf/floors.dmi' + icon_state = "snow" + base_icon_state = "snow" + /turf/simulated/floor/holofloor/space icon = 'icons/turf/space.dmi' name = "\proper space" @@ -33,6 +53,17 @@ /turf/simulated/floor/holofloor/space/New() icon_state = "[((x + y) ^ ~(x * y) + z) % 25]" +/turf/simulated/floor/holofloor/beach + name = "sand" + base_name = "sand" + desc = "Uncomfortably gritty for a hologram." + base_desc = "Uncomfortably gritty for a hologram." + icon_state = "asteroid" + base_icon_state = "asteroid" + icon = 'icons/turf/flooring/asteroid.dmi' + base_icon = 'icons/turf/flooring/asteroid.dmi' + initial_flooring = null + /turf/simulated/floor/holofloor/desert name = "desert sand" base_name = "desert sand" diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index a0134e466d6efcc4ad1b4139d38fd0759d88b918..5372822f62ad0b3a4f70b982a9c8e6aae9a98460 100644 GIT binary patch delta 6969 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

-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 LNkvXXu0mjf+6%)v delta 4616 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