diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index d0e9e62daeaa0..fb4d98bb742eb 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -862,6 +862,9 @@ "ds" = ( /turf/simulated/wall/indestructible/syndicate, /area/centcom) +"dt" = ( +/turf/simulated/floor/plasteel/stairs/right, +/area/syndicate_mothership) "du" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/shaker, @@ -5565,7 +5568,7 @@ /turf/simulated/floor/plating, /area/shuttle/syndicate) "sK" = ( -/turf/simulated/floor/plasteel/stairs/old, +/turf/simulated/floor/plasteel/stairs/left, /area/syndicate_mothership) "sL" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated, @@ -62442,7 +62445,7 @@ ab ab ab ab -BZ +sK hG UO iT @@ -65789,7 +65792,7 @@ BY BY BY BY -sK +dt XJ XJ tW diff --git a/_maps/map_files/templates/biodome_beach.dmm b/_maps/map_files/templates/biodome_beach.dmm index 3e0d5667f94f2..9c2c233eb8e32 100644 --- a/_maps/map_files/templates/biodome_beach.dmm +++ b/_maps/map_files/templates/biodome_beach.dmm @@ -352,7 +352,7 @@ /turf/simulated/floor/beach/water, /area/ruin/powered/beach) "bM" = ( -/turf/simulated/floor/plasteel/stairs/old, +/turf/simulated/floor/plasteel/stairs, /area/ruin/powered/beach) "bN" = ( /obj/structure/flora/ausbushes/reedbush, diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 021c17091523b..dce375016fde6 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","damaged3","damaged4", "damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "platingdmg3","plating","light_on","warnplate", "warnplatecorner","metalfoam", "ironfoam", - "light_off","wall_thermite","grass1","grass2","grass3","grass4", + "light_off","grass1","grass2","grass3","grass4", "asteroid","asteroid_dug","asteroid0","asteroid1","asteroid2","asteroid3","asteroid4", "asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12", "oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet", diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index da4915de892b2..5861ecf00f05d 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -79,14 +79,15 @@ /turf/simulated/floor/plasteel/stairs icon_state = "stairs" + /turf/simulated/floor/plasteel/stairs/left icon_state = "stairs-l" + /turf/simulated/floor/plasteel/stairs/medium icon_state = "stairs-m" + /turf/simulated/floor/plasteel/stairs/right icon_state = "stairs-r" -/turf/simulated/floor/plasteel/stairs/old - icon_state = "stairs-old" /turf/simulated/floor/plasteel/grimy icon_state = "grimy" diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 2a032e8a1da7e..e024f21d33c44 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/paradise.dme b/paradise.dme index 7421636c28374..83b948a60f8bd 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1409,6 +1409,7 @@ #include "code\game\verbs\switch_server.dm" #include "code\game\verbs\webmap.dm" #include "code\game\verbs\who.dm" +#include "code\goonstation\modules\power\power_transmission_laser\transmission_laser.dm" #include "code\modules\admin\admin_investigate.dm" #include "code\modules\admin\admin_memo.dm" #include "code\modules\admin\admin_ranks.dm" @@ -2609,7 +2610,6 @@ #include "code\modules\power\powernets\local_powernet.dm" #include "code\modules\power\powernets\powernet_helpers.dm" #include "code\modules\power\powernets\regional_powernet.dm" -#include "code\goonstation\modules\power\power_transmission_laser\transmission_laser.dm" #include "code\modules\procedural_mapping\mapGenerator.dm" #include "code\modules\procedural_mapping\mapGeneratorModule.dm" #include "code\modules\procedural_mapping\mapGeneratorReadme.dm"