diff --git a/aurorastation.dme b/aurorastation.dme index c72ab6717ac..02d15c356bf 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2971,11 +2971,13 @@ #include "code\modules\overmap\exoplanets\decor\turfs\carpet.dm" #include "code\modules\overmap\exoplanets\decor\turfs\concrete.dm" #include "code\modules\overmap\exoplanets\decor\turfs\crystal.dm" +#include "code\modules\overmap\exoplanets\decor\turfs\diona.dm" #include "code\modules\overmap\exoplanets\decor\turfs\foundation.dm" #include "code\modules\overmap\exoplanets\decor\turfs\grass.dm" #include "code\modules\overmap\exoplanets\decor\turfs\ice.dm" #include "code\modules\overmap\exoplanets\decor\turfs\konyang.dm" #include "code\modules\overmap\exoplanets\decor\turfs\linoleum.dm" +#include "code\modules\overmap\exoplanets\decor\turfs\marble.dm" #include "code\modules\overmap\exoplanets\decor\turfs\mineral.dm" #include "code\modules\overmap\exoplanets\decor\turfs\plating.dm" #include "code\modules\overmap\exoplanets\decor\turfs\sand.dm" diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index d054e701a57..7f36597094c 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -169,3 +169,8 @@ canSmoothWith = list(src.type) . = ..(mapload, MATERIAL_CONCRETE) canSmoothWith = list(src.type) + +/turf/simulated/wall/marble/Initialize(mapload) + canSmoothWith = list(src.type) + . = ..(mapload, MATERIAL_MARBLE) + canSmoothWith = list(src.type) diff --git a/code/modules/overmap/exoplanets/decor/turfs/carpet.dm b/code/modules/overmap/exoplanets/decor/turfs/carpet.dm index f9cb40134c2..b6304faca48 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/carpet.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/carpet.dm @@ -16,6 +16,18 @@ icon_state = "blue1" initial_flooring = /singleton/flooring/carpet/darkblue +/turf/simulated/floor/exoplanet/carpet/lightblue + icon_state = "blue2" + initial_flooring = /singleton/flooring/carpet/lightblue + +/turf/simulated/floor/exoplanet/carpet/red + icon_state = "red" + initial_flooring = /singleton/flooring/carpet/red + +/turf/simulated/floor/exoplanet/carpet/orange + icon_state = "orange" + initial_flooring = /singleton/flooring/carpet/orange + /turf/simulated/floor/exoplanet/carpet/rubber name = "rubber carpet" icon_state = "rub_carpet" diff --git a/code/modules/overmap/exoplanets/decor/turfs/diona.dm b/code/modules/overmap/exoplanets/decor/turfs/diona.dm new file mode 100644 index 00000000000..85c80a6b8a1 --- /dev/null +++ b/code/modules/overmap/exoplanets/decor/turfs/diona.dm @@ -0,0 +1,7 @@ +/turf/simulated/floor/exoplanet/diona + name = "biomass flooring" + icon = 'icons/turf/flooring/diona.dmi' + icon_state = "diona0" + footstep_sound = /singleton/sound_category/grass_footstep + initial_flooring = /singleton/flooring/diona + has_resources = FALSE diff --git a/code/modules/overmap/exoplanets/decor/turfs/marble.dm b/code/modules/overmap/exoplanets/decor/turfs/marble.dm new file mode 100644 index 00000000000..f47e84e8ba0 --- /dev/null +++ b/code/modules/overmap/exoplanets/decor/turfs/marble.dm @@ -0,0 +1,11 @@ +/turf/simulated/floor/exoplanet/marble + name = "marble floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "textured" + initial_flooring = /singleton/flooring/marble + color = COLOR_GRAY80 + has_resources = FALSE + +/turf/simulated/floor/exoplanet/marble/dark + initial_flooring = /singleton/flooring/marble/dark + color = COLOR_DARK_GRAY diff --git a/code/modules/overmap/exoplanets/decor/turfs/tiled.dm b/code/modules/overmap/exoplanets/decor/turfs/tiled.dm index 0aa7f111e47..f1873b84c91 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/tiled.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/tiled.dm @@ -42,3 +42,17 @@ initial_flooring = /singleton/flooring/tiling/white broken_overlay = null burned_overlay = null + +/turf/simulated/floor/exoplanet/silver + name = "silver floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "silver" + initial_flooring = /singleton/flooring/silver + has_resources = FALSE + +/turf/simulated/floor/exoplanet/gold + name = "golden floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "gold" + initial_flooring = /singleton/flooring/gold + has_resources = FALSE diff --git a/code/modules/overmap/exoplanets/decor/turfs/wood.dm b/code/modules/overmap/exoplanets/decor/turfs/wood.dm index 335e3876768..6e80b32a98c 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/wood.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/wood.dm @@ -13,3 +13,11 @@ /turf/simulated/floor/exoplanet/wood/bamboo initial_flooring = /singleton/flooring/wood/bamboo + color = WOOD_COLOR_PALE2 + +/turf/simulated/floor/exoplanet/wood/birch + initial_flooring = /singleton/flooring/wood/birch + +/turf/simulated/floor/exoplanet/wood/walnut + initial_flooring = /singleton/flooring/wood/walnut + color = WOOD_COLOR_CHOCOLATE diff --git a/html/changelogs/RustingWithYou - exoplanetturfs.yml b/html/changelogs/RustingWithYou - exoplanetturfs.yml new file mode 100644 index 00000000000..8d10ca5df13 --- /dev/null +++ b/html/changelogs/RustingWithYou - exoplanetturfs.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds more exoplanet variants of turfs." + - rscadd: "Adds marble walls."