Merge pull request #1686 from ArchieBeepBoop/ohthemisery

Modular Sprites, sand fix.

_maps/map_files/LayeniaStation/LayeniaStation.dmm

@@ -2809,7 +2809,7 @@
 /area/security/range)
 "ahY" = (
 /obj/effect/landmark/carpspawn,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "ahZ" = (
 /obj/structure/railing{
@@ -6734,7 +6734,7 @@
 /area/crew_quarters/theatre)
 "aOX" = (
 /obj/structure/ore_box,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "aPc" = (
 /obj/effect/turf_decal/stripes/line{
@@ -19035,7 +19035,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 6
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "cXg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
@@ -19353,7 +19353,7 @@
 /area/ai_monitored/turret_protected/ai)
 "daS" = (
 /obj/effect/turf_decal/stripes/line,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "daT" = (
 /obj/structure/chair/office/dark{
@@ -27494,7 +27494,7 @@
 	dir = 1;
 	name = "visible"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "ewF" = (
 /obj/machinery/space_heater,
@@ -27516,7 +27516,7 @@
 	dir = 1;
 	name = "visible"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "ewN" = (
 /obj/effect/turf_decal/loading_area{
@@ -27905,7 +27905,7 @@
 /area/quartermaster/miningdock)
 "eyS" = (
 /obj/structure/fence,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "eyW" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -28714,7 +28714,7 @@
 /obj/structure/fence/door{
 	dir = 4
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "eGn" = (
 /obj/effect/turf_decal/loading_area{
@@ -31524,7 +31524,7 @@
 	icon_state = "drain_corner";
 	name = "drain"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "fbB" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{
@@ -34346,7 +34346,7 @@
 	},
 /area/engine/atmos)
 "fxA" = (
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "fxC" = (
 /obj/machinery/power/apc{
@@ -38265,7 +38265,7 @@
 /obj/structure/sign/poster/random{
 	pixel_x = 32
 	},
-/turf/open/indestructible/layenia/sand{
+/turf/open/floor/plating/asteroid/layenia/sand{
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
 	},
 /area/hallway/primary/aft/upper)
@@ -44648,7 +44648,7 @@
 	dir = 1
 	},
 /obj/structure/flora/crystal/small/growth,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "hdo" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -45422,7 +45422,7 @@
 /area/layenia)
 "hjz" = (
 /obj/item/shovel,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "hjD" = (
 /obj/effect/turf_decal/stripes/line{
@@ -45712,7 +45712,7 @@
 /area/quartermaster/sorting)
 "hlA" = (
 /obj/effect/decal/cleanable/vomit,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "hlB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -46075,7 +46075,7 @@
 /area/crew_quarters/heads/chief)
 "hny" = (
 /obj/structure/bonfire,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "hnA" = (
 /obj/structure/closet,
@@ -51414,7 +51414,7 @@
 	dir = 8;
 	pixel_x = -7
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "iah" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -63415,13 +63415,13 @@
 /area/security/locker)
 "jPP" = (
 /obj/structure/flora/crystal/small/pile,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "jPU" = (
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 10
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "jQa" = (
 /obj/structure/lattice/catwalk,
@@ -65617,7 +65617,7 @@
 /area/security/locker)
 "khn" = (
 /obj/structure/flora/crystal/small/growth,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "khp" = (
 /obj/machinery/door/firedoor{
@@ -69666,7 +69666,7 @@
 /area/hallway/primary/fore/upper)
 "kLI" = (
 /obj/effect/turf_decal/stripes/corner,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "kLQ" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -70544,7 +70544,7 @@
 	icon_state = "drain_corner";
 	name = "drain"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "kUe" = (
 /obj/effect/decal/cleanable/oil{
@@ -71184,7 +71184,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 4
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "kZl" = (
 /obj/machinery/light{
@@ -73939,7 +73939,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 1
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "lyu" = (
 /obj/structure/closet/secure_closet/personal,
@@ -75519,7 +75519,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 5
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "lJV" = (
 /obj/effect/turf_decal/stripes/line,
@@ -76321,7 +76321,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 8
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "lRm" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -76540,7 +76540,7 @@
 	dir = 4
 	},
 /obj/structure/flora/tree/jungle/small,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "lTe" = (
 /obj/effect/turf_decal/loading_area{
@@ -81055,7 +81055,7 @@
 /area/hallway/primary/port/upper)
 "mBS" = (
 /obj/effect/turf_decal/weather/grass/line,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "mBU" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -82442,7 +82442,7 @@
 	icon_state = "drain_corner";
 	name = "drain"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "mNh" = (
 /obj/structure/cable{
@@ -82566,7 +82566,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/psych/ward)
 "mNC" = (
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "mNF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -93566,7 +93566,7 @@
 	},
 /area/construction/mining/aux_base)
 "orv" = (
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "orw" = (
 /obj/structure/table,
@@ -95135,7 +95135,7 @@
 	icon_state = "drain_corner";
 	name = "drain"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "oDa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -102220,7 +102220,7 @@
 	pixel_x = 7
 	},
 /obj/structure/flora/crystal/small/pile,
-/turf/open/indestructible/layenia/sand{
+/turf/open/floor/plating/asteroid/layenia/sand{
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
 	},
 /area/hallway/primary/aft/upper)
@@ -110889,7 +110889,7 @@
 /area/hallway/primary/aft)
 "qKb" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "qKd" = (
 /obj/structure/chair/comfy/black{
@@ -115006,7 +115006,7 @@
 	dir = 8;
 	name = "visible"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "rkc" = (
 /obj/machinery/light{
@@ -125837,7 +125837,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "sIe" = (
 /obj/machinery/button/door{
@@ -126243,7 +126243,7 @@
 /obj/structure/fence/corner{
 	dir = 6
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia)
 "sKU" = (
 /obj/structure/railing{
@@ -129981,7 +129981,7 @@
 /area/crew_quarters/heads/cmo)
 "tmZ" = (
 /obj/item/picket_sign,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "tnl" = (
 /obj/effect/turf_decal/tile/blue{
@@ -138191,7 +138191,7 @@
 	dir = 4;
 	pixel_x = 7
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cave)
 "usj" = (
 /obj/effect/decal/cleanable/cobweb{
@@ -141771,7 +141771,7 @@
 /obj/effect/turf_decal/weather/grass/line{
 	dir = 9
 	},
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "uUm" = (
 /obj/structure/chair/bench/metal/right{
@@ -160135,7 +160135,7 @@
 /area/science/research)
 "xyC" = (
 /obj/structure/flora/tree/jungle/small,
-/turf/open/indestructible/layenia/sand,
+/turf/open/floor/plating/asteroid/layenia/sand,
 /area/layenia/cloudlayer)
 "xyH" = (
 /obj/machinery/light{

code/game/turfs/open.dm

@@ -75,19 +75,6 @@
 	if(istype(AM))
 		playsound(src,sound,50,1)
 
-/turf/open/indestructible/concrete
-	name = "concrete"
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "concrete"
-	baseturfs = /turf/open/floor/plating/asteroid/layenia
-	initial_gas_mix = FROZEN_ATMOS
-	planetary_atmos = TRUE
-
-/turf/open/indestructible/concrete/smooth
-	icon_state = "concrete2"
-	initial_gas_mix = FROZEN_ATMOS
-	planetary_atmos = TRUE
-
 /turf/open/indestructible/cobble/side
 	icon_state = "cobble_side"
 
@@ -106,28 +93,6 @@
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 	tiled_dirt = FALSE
 
-/turf/open/indestructible/layenia/crystal
-	name = "Lattice Crystal"
-	desc = "A glowing azure crystal, with strange properties to make things float."
-	icon = 'icons/turf/floors/crystal_floor.dmi'
-	icon_state = "mapping"
-	baseturfs = /turf/open/indestructible/layenia/crystal
-	slowdown = 1
-	light_range = 4
-	light_power = 0.5
-	barefootstep = FOOTSTEP_HARD_BAREFOOT
-	clawfootstep = FOOTSTEP_HARD_CLAW
-	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	light_color = LIGHT_COLOR_BLUE
-	initial_gas_mix = FROZEN_ATMOS
-	planetary_atmos = TRUE
-	smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
-	canSmoothWith = list(/turf/open/indestructible/layenia/crystal)
-
-/turf/open/indestructible/layenia/crystal/garden
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	planetary_atmos = TRUE
-
 /turf/open/indestructible/necropolis
 	name = "necropolis floor"
 	desc = "It's regarding you suspiciously."

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -365,43 +365,3 @@
 /turf/open/floor/plating/asteroid/snow/atmosphere
 	initial_gas_mix = FROZEN_ATMOS
 	planetary_atmos = FALSE
-
-//Layenia stuff
-
-/turf/open/floor/plating/asteroid/layenia
-	gender = PLURAL //trans rights
-	name = "crimson Rock"
-	desc = "A cold rock, rusted scarlet in color."
-	icon = 'icons/turf/floors.dmi'
-	baseturfs = /turf/open/floor/plating/asteroid/layenia
-	icon_state = "layenia"
-	icon_plating = "layenia"
-	initial_gas_mix = FROZEN_ATMOS
-	slowdown = 1
-	environment_type = "layenia"
-	flags_1 = NONE
-	heat_capacity = INFINITY //Makes it so no matter the heat, it will not burn out.
-	planetary_atmos = TRUE
-	burnt_states = null
-	bullet_sizzle = TRUE
-	bullet_bounce_sound = null
-	digResult = /obj/item/stack/ore/glass/basalt
-	floor_variance = 50 //This means 50% chance of variating from the default tile.
-	quantity_of_available_tiles = 5
-	//light_range = 2
-	//light_power = 0.15
-	//light_color = LIGHT_COLOR_WHITE
-
-/turf/open/floor/plating/asteroid/layenia/Initialize()
-	. = ..()
-	//We no longer randomize the icon state here. That is done by the supercall in our parent, asteroid.
-	set_layenia_light(src)
-
-/turf/open/floor/plating/asteroid/layenia/garden
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	planetary_atmos = TRUE
-
-/proc/set_layenia_light(turf/open/floor/B)
-	switch(B.icon_state)
-		if("layenia3", "layenia4")
-			B.set_light(2, 0.6, LIGHT_COLOR_BLUE) //more light

code/game/turfs/simulated/minerals.dm

@@ -539,15 +539,3 @@
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = 1
-
-/turf/closed/mineral/layenia
-	name = "Crimson rock"
-	icon = 'icons/turf/mining.dmi'
-	smooth_icon = 'icons/turf/layeniarocks.dmi'
-	icon_state = "layenia"
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = null
-	baseturfs = /turf/open/floor/plating/asteroid/layenia
-	initial_gas_mix = FROZEN_ATMOS
-	environment_type = "layenia"
-	turf_type = /turf/open/floor/plating/asteroid/layenia

hyperstation/code/game/turfs/open.dm

@@ -1,14 +1,83 @@
-/turf/open/indestructible/layenia/sand
+/turf/open/indestructible/concrete
+	name = "concrete"
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "concrete"
+	baseturfs = /turf/open/floor/plating/asteroid/layenia
+	initial_gas_mix = FROZEN_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/indestructible/concrete/smooth
+	icon_state = "concrete2"
+	initial_gas_mix = FROZEN_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/indestructible/layenia/crystal
+	name = "Lattice Crystal"
+	desc = "A glowing azure crystal, with strange properties to make things float."
+	icon = 'hyperstation/icons/turf/floors/layeniacrystal.dmi'
+	icon_state = "mapping"
+	baseturfs = /turf/open/indestructible/layenia/crystal
+	slowdown = 1
+	light_range = 4
+	light_power = 0.5
+	barefootstep = FOOTSTEP_HARD_BAREFOOT
+	clawfootstep = FOOTSTEP_HARD_CLAW
+	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+	light_color = LIGHT_COLOR_BLUE
+	initial_gas_mix = FROZEN_ATMOS
+	planetary_atmos = TRUE
+	smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
+	canSmoothWith = list(/turf/open/indestructible/layenia/crystal)
+
+/turf/open/indestructible/layenia/crystal/garden
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/floor/plating/asteroid/layenia
+	gender = PLURAL //trans rights
+	name = "crimson Rock"
+	desc = "A cold rock, rusted scarlet in color."
+	icon = 'hyperstation/icons/turf/floors/layenia.dmi'
+	baseturfs = /turf/open/floor/plating/asteroid/layenia
+	icon_state = "layenia"
+	icon_plating = "layenia"
+	initial_gas_mix = FROZEN_ATMOS
+	slowdown = 1
+	environment_type = "layenia"
+	flags_1 = NONE
+	heat_capacity = INFINITY //Makes it so no matter the heat, it will not burn out.
+	planetary_atmos = TRUE
+	burnt_states = null
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
+	digResult = /obj/item/stack/ore/glass/basalt
+	floor_variance = 50 //This means 50% chance of variating from the default tile.
+	quantity_of_available_tiles = 5
+	//light_range = 2
+	//light_power = 0.15
+	//light_color = LIGHT_COLOR_WHITE
+
+/turf/open/floor/plating/asteroid/layenia/Initialize()
+	. = ..()
+	//We no longer randomize the icon state here. That is done by the supercall in our parent, asteroid.
+	set_layenia_light(src)
+
+/turf/open/floor/plating/asteroid/layenia/garden
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/floor/plating/asteroid/layenia/sand
 	name = "\improper crimson sand"
 	desc = "A reddish sand."
 	icon = 'hyperstation/icons/turf/floors/layeniasand.dmi'
 	icon_state = "mapping"
-	baseturfs = /turf/open/indestructible/layenia/crystal
-	slowdown = 1
+	baseturfs = /turf/open/floor/plating/asteroid/layenia/sand
 	barefootstep = FOOTSTEP_SAND
 	clawfootstep = FOOTSTEP_SAND
-	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	initial_gas_mix = FROZEN_ATMOS
-	planetary_atmos = TRUE
 	smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
-	canSmoothWith = list(/turf/open/indestructible/layenia/sand)
+	canSmoothWith = list(/turf/open/floor/plating/asteroid/layenia/sand)
+
+/proc/set_layenia_light(turf/open/floor/B)
+	switch(B.icon_state)
+		if("layenia3", "layenia4")
+			B.set_light(2, 0.6, LIGHT_COLOR_BLUE) //more light

hyperstation/code/game/turfs/simulated/minerals.dm

@@ -0,0 +1,11 @@
+/turf/closed/mineral/layenia
+	name = "Crimson rock"
+	icon = 'hyperstation/icons/turf/floors/layeniamining.dmi'
+	smooth_icon = 'hyperstation/icons/turf/floors/layeniarocks.dmi'
+	icon_state = "layenia"
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = null
+	baseturfs = /turf/open/floor/plating/asteroid/layenia
+	initial_gas_mix = FROZEN_ATMOS
+	environment_type = "layenia"
+	turf_type = /turf/open/floor/plating/asteroid/layenia

tgstation.dme

@@ -3136,6 +3136,7 @@
 #include "hyperstation\code\game\objects\structures\sauna_oven.dm"
 #include "hyperstation\code\game\objects\structures\tables_racks.dm"
 #include "hyperstation\code\game\turfs\open.dm"
+#include "hyperstation\code\game\turfs\simulated\minerals.dm"
 #include "hyperstation\code\game\turfs\simulated\floor\fancy_floor.dm"
 #include "hyperstation\code\game\turfs\simulated\wall\mineral_walls.dm"
 #include "hyperstation\code\gamemode\traitor_lewd.dm"