From 78505addf5cbade334493a5d984fbe998e783f45 Mon Sep 17 00:00:00 2001 From: wejengin2 Date: Sat, 24 Oct 2020 13:20:34 +0200 Subject: [PATCH 1/2] more --- .../maint/10x10/10x10_assaultpod.dmm | 326 ++++++++++++++++++ .../StationRuins/maint/10x10/10x10_maze.dmm | 233 +++++++++++++ .../StationRuins/maint/10x10/10x10_maze2.dmm | 258 ++++++++++++++ .../StationRuins/maint/10x5/10x5_ballpit.dmm | 158 +++++++++ .../StationRuins/maint/10x5/10x5_commie.dmm | 209 +++++++++++ .../maint/10x5/10x5_firingrange.dmm | 239 +++++++++++++ .../StationRuins/maint/5x3/5x3_podmin.dmm | 109 ++++++ .../maint/5x3/5x3_waitingroom.dmm | 116 +++++++ .../StationRuins/maint/5x4/5x4_laundromat.dmm | 144 ++++++++ .../StationRuins/maint/5x4/5x4_pass.dmm | 72 ++++ yogstation/code/datums/ruins/station.dm | 64 +++- .../code/game/objects/effects/landmarks.dm | 8 +- 12 files changed, 1930 insertions(+), 6 deletions(-) create mode 100644 _maps/RandomRuins/StationRuins/maint/10x10/10x10_assaultpod.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/10x10/10x10_maze.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/10x10/10x10_maze2.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/10x5/10x5_ballpit.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/10x5/10x5_commie.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/5x3/5x3_podmin.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/5x3/5x3_waitingroom.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/5x4/5x4_laundromat.dmm create mode 100644 _maps/RandomRuins/StationRuins/maint/5x4/5x4_pass.dmm diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_assaultpod.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_assaultpod.dmm new file mode 100644 index 000000000000..7bbd2f0bbd3c --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_assaultpod.dmm @@ -0,0 +1,326 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/hatch, +/turf/open/floor/plating, +/area/template_noop) +"b" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"d" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"e" = ( +/obj/item/clothing/suit/syndicatefake, +/obj/item/clothing/head/syndicatefake, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/template_noop) +"f" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"g" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"i" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/template_noop) +"k" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"m" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/template_noop) +"n" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"o" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"p" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"q" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light/broken, +/turf/open/floor/plating, +/area/template_noop) +"r" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"t" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/template_noop) +"v" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"w" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"x" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/plating, +/area/template_noop) +"y" = ( +/turf/closed/wall/mineral/plastitanium, +/area/template_noop) +"z" = ( +/obj/item/trash/syndi_cakes, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"A" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"C" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "floor7-old" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"E" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/coin/antagtoken, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"F" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/template_noop) +"H" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plating, +/area/template_noop) +"I" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/template_noop) +"L" = ( +/obj/structure/girder, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"M" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"N" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"O" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"P" = ( +/obj/structure/girder, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"Q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/template_noop) +"S" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plating, +/area/template_noop) +"V" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"W" = ( +/turf/open/floor/plating, +/area/template_noop) +"X" = ( +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/template_noop) +"Y" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/template_noop) + +(1,1,1) = {" +n +n +n +W +W +p +N +n +k +p +"} +(2,1,1) = {" +n +W +y +y +a +i +C +t +J +p +"} +(3,1,1) = {" +W +y +y +r +w +p +O +p +p +I +"} +(4,1,1) = {" +n +y +r +w +E +p +H +V +I +Y +"} +(5,1,1) = {" +n +n +M +q +y +g +w +S +p +W +"} +(6,1,1) = {" +W +L +b +C +f +M +v +I +X +n +"} +(7,1,1) = {" +p +I +p +A +z +d +y +i +W +n +"} +(8,1,1) = {" +W +p +p +o +F +P +i +x +e +n +"} +(9,1,1) = {" +n +O +O +W +n +n +W +W +n +n +"} +(10,1,1) = {" +W +W +W +W +n +W +W +U +m +Q +"} diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze.dmm new file mode 100644 index 000000000000..931d369aa366 --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze.dmm @@ -0,0 +1,233 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"e" = ( +/obj/machinery/light/small, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"g" = ( +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"h" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"k" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/template_noop) +"p" = ( +/obj/item/poster{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/template_noop) +"r" = ( +/obj/machinery/light/small, +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"t" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/template_noop) +"v" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/template_noop) +"y" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"A" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/remains/human, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"C" = ( +/turf/open/floor/plating, +/area/template_noop) +"J" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/template_noop) +"L" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"N" = ( +/turf/closed/wall, +/area/template_noop) +"R" = ( +/obj/machinery/light/small, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/template_noop) +"S" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/toy/plush/lizardplushie, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"X" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"Y" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) + +(1,1,1) = {" +v +C +N +C +C +C +N +L +C +X +"} +(2,1,1) = {" +g +C +C +C +N +N +N +N +p +r +"} +(3,1,1) = {" +y +C +C +N +N +C +C +C +C +t +"} +(4,1,1) = {" +N +N +C +C +Y +C +N +N +N +N +"} +(5,1,1) = {" +C +N +N +N +N +C +N +h +C +C +"} +(6,1,1) = {" +C +C +C +R +N +k +C +C +N +C +"} +(7,1,1) = {" +N +N +C +N +N +C +N +C +C +C +"} +(8,1,1) = {" +A +N +C +C +C +C +N +J +N +C +"} +(9,1,1) = {" +z +N +N +N +C +N +N +N +N +C +"} +(10,1,1) = {" +C +C +C +C +C +C +e +N +S +C +"} diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze2.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze2.dmm new file mode 100644 index 000000000000..7d8a9e6e89a4 --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_maze2.dmm @@ -0,0 +1,258 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "trails_2" + }, +/turf/open/floor/plating, +/area/template_noop) +"d" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/template_noop) +"f" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"j" = ( +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/floor/plating, +/area/template_noop) +"k" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"s" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/glass, +/obj/item/shard{ + icon_state = "small" + }, +/turf/open/floor/plating, +/area/template_noop) +"w" = ( +/turf/open/floor/plating, +/area/template_noop) +"y" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"C" = ( +/obj/item/toy/plush/nukeplushie, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/template_noop) +"E" = ( +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/template_noop) +"H" = ( +/obj/effect/decal/cleanable/blood{ + dir = 10; + icon_state = "trails_1" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"K" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"L" = ( +/obj/effect/decal/cleanable/blood{ + dir = 5; + icon_state = "trails_2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/template_noop) +"M" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "trails_1" + }, +/turf/open/floor/plating, +/area/template_noop) +"P" = ( +/obj/item/toner, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/closet/crate, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/template_noop) +"Q" = ( +/turf/closed/wall, +/area/template_noop) +"R" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "trails_2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/glowstick, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/template_noop) +"V" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"W" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"X" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"Z" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/template_noop) + +(1,1,1) = {" +w +C +Q +z +w +w +z +Q +d +y +"} +(2,1,1) = {" +z +Q +Q +w +w +Q +z +z +w +E +"} +(3,1,1) = {" +z +f +Q +w +Q +Q +Q +w +Q +Z +"} +(4,1,1) = {" +w +w +X +w +Q +K +w +w +z +z +"} +(5,1,1) = {" +w +Q +Q +w +Q +W +Q +Q +Q +W +"} +(6,1,1) = {" +z +Q +U +z +s +w +Q +z +w +W +"} +(7,1,1) = {" +z +Q +k +z +Q +w +w +z +Q +w +"} +(8,1,1) = {" +z +w +z +w +Q +Q +Q +Q +Q +V +"} +(9,1,1) = {" +w +Q +Q +w +w +M +R +H +Q +Q +"} +(10,1,1) = {" +w +P +Q +w +W +w +Q +L +c +j +"} diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ballpit.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ballpit.dmm new file mode 100644 index 000000000000..6ec485b97ce5 --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ballpit.dmm @@ -0,0 +1,158 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"d" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/template_noop) +"f" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair{ + dir = 8 + }, +/obj/item/trash/can, +/turf/open/floor/carpet/red, +/area/template_noop) +"j" = ( +/turf/open/floor/plating, +/area/template_noop) +"n" = ( +/obj/item/chair, +/turf/open/floor/carpet/red, +/area/template_noop) +"x" = ( +/obj/item/trash/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/ballpit, +/area/template_noop) +"E" = ( +/turf/open/floor/carpet/red, +/area/template_noop) +"G" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni{ + pixel_y = -9 + }, +/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni{ + pixel_x = 9 + }, +/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/carpet/red, +/area/template_noop) +"H" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/carpet/red, +/area/template_noop) +"K" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"R" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/template_noop) +"S" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/turf/open/floor/ballpit, +/area/template_noop) +"Z" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/soda_cans/space_up, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/carpet/red, +/area/template_noop) + +(1,1,1) = {" +f +j +S +S +S +"} +(2,1,1) = {" +f +U +U +U +j +"} +(3,1,1) = {" +S +U +z +U +j +"} +(4,1,1) = {" +S +U +U +U +S +"} +(5,1,1) = {" +j +U +U +U +S +"} +(6,1,1) = {" +j +U +U +U +j +"} +(7,1,1) = {" +x +E +E +j +j +"} +(8,1,1) = {" +E +G +Z +H +f +"} +(9,1,1) = {" +E +n +h +R +E +"} +(10,1,1) = {" +K +d +d +E +j +"} diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_commie.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_commie.dmm new file mode 100644 index 000000000000..0738f0168cfd --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_commie.dmm @@ -0,0 +1,209 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"c" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/template_noop) +"d" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/glass, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"e" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating, +/area/template_noop) +"g" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"h" = ( +/turf/open/floor/plasteel, +/area/template_noop) +"k" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"l" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/template_noop) +"o" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"s" = ( +/turf/open/floor/plating, +/area/template_noop) +"t" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/obj/structure/chair/stool, +/turf/open/floor/plating, +/area/template_noop) +"B" = ( +/obj/machinery/vending/sovietsoda, +/turf/open/floor/plasteel, +/area/template_noop) +"H" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/plasteel, +/area/template_noop) +"I" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"K" = ( +/obj/structure/table, +/obj/item/radio, +/turf/open/floor/plating, +/area/template_noop) +"M" = ( +/obj/item/vending_refill/sovietsoda, +/obj/structure/closet/crate, +/obj/item/coin, +/obj/item/coin, +/obj/item/coin/iron, +/turf/open/floor/plating, +/area/template_noop) +"O" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"Q" = ( +/obj/structure/table, +/obj/item/clothing/under/soviet, +/obj/item/clothing/head/ushanka{ + pixel_y = 10 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"S" = ( +/obj/structure/grille, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/turf/open/floor/plasteel, +/area/template_noop) +"V" = ( +/turf/closed/wall, +/area/template_noop) +"W" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"Z" = ( +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/structure/rack, +/turf/open/floor/plasteel, +/area/template_noop) + +(1,1,1) = {" +s +s +J +J +b +"} +(2,1,1) = {" +J +V +I +V +V +"} +(3,1,1) = {" +J +d +J +s +k +"} +(4,1,1) = {" +O +t +z +s +s +"} +(5,1,1) = {" +s +V +W +z +J +"} +(6,1,1) = {" +e +V +S +c +J +"} +(7,1,1) = {" +H +o +Z +k +s +"} +(8,1,1) = {" +Q +h +k +g +k +"} +(9,1,1) = {" +B +l +O +O +s +"} +(10,1,1) = {" +U +l +J +M +K +"} diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm new file mode 100644 index 000000000000..804462a8da29 --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm @@ -0,0 +1,239 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"c" = ( +/obj/structure/table_frame, +/turf/open/floor/plating, +/area/template_noop) +"d" = ( +/obj/structure/table, +/turf/open/floor/plating, +/area/template_noop) +"f" = ( +/turf/open/floor/plasteel, +/area/template_noop) +"h" = ( +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/obj/structure/grille, +/turf/open/floor/plating, +/area/template_noop) +"i" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"j" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/template_noop) +"n" = ( +/obj/machinery/door/window{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"p" = ( +/turf/closed/wall, +/area/template_noop) +"s" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"t" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating, +/area/template_noop) +"u" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/template_noop) +"y" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/template_noop) +"C" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/turf/open/floor/plating, +/area/template_noop) +"F" = ( +/obj/item/target/syndicate, +/turf/open/floor/plating, +/area/template_noop) +"G" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/template_noop) +"I" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/item/target, +/obj/item/target/clown, +/obj/item/target/syndicate, +/obj/item/cardboard_cutout, +/obj/item/cardboard_cutout, +/obj/item/stack/rods/fifty, +/turf/open/floor/plasteel, +/area/template_noop) +"J" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table_frame, +/obj/item/gun/energy/laser/practice, +/turf/open/floor/plasteel, +/area/template_noop) +"K" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/template_noop) +"P" = ( +/obj/item/chair, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"Q" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/template_noop) +"R" = ( +/turf/open/floor/plating, +/area/template_noop) +"S" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/template_noop) +"T" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/template_noop) +"X" = ( +/obj/structure/table, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/paper/crumpled, +/turf/open/floor/plasteel, +/area/template_noop) +"Y" = ( +/obj/item/target, +/turf/open/floor/plating, +/area/template_noop) + +(1,1,1) = {" +x +R +u +R +x +"} +(2,1,1) = {" +z +s +P +x +x +"} +(3,1,1) = {" +p +p +h +Q +T +"} +(4,1,1) = {" +I +X +d +R +c +"} +(5,1,1) = {" +j +j +R +x +j +"} +(6,1,1) = {" +f +y +R +x +j +"} +(7,1,1) = {" +C +i +n +J +b +"} +(8,1,1) = {" +t +x +R +R +S +"} +(9,1,1) = {" +R +Y +F +Y +x +"} +(10,1,1) = {" +K +R +x +R +G +"} diff --git a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_podmin.dmm b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_podmin.dmm new file mode 100644 index 000000000000..b03abf06279f --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_podmin.dmm @@ -0,0 +1,109 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"k" = ( +/obj/effect/decal/cleanable/blood/old{ + dir = 10; + icon_state = "trails_1"; + name = "dried blood trail" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"m" = ( +/obj/effect/decal/cleanable/blood/gibs/limb{ + dir = 1 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"r" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "floor1" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"v" = ( +/turf/open/floor/plating, +/area/template_noop) +"D" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"H" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/blood/old{ + icon_state = "floor1" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"L" = ( +/obj/effect/decal/cleanable/blood/old{ + dir = 4; + icon_state = "trails_1"; + name = "dried blood trail" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"O" = ( +/obj/structure/closet/supplypod, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"S" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"V" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "floor1" + }, +/obj/effect/decal/cleanable/blood/gibs/limb{ + dir = 8 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"X" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) + +(1,1,1) = {" +H +k +X +"} +(2,1,1) = {" +D +L +m +"} +(3,1,1) = {" +v +O +v +"} +(4,1,1) = {" +L +S +r +"} +(5,1,1) = {" +V +v +S +"} diff --git a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_waitingroom.dmm b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_waitingroom.dmm new file mode 100644 index 000000000000..e68eac9b904b --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_waitingroom.dmm @@ -0,0 +1,116 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/turf/open/floor/plasteel, +/area/template_noop) +"g" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/love_ian{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"q" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"t" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"A" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"G" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"J" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/sillycup, +/turf/open/floor/plasteel, +/area/template_noop) +"L" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"Q" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"U" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/newspaper, +/turf/open/floor/plasteel, +/area/template_noop) + +(1,1,1) = {" +J +b +Q +"} +(2,1,1) = {" +U +b +g +"} +(3,1,1) = {" +q +b +A +"} +(4,1,1) = {" +G +b +A +"} +(5,1,1) = {" +L +b +t +"} diff --git a/_maps/RandomRuins/StationRuins/maint/5x4/5x4_laundromat.dmm b/_maps/RandomRuins/StationRuins/maint/5x4/5x4_laundromat.dmm new file mode 100644 index 000000000000..1d0c1252888a --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/5x4/5x4_laundromat.dmm @@ -0,0 +1,144 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/plasteel/white, +/area/template_noop) +"d" = ( +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"e" = ( +/obj/machinery/washing_machine, +/obj/item/toy/crayon/yellow, +/turf/open/floor/plasteel/white, +/area/template_noop) +"j" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/plasteel/white, +/area/template_noop) +"o" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/lootdrop/costume, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/template_noop) +"v" = ( +/obj/machinery/washing_machine, +/turf/open/floor/plasteel/white, +/area/template_noop) +"x" = ( +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"C" = ( +/obj/effect/turf_decal/trimline/white/filled/line, +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"D" = ( +/obj/machinery/washing_machine, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/plasteel/white, +/area/template_noop) +"F" = ( +/obj/effect/turf_decal/trimline/white/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"G" = ( +/obj/effect/turf_decal/trimline/white/filled/corner, +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"H" = ( +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"L" = ( +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/template_noop) +"N" = ( +/turf/open/floor/plasteel, +/area/template_noop) +"P" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/turf/open/floor/plasteel/white, +/area/template_noop) +"S" = ( +/obj/effect/turf_decal/trimline/white/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/white/filled/corner, +/turf/open/floor/plasteel, +/area/template_noop) +"T" = ( +/obj/machinery/washing_machine, +/obj/effect/spawner/lootdrop/gloves, +/turf/open/floor/plasteel/white, +/area/template_noop) +"U" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/gloves, +/obj/effect/spawner/lootdrop/gloves, +/obj/item/storage/crayons, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/template_noop) +"V" = ( +/obj/effect/turf_decal/trimline/white/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/template_noop) + +(1,1,1) = {" +j +C +e +T +"} +(2,1,1) = {" +o +F +H +x +"} +(3,1,1) = {" +a +V +N +S +"} +(4,1,1) = {" +U +G +d +L +"} +(5,1,1) = {" +P +C +D +v +"} diff --git a/_maps/RandomRuins/StationRuins/maint/5x4/5x4_pass.dmm b/_maps/RandomRuins/StationRuins/maint/5x4/5x4_pass.dmm new file mode 100644 index 000000000000..94b3881a33bb --- /dev/null +++ b/_maps/RandomRuins/StationRuins/maint/5x4/5x4_pass.dmm @@ -0,0 +1,72 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"e" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/template_noop) +"f" = ( +/turf/open/floor/plating, +/area/template_noop) +"i" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/template_noop) +"r" = ( +/turf/open/space/basic, +/area/space) +"w" = ( +/obj/structure/chair, +/turf/open/floor/plating, +/area/template_noop) +"x" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/template_noop) +"M" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/template_noop) +"R" = ( +/obj/effect/spawner/structure/window/reinforced/shutter, +/turf/open/floor/plating, +/area/template_noop) +"T" = ( +/obj/structure/chair, +/obj/item/storage/box/fancy/cigarettes/cigpack_uplift, +/turf/open/floor/plating, +/area/template_noop) + +(1,1,1) = {" +x +f +R +r +"} +(2,1,1) = {" +e +M +R +R +"} +(3,1,1) = {" +f +f +f +i +"} +(4,1,1) = {" +f +w +R +R +"} +(5,1,1) = {" +f +T +R +r +"} diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index 025f9860c5fd..f18f1526736d 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -686,6 +686,18 @@ suffix = "5x3_yogsmaintrpg.dmm" name = "Maint yogsmaintrpg" +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/fivexthree/podmin + id= "podmin" + suffix = "5x3_podmin.dmm" + name = "Maint podmin" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/fivexthree/waitingroom + id= "waitingroom" + suffix = "5x3_waitingroom.dmm" + name = "Maint waitingroom" + ///The base for the 5x4 rooms. /datum/map_template/ruin/station/maint/fivexfour prefix = "_maps/RandomRuins/StationRuins/maint/5x4/" @@ -756,6 +768,18 @@ suffix = "5x4_firemanroom.dmm" name = "Maint firemanroom" +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/fivexfour/pass + id= "pass" + suffix = "5x4_pass.dmm" + name = "Maint pass" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/fivexfour/laundromat + id= "laundromat" + suffix = "5x4_laundromat.dmm" + name = "Maint laundromat" + ///Icicle-brrr its cold! Author: Jcat /datum/map_template/ruin/station/maint/fivexfour/icicle id= "icicle" @@ -880,6 +904,24 @@ suffix = "10x5_transit.dmm" name = "Maint transit" +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxfive/ballpit + id= "ballpit" + suffix = "10x5_ballpit.dmm" + name = "Maint ballpit" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxfive/commie + id= "commie" + suffix = "10x5_commie.dmm" + name = "Maint commie" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxfive/firingrange + id= "firingrange" + suffix = "10x5_firingrange.dmm" + name = "Maint firingrange" + ///The base for the 10x10 rooms. /datum/map_template/ruin/station/maint/tenxten prefix = "_maps/RandomRuins/StationRuins/maint/10x10/" @@ -947,14 +989,32 @@ suffix = "10x10_snakefighter.dmm" name = "Maint snakefighter" -///Vault- A 'heavily guarded' vault. Author-Jcat +///Vault- A 'heavily guarded' vault. Author: Jcat /datum/map_template/ruin/station/maint/tenxten/vault id= "vault" suffix = "10x10_vault.dmm" name = "Maint vault" -///Ward-outbreak gone wrong. Author- Jcat +///Ward-outbreak gone wrong. Author: Jcat /datum/map_template/ruin/station/maint/tenxten/ward id= "ward" suffix = "10x10_ward.dmm" name = "Maint ward" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxten/assaultpod + id= "assaultpod" + suffix = "10x10_assaultpod.dmm" + name = "Maint assaultpod" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxten/maze + id= "maze" + suffix = "10x10_maze.dmm" + name = "Maint maze" + +///Author: Veeblefetzer +/datum/map_template/ruin/station/maint/tenxten/maze2 + id= "maze2" + suffix = "10x10_maze2.dmm" + name = "Maint maze2" diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index cccdc4fe6a6d..7c1f46b8b9cb 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -127,13 +127,13 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) template_names = list("Maint airlockstorage", "Maint boxclutter7", "Maint boxkitchen", "Maint boxmaintfreezers", "Maint canisterroom", "Maint checkpoint", "Maint hank", "Maint junkcloset", "Maint kilomobden", "Maint laststand", "Maint monky", "Maint onioncult", "Maint pubbyclutter5", "Maint pubbyclutter6", "Maint pubbyrobotics", "Maint ripleywreck") /obj/effect/landmark/stationroom/maint/fivexthree - template_names = list("Maint boxclutter1", "Maint breach", "Maint cloner", "Maint deltaclutter2", "Maint deltaclutter3", "Maint incompletefloor", "Maint kiloclutter1", "Maint metaclutter1", "Maint metaclutter3", "Maint minibreakroom", "Maint nastytrap", "Maint pills", "Maint pubbybedroom", "Maint pubbyclutter4", "Maint pubbyclutter7", "Maint pubbykitchen", "Maint storeroom", "Maint yogsmaintdet", "Maint yogsmaintrpg") + template_names = list("Maint boxclutter1", "Maint breach", "Maint cloner", "Maint deltaclutter2", "Maint deltaclutter3", "Maint incompletefloor", "Maint kiloclutter1", "Maint metaclutter1", "Maint metaclutter3", "Maint minibreakroom", "Maint nastytrap", "Maint pills", "Maint pubbybedroom", "Maint pubbyclutter4", "Maint pubbyclutter7", "Maint pubbykitchen", "Maint storeroom", "Maint yogsmaintdet", "Maint yogsmaintrpg", "Maint waitingroom", "Maint podmin") /obj/effect/landmark/stationroom/maint/fivexfour - template_names = list("Maint blasted", "Maint boxbar", "Maint boxdinner", "Maint boxsurgery", "Maint comproom", "Maint deltabar", "Maint deltadetective", "Maint deltadressing", "Maint deltaEVA", "Maint deltagamble", "Maint deltalounge", "Maint deltasurgery", "Maint firemanroom", "Maint icicle", "Maint kilohauntedlibrary", "Maint kilosurgery", "Maint medusa", "Maint metakitchen", "Maint metamedical", "Maint metarobotics", "Maint metatheatre", "Maint pubbysurgery", "Maint tinybarbershop") + template_names = list("Maint blasted", "Maint boxbar", "Maint boxdinner", "Maint boxsurgery", "Maint comproom", "Maint deltabar", "Maint deltadetective", "Maint deltadressing", "Maint deltaEVA", "Maint deltagamble", "Maint deltalounge", "Maint deltasurgery", "Maint firemanroom", "Maint icicle", "Maint kilohauntedlibrary", "Maint kilosurgery", "Maint medusa", "Maint metakitchen", "Maint metamedical", "Maint metarobotics", "Maint metatheatre", "Maint pubbysurgery", "Maint tinybarbershop", "Maint laundromat", "Maint pass") /obj/effect/landmark/stationroom/maint/tenxfive - template_names = list("Maint barbershop", "Maint deltaarcade", "Maint deltabotnis", "Maint deltacafeteria", "Maint deltaclutter1", "Maint deltarobotics", "Maint factory", "Maint maintmedical", "Maint meetingroom", "Maint phage", "Maint skidrow", "Maint transit") + template_names = list("Maint barbershop", "Maint deltaarcade", "Maint deltabotnis", "Maint deltacafeteria", "Maint deltaclutter1", "Maint deltarobotics", "Maint factory", "Maint maintmedical", "Maint meetingroom", "Maint phage", "Maint skidrow", "Maint transit", "Maint ballpit", "Maint commie", "Maint firingrange", ) /obj/effect/landmark/stationroom/maint/tenxten - template_names = list("Maint aquarium", "Maint bigconstruction", "Maint bigtheatre", "Maint deltalibrary", "Maint graffitiroom", "Maint junction", "Maint podrepairbay", "Maint pubbybar", "Maint roosterdome", "Maint sanitarium", "Maint snakefighter", "Maint vault", "Maint ward") + template_names = list("Maint aquarium", "Maint bigconstruction", "Maint bigtheatre", "Maint deltalibrary", "Maint graffitiroom", "Maint junction", "Maint podrepairbay", "Maint pubbybar", "Maint roosterdome", "Maint sanitarium", "Maint snakefighter", "Maint vault", "Maint ward", "Maint assaultpod", "Maint maze", "Maint maze2") From 28c7bc9c5245b0622f049daa997e95da31d9251a Mon Sep 17 00:00:00 2001 From: wejengin2 Date: Sun, 25 Oct 2020 14:55:28 +0100 Subject: [PATCH 2/2] charg'nt --- .../maint/10x5/10x5_firingrange.dmm | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm index 804462a8da29..daf2071d2d6e 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_firingrange.dmm @@ -14,25 +14,12 @@ /obj/structure/table, /turf/open/floor/plating, /area/template_noop) -"f" = ( -/turf/open/floor/plasteel, -/area/template_noop) "h" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, /obj/structure/grille, /turf/open/floor/plating, /area/template_noop) -"i" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/turf/open/floor/plating, -/area/template_noop) "j" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -81,6 +68,14 @@ }, /turf/open/floor/plating, /area/template_noop) +"B" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/obj/item/circuitboard/machine/recharger, +/turf/open/floor/plating, +/area/template_noop) "C" = ( /obj/structure/window/reinforced{ dir = 4 @@ -129,6 +124,10 @@ }, /turf/open/floor/plating, /area/template_noop) +"N" = ( +/obj/structure/frame/machine, +/turf/open/floor/plasteel, +/area/template_noop) "P" = ( /obj/item/chair, /turf/open/floor/plating{ @@ -153,6 +152,10 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/template_noop) +"V" = ( +/obj/item/stack/cable_coil/cut, +/turf/open/floor/plating, +/area/template_noop) "X" = ( /obj/structure/table, /obj/item/pen{ @@ -203,15 +206,15 @@ x j "} (6,1,1) = {" -f +N y -R +V x j "} (7,1,1) = {" C -i +B n J b