diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 3ef89064f77..e1900bfe97d 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -232,7 +232,7 @@ var/list/flooring_types /decl/flooring/snow name = "snow" desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is." - icon = 'icons/turf/snow_new.dmi' + icon = 'icons/turf/outdoors.dmi' icon_base = "snow" footstep_sounds = list("human" = list( 'sound/effects/footstep/snow1.ogg', diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 148eb41df98..9cad0bd727b 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -390,7 +390,7 @@ //**** Here lives snow **** /turf/simulated/floor/snow name = "snow" - icon = 'icons/turf/snow_new.dmi' + icon = 'icons/turf/outdoors.dmi' icon_state = "snow" initial_flooring = /decl/flooring/snow var/list/crossed_dirs = list() diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm index 07a6804803e..fc4832d8454 100644 --- a/code/game/turfs/simulated/outdoors/snow.dm +++ b/code/game/turfs/simulated/outdoors/snow.dm @@ -53,6 +53,16 @@ desc = "Looks slippery." edge_blending_priority = 0 +/turf/simulated/floor/outdoors/ice/dark + name = "black ice" + icon_state = "ice_dark" + desc = "An uneven surface of dark rocks glazed over by solid ice. Looks slippey, maybe even painful" + +/turf/simulated/floor/outdoors/ice/dark_smooth + name = "smooth black ice" + icon_state = "ice_dark_smooth" + desc = "Dark rock that has been smoothened to be perfectly even. It's coated in a layer of slippey ice" + /turf/simulated/floor/outdoors/ice/Entered(var/mob/living/M) sleep(1 * world.tick_lag) if(istype(M, /mob/living)) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 78e33a2d522..122445642cf 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -73,6 +73,30 @@ var/list/mining_overlay_cache = list() rock_icon_state = "rock-light" random_icon = 1 +/turf/simulated/mineral/alt + icon_state = "rock-alt" + rock_side_icon_state = "rock_side-alt" + sand_icon_state = "asteroid" + rock_icon_state = "rock-alt" + +/turf/simulated/mineral/icey + icon_state = "rock-icey" + rock_side_icon_state = "rock_side-icey" + sand_icon_state = "sand-icey" // to be replaced + rock_icon_state = "rock-icey" + +/turf/simulated/mineral/crystal + icon_state = "rock-crystal" + rock_side_icon_state = "rock_side-crystal" + sand_icon_state = "sand-icey" // to be replaced + rock_icon_state = "rock-crystal" + +/turf/simulated/mineral/crystal_shiny + icon_state = "rock-crystal-shiny" + rock_side_icon_state = "rock_side-crystal" + sand_icon_state = "sand-icey" // to be replaced + rock_icon_state = "rock-crystal-shiny" + /turf/simulated/mineral/ignore_mapgen ignore_mapgen = 1 @@ -90,6 +114,10 @@ var/list/mining_overlay_cache = list() icon_state = "sand-light" sand_icon_state = "sand-light" +/turf/simulated/mineral/floor/icey + icon_state = "sand-icey" + sand_icon_state = "sand-icey" // to be replaced + /turf/simulated/mineral/floor/light_border icon_state = "sand-light-border" sand_icon_state = "sand-light-border" diff --git a/icons/turf/flooring/asteroid.dmi b/icons/turf/flooring/asteroid.dmi index f9c0b2cdf88..9df90896580 100644 Binary files a/icons/turf/flooring/asteroid.dmi and b/icons/turf/flooring/asteroid.dmi differ diff --git a/icons/turf/outdoors.dmi b/icons/turf/outdoors.dmi index f08a94a80f7..5b9ee2d7a58 100644 Binary files a/icons/turf/outdoors.dmi and b/icons/turf/outdoors.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index 52f1fa13e38..e3fc2202e9b 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ