diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 459f4a32064..864f97479e2 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -43,6 +43,10 @@ color = "#D4D4D4" alpha = 50 +/obj/effect/turf_decal/tile/dark + name = "dark corner" + color = "#0e0f0f" + /obj/effect/turf_decal/tile/random // so many colors name = "colorful corner" color = "#E300FF" //bright pink as default for mapping diff --git a/code/game/objects/items/stacks/tiles/tile_iron.dm b/code/game/objects/items/stacks/tiles/tile_iron.dm index 7a626fc9794..c0765bf4aa1 100644 --- a/code/game/objects/items/stacks/tiles/tile_iron.dm +++ b/code/game/objects/items/stacks/tiles/tile_iron.dm @@ -17,30 +17,46 @@ merge_type = /obj/item/stack/tile/iron tile_reskin_types = list( /obj/item/stack/tile/iron, + /obj/item/stack/tile/iron/edge, + /obj/item/stack/tile/iron/half, + /obj/item/stack/tile/iron/corner, + /obj/item/stack/tile/iron/large, /obj/item/stack/tile/iron/textured, /obj/item/stack/tile/iron/textured_edge, /obj/item/stack/tile/iron/textured_half, + /obj/item/stack/tile/iron/textured_corner, /obj/item/stack/tile/iron/textured_large, /obj/item/stack/tile/iron/dark, + /obj/item/stack/tile/iron/dark/smooth_edge, + /obj/item/stack/tile/iron/dark/smooth_half, + /obj/item/stack/tile/iron/dark/smooth_corner, + /obj/item/stack/tile/iron/dark/smooth_large, /obj/item/stack/tile/iron/dark_side, /obj/item/stack/tile/iron/dark_corner, /obj/item/stack/tile/iron/checker, /obj/item/stack/tile/iron/dark/textured, /obj/item/stack/tile/iron/dark/textured_edge, /obj/item/stack/tile/iron/dark/textured_half, + /obj/item/stack/tile/iron/dark/textured_corner, /obj/item/stack/tile/iron/dark/textured_large, /obj/item/stack/tile/iron/white, + /obj/item/stack/tile/iron/white/smooth_edge, + /obj/item/stack/tile/iron/white/smooth_half, + /obj/item/stack/tile/iron/white/smooth_corner, + /obj/item/stack/tile/iron/white/smooth_large, /obj/item/stack/tile/iron/white_side, /obj/item/stack/tile/iron/white_corner, /obj/item/stack/tile/iron/cafeteria, /obj/item/stack/tile/iron/white/textured, /obj/item/stack/tile/iron/white/textured_edge, /obj/item/stack/tile/iron/white/textured_half, + /obj/item/stack/tile/iron/white/textured_corner, /obj/item/stack/tile/iron/white/textured_large, /obj/item/stack/tile/iron/recharge_floor, /obj/item/stack/tile/iron/smooth, /obj/item/stack/tile/iron/smooth_edge, /obj/item/stack/tile/iron/smooth_half, + /obj/item/stack/tile/iron/smooth_corner, /obj/item/stack/tile/iron/smooth_large, /obj/item/stack/tile/iron/chapel, /obj/item/stack/tile/iron/showroomfloor, @@ -74,6 +90,37 @@ merge_type = /obj/item/stack/tile/iron/base/cyborg tile_reskin_types = null +/obj/item/stack/tile/iron/edge + name = "edge tile" + singular_name = "edge floor tile" + icon_state = "tile_edge" + turf_type = /turf/open/floor/iron/edge + merge_type = /obj/item/stack/tile/iron/edge + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/half + name = "half tile" + singular_name = "half floor tile" + icon_state = "tile_half" + turf_type = /turf/open/floor/iron/half + merge_type = /obj/item/stack/tile/iron/half + tile_rotate_dirs = list(SOUTH, NORTH) + +/obj/item/stack/tile/iron/corner + name = "corner tile" + singular_name = "corner floor tile" + icon_state = "tile_corner" + turf_type = /turf/open/floor/iron/corner + merge_type = /obj/item/stack/tile/iron/corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/large + name = "large tile" + singular_name = "large floor tile" + icon_state = "tile_large" + turf_type = /turf/open/floor/iron/large + merge_type = /obj/item/stack/tile/iron/large + /obj/item/stack/tile/iron/textured name = "textured tile" singular_name = "textured floor tile" @@ -83,22 +130,30 @@ /obj/item/stack/tile/iron/textured_edge name = "textured edge tile" - singular_name = "textured edge floor tile" + singular_name = "edged textured floor tile" icon_state = "tile_textured_edge" turf_type = /turf/open/floor/iron/textured_edge merge_type = /obj/item/stack/tile/iron/textured_edge tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) /obj/item/stack/tile/iron/textured_half - name = "halved textured tile" + name = "textured half tile" singular_name = "halved textured floor tile" icon_state = "tile_textured_half" turf_type = /turf/open/floor/iron/textured_half merge_type = /obj/item/stack/tile/iron/textured_half tile_rotate_dirs = list(SOUTH, NORTH) +/obj/item/stack/tile/iron/textured_corner + name = "textured corner tile" + singular_name = "cornered textured floor tile" + icon_state = "tile_textured_corner" + turf_type = /turf/open/floor/iron/textured_corner + merge_type = /obj/item/stack/tile/iron/textured_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + /obj/item/stack/tile/iron/textured_large - name = "large textured tile" + name = "textured large tile" singular_name = "large textured floor tile" icon_state = "tile_textured_large" turf_type = /turf/open/floor/iron/textured_large @@ -111,6 +166,37 @@ turf_type = /turf/open/floor/iron/dark merge_type = /obj/item/stack/tile/iron/dark +/obj/item/stack/tile/iron/dark/smooth_edge + name = "dark edge tile" + singular_name = "edged dark floor tile" + icon_state = "tile_dark_edge" + turf_type = /turf/open/floor/iron/dark/smooth_edge + merge_type = /obj/item/stack/tile/iron/dark/smooth_edge + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/dark/smooth_half + name = "dark half tile" + singular_name = "halved dark floor tile" + icon_state = "tile_dark_half" + turf_type = /turf/open/floor/iron/dark/smooth_half + merge_type = /obj/item/stack/tile/iron/dark/smooth_half + tile_rotate_dirs = list(SOUTH, NORTH) + +/obj/item/stack/tile/iron/dark/smooth_corner + name = "dark corner tile" + singular_name = "cornered dark floor tile" + icon_state = "tile_dark_corner" + turf_type = /turf/open/floor/iron/dark/smooth_corner + merge_type = /obj/item/stack/tile/iron/dark/smooth_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/dark/smooth_large + name = "dark large tile" + singular_name = "large dark floor tile" + icon_state = "tile_dark_large" + turf_type = /turf/open/floor/iron/dark/smooth_large + merge_type = /obj/item/stack/tile/iron/dark/smooth_large + /obj/item/stack/tile/iron/dark_side name = "half dark tile" singular_name = "half dark floor tile" @@ -144,22 +230,30 @@ /obj/item/stack/tile/iron/dark/textured_edge name = "dark textured edge tile" - singular_name = "dark textured edge floor tile" + singular_name = "edged dark textured floor tile" icon_state = "tile_textured_dark_edge" turf_type = /turf/open/floor/iron/dark/textured_edge merge_type = /obj/item/stack/tile/iron/dark/textured_edge tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) /obj/item/stack/tile/iron/dark/textured_half - name = "halved dark textured tile" + name = "dark textured half tile" singular_name = "halved dark textured floor tile" icon_state = "tile_textured_dark_half" turf_type = /turf/open/floor/iron/dark/textured_half merge_type = /obj/item/stack/tile/iron/dark/textured_half tile_rotate_dirs = list(SOUTH, NORTH) +/obj/item/stack/tile/iron/dark/textured_corner + name = "dark textured corner tile" + singular_name = "cornered dark textured floor tile" + icon_state = "tile_textured_dark_corner" + turf_type = /turf/open/floor/iron/dark/textured_corner + merge_type = /obj/item/stack/tile/iron/dark/textured_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + /obj/item/stack/tile/iron/dark/textured_large - name = "large dark textured tile" + name = "dark textured large tile" singular_name = "large dark textured floor tile" icon_state = "tile_textured_dark_large" turf_type = /turf/open/floor/iron/dark/textured_large @@ -172,6 +266,37 @@ turf_type = /turf/open/floor/iron/white merge_type = /obj/item/stack/tile/iron/white +/obj/item/stack/tile/iron/white/smooth_edge + name = "white edge tile" + singular_name = "edged white floor tile" + icon_state = "tile_white_edge" + turf_type = /turf/open/floor/iron/white/smooth_edge + merge_type = /obj/item/stack/tile/iron/white/smooth_edge + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/white/smooth_half + name = "white half tile" + singular_name = "halved white floor tile" + icon_state = "tile_white_half" + turf_type = /turf/open/floor/iron/white/smooth_half + merge_type = /obj/item/stack/tile/iron/white/smooth_half + tile_rotate_dirs = list(SOUTH, NORTH) + +/obj/item/stack/tile/iron/white/smooth_corner + name = "white corner tile" + singular_name = "cornered white floor tile" + icon_state = "tile_white_corner" + turf_type = /turf/open/floor/iron/white/smooth_corner + merge_type = /obj/item/stack/tile/iron/white/smooth_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + +/obj/item/stack/tile/iron/white/smooth_large + name = "white large tile" + singular_name = "large white floor tile" + icon_state = "tile_white_large" + turf_type = /turf/open/floor/iron/white/smooth_large + merge_type = /obj/item/stack/tile/iron/white/smooth_large + /obj/item/stack/tile/iron/white_side name = "half white tile" singular_name = "half white floor tile" @@ -205,22 +330,30 @@ /obj/item/stack/tile/iron/white/textured_edge name = "white textured edge tile" - singular_name = "white textured edge floor tile" + singular_name = "edged white textured floor tile" icon_state = "tile_textured_white_edge" turf_type = /turf/open/floor/iron/white/textured_edge merge_type = /obj/item/stack/tile/iron/white/textured_edge tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) /obj/item/stack/tile/iron/white/textured_half - name = "halved white textured tile" + name = "white textured half tile" singular_name = "halved white textured floor tile" icon_state = "tile_textured_white_half" turf_type = /turf/open/floor/iron/white/textured_half merge_type = /obj/item/stack/tile/iron/white/textured_half tile_rotate_dirs = list(SOUTH, NORTH) +/obj/item/stack/tile/iron/white/textured_corner + name = "white textured corner tile" + singular_name = "cornered white textured floor tile" + icon_state = "tile_textured_white_corner" + turf_type = /turf/open/floor/iron/white/textured_corner + merge_type = /obj/item/stack/tile/iron/white/textured_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + /obj/item/stack/tile/iron/white/textured_large - name = "large white textured tile" + name = "white textured large tile" singular_name = "large white textured floor tile" icon_state = "tile_textured_white_large" turf_type = /turf/open/floor/iron/white/textured_large @@ -242,22 +375,30 @@ /obj/item/stack/tile/iron/smooth_edge name = "smooth edge tile" - singular_name = "smooth edge floor tile" + singular_name = "edged smooth floor tile" icon_state = "tile_smooth_edge" turf_type = /turf/open/floor/iron/smooth_edge merge_type = /obj/item/stack/tile/iron/smooth_edge tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) /obj/item/stack/tile/iron/smooth_half - name = "halved smooth tile" + name = "smooth half tile" singular_name = "halved smooth floor tile" icon_state = "tile_smooth_half" turf_type = /turf/open/floor/iron/smooth_half merge_type = /obj/item/stack/tile/iron/smooth_half tile_rotate_dirs = list(SOUTH, NORTH) +/obj/item/stack/tile/iron/smooth_corner + name = "smooth corner tile" + singular_name = "cornered smooth floor tile" + icon_state = "tile_smooth_corner" + turf_type = /turf/open/floor/iron/smooth_corner + merge_type = /obj/item/stack/tile/iron/smooth_corner + tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST) + /obj/item/stack/tile/iron/smooth_large - name = "large smooth tile" + name = "smooth large tile" singular_name = "large smooth floor tile" icon_state = "tile_smooth_large" turf_type = /turf/open/floor/iron/smooth_large diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm index 27216e47cc2..101c57cc37b 100644 --- a/code/game/turfs/open/floor/iron_floor.dm +++ b/code/game/turfs/open/floor/iron_floor.dm @@ -36,6 +36,26 @@ /turf/open/floor/iron/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS +/turf/open/floor/iron/edge + icon_state = "floor_edge" + base_icon_state = "floor_edge" + floor_tile = /obj/item/stack/tile/iron/edge + +/turf/open/floor/iron/half + icon_state = "floor_half" + base_icon_state = "floor_half" + floor_tile = /obj/item/stack/tile/iron/half + +/turf/open/floor/iron/corner + icon_state = "floor_corner" + base_icon_state = "floor_corner" + floor_tile = /obj/item/stack/tile/iron/corner + +/turf/open/floor/iron/large + icon_state = "floor_large" + base_icon_state = "floor_large" + floor_tile = /obj/item/stack/tile/iron/large + /turf/open/floor/iron/textured icon_state = "textured" base_icon_state = "textured" @@ -51,6 +71,11 @@ base_icon_state = "textured_half" floor_tile = /obj/item/stack/tile/iron/textured_half +/turf/open/floor/iron/textured_corner + icon_state = "textured_corner" + base_icon_state = "textured_corner" + floor_tile = /obj/item/stack/tile/iron/textured_corner + /turf/open/floor/iron/textured_large icon_state = "textured_large" base_icon_state = "textured_large" @@ -61,6 +86,26 @@ base_icon_state = "darkfull" floor_tile = /obj/item/stack/tile/iron/dark +/turf/open/floor/iron/dark/smooth_edge + icon_state = "dark_edge" + base_icon_state = "dark_edge" + floor_tile = /obj/item/stack/tile/iron/dark/smooth_edge + +/turf/open/floor/iron/dark/smooth_half + icon_state = "dark_half" + base_icon_state = "dark_half" + floor_tile = /obj/item/stack/tile/iron/dark/smooth_half + +/turf/open/floor/iron/dark/smooth_corner + icon_state = "dark_corner" + base_icon_state = "dark_corner" + floor_tile = /obj/item/stack/tile/iron/dark/smooth_corner + +/turf/open/floor/iron/dark/smooth_large + icon_state = "dark_large" + base_icon_state = "dark_large" + floor_tile = /obj/item/stack/tile/iron/dark/smooth_large + /turf/open/floor/iron/dark/side icon_state = "dark" base_icon_state = "dark" @@ -91,6 +136,11 @@ base_icon_state = "textured_dark_half" floor_tile = /obj/item/stack/tile/iron/dark/textured_half +/turf/open/floor/iron/dark/textured_corner + icon_state = "textured_dark_corner" + base_icon_state = "textured_dark_corner" + floor_tile = /obj/item/stack/tile/iron/dark/textured_corner + /turf/open/floor/iron/dark/textured_large icon_state = "textured_dark_large" base_icon_state = "textured_dark_large" @@ -116,6 +166,26 @@ base_icon_state = "white" floor_tile = /obj/item/stack/tile/iron/white +/turf/open/floor/iron/white/smooth_edge + icon_state = "white_edge" + base_icon_state = "white_edge" + floor_tile = /obj/item/stack/tile/iron/white/smooth_edge + +/turf/open/floor/iron/white/smooth_half + icon_state = "white_half" + base_icon_state = "white_half" + floor_tile = /obj/item/stack/tile/iron/white/smooth_half + +/turf/open/floor/iron/white/smooth_corner + icon_state = "white_corner" + base_icon_state = "white_corner" + floor_tile = /obj/item/stack/tile/iron/white/smooth_corner + +/turf/open/floor/iron/white/smooth_large + icon_state = "white_large" + base_icon_state = "white_large" + floor_tile = /obj/item/stack/tile/iron/white/smooth_large + /turf/open/floor/iron/white/side icon_state = "whitehall" base_icon_state = "whitehall" @@ -146,6 +216,11 @@ base_icon_state = "textured_white_half" floor_tile = /obj/item/stack/tile/iron/white/textured_half +/turf/open/floor/iron/white/textured_corner + icon_state = "textured_white_corner" + base_icon_state = "textured_white_corner" + floor_tile = /obj/item/stack/tile/iron/white/textured_corner + /turf/open/floor/iron/white/textured_large icon_state = "textured_white_large" base_icon_state = "textured_white_large" @@ -190,6 +265,11 @@ base_icon_state = "smooth_half" floor_tile = /obj/item/stack/tile/iron/smooth_half +/turf/open/floor/iron/smooth_corner + icon_state = "smooth_corner" + base_icon_state = "smooth_corner" + floor_tile = /obj/item/stack/tile/iron/smooth_corner + /turf/open/floor/iron/smooth_large icon_state = "smooth_large" base_icon_state = "smooth_large" diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index ba71ff99288..2045dc56661 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 39da74129b9..3b67fc083e9 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ