From 9a54b451eba908d97ede60b730ba81785018f8b2 Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Tue, 18 Feb 2020 12:57:48 +1300 Subject: [PATCH] Added two more ruins, Owai's suggestions. --- _maps/RandomRuins/SpaceRuinsStation/roid6.dmm | 349 +++++++++ _maps/RandomRuins/SpaceRuinsStation/roid7.dmm | 690 ++++++++++++++++++ code/datums/ruins/space.dm | 14 +- config/stationRuinBlacklist.txt | 4 +- 4 files changed, 1055 insertions(+), 2 deletions(-) create mode 100644 _maps/RandomRuins/SpaceRuinsStation/roid6.dmm create mode 100644 _maps/RandomRuins/SpaceRuinsStation/roid7.dmm diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm new file mode 100644 index 0000000000..c6cd96ef07 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm @@ -0,0 +1,349 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"h" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/unpowered) +"i" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"k" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/item/reagent_containers/food/snacks/meat/slab/spider, +/obj/item/melee/baseball_bat/ablative, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"q" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/closed/wall/mineral/titanium, +/area/ruin/unpowered) +"r" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"v" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/structure/spider/stickyweb, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"C" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"F" = ( +/obj/machinery/door/airlock/titanium{ + name = "Shuttle Airlock" + }, +/obj/structure/fans/tiny, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"J" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered) +"O" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/structure/spider/stickyweb, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"P" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/spider, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/unpowered) +"R" = ( +/obj/structure/grille, +/obj/structure/window/shuttle, +/turf/open/floor/plating, +/area/ruin/unpowered) +"S" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg2" + }, +/area/ruin/unpowered) +"U" = ( +/turf/closed/mineral/random/high_chance, +/area/ruin/unpowered) +"W" = ( +/obj/structure/spider/stickyweb, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered) + +(1,1,1) = {" +v +v +v +v +v +v +J +J +J +v +v +v +v +v +v +"} +(2,1,1) = {" +v +v +v +v +J +J +U +U +U +J +J +J +J +v +v +"} +(3,1,1) = {" +v +v +J +J +U +U +U +U +U +U +U +U +U +J +v +"} +(4,1,1) = {" +v +J +U +U +U +U +U +U +U +U +U +U +U +U +J +"} +(5,1,1) = {" +v +J +U +U +U +U +U +U +U +U +U +U +U +U +U +"} +(6,1,1) = {" +v +J +U +U +U +U +h +R +h +q +W +U +U +J +v +"} +(7,1,1) = {" +J +U +U +U +U +U +r +i +i +q +W +W +J +J +v +"} +(8,1,1) = {" +J +U +U +U +S +x +C +k +x +F +J +J +J +J +v +"} +(9,1,1) = {" +J +U +U +U +h +h +P +O +a +q +W +W +J +J +v +"} +(10,1,1) = {" +J +U +U +U +U +h +h +R +h +q +W +U +U +U +v +"} +(11,1,1) = {" +J +U +U +U +U +U +U +U +U +U +U +U +U +U +U +"} +(12,1,1) = {" +v +J +U +U +U +U +U +U +U +U +U +U +U +U +J +"} +(13,1,1) = {" +v +J +U +U +U +U +U +U +U +U +U +U +U +U +J +"} +(14,1,1) = {" +v +v +J +J +J +J +J +J +J +J +U +U +U +U +J +"} +(15,1,1) = {" +v +v +v +v +v +v +v +v +v +v +J +J +J +J +v +"} diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid7.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid7.dmm new file mode 100644 index 0000000000..ed14a47b90 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuinsStation/roid7.dmm @@ -0,0 +1,690 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/item/stack/sheet/metal, +/turf/open/space/basic, +/area/space) +"b" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/obj/item/stack/sheet/metal, +/turf/open/space/basic, +/area/space/nearstation) +"c" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered) +"d" = ( +/obj/item/chair, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, +/area/ruin/unpowered) +"e" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, +/area/ruin/unpowered) +"f" = ( +/obj/structure/fluff/broken_flooring{ + dir = 4; + icon_state = "singular" + }, +/turf/open/space/basic, +/area/space) +"g" = ( +/obj/structure/girder, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered) +"h" = ( +/obj/item/chair/stool/bar, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/unpowered) +"i" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"j" = ( +/obj/item/ammo_casing/shotgun/beanbag, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"k" = ( +/turf/closed/wall, +/area/ruin/unpowered) +"l" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"m" = ( +/obj/item/storage/box/drinkingglasses, +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 8; + icon_state = "tube-broken"; + status = 2 + }, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"n" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/unpowered) +"o" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"p" = ( +/obj/structure/fluff/broken_flooring{ + dir = 4; + icon_state = "plating"; + name = "broken plating" + }, +/turf/open/space/basic, +/area/space/nearstation) +"q" = ( +/obj/machinery/light{ + dir = 1; + icon_state = "tube-broken"; + status = 2 + }, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"r" = ( +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"s" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"t" = ( +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"u" = ( +/obj/structure/table/wood, +/obj/machinery/microwave, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"x" = ( +/obj/structure/table/wood, +/obj/item/trash/plate, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"y" = ( +/obj/structure/table_frame, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"z" = ( +/obj/machinery/light{ + icon_state = "tube-broken"; + status = 2 + }, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"A" = ( +/obj/item/ammo_casing/c46x30mm, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, +/area/ruin/unpowered) +"B" = ( +/obj/structure/fluff/broken_flooring{ + icon_state = "singular" + }, +/turf/open/space/basic, +/area/space) +"C" = ( +/obj/structure/lattice, +/obj/structure/fluff/broken_flooring{ + dir = 1; + icon_state = "side" + }, +/turf/open/space/basic, +/area/space/nearstation) +"D" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"E" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/unpowered) +"F" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"G" = ( +/turf/open/space/basic, +/area/space) +"H" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"I" = ( +/obj/structure/table/wood, +/obj/item/kitchen/fork, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"K" = ( +/obj/item/ammo_casing/shotgun/improvised, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"L" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"M" = ( +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, +/area/ruin/unpowered) +"N" = ( +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/unpowered) +"P" = ( +/obj/item/toy/plush/beeplushie, +/obj/vehicle/ridden/lavaboat, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"Q" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"R" = ( +/obj/structure/fluff/broken_flooring{ + dir = 1; + icon_state = "plating"; + name = "broken plating" + }, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered) +"S" = ( +/obj/item/ammo_casing/c46x30mm, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/unpowered) +"T" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"U" = ( +/obj/item/chair/stool/bar, +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"V" = ( +/obj/structure/lattice, +/obj/item/stack/sheet/metal, +/turf/open/space/basic, +/area/space/nearstation) +"W" = ( +/obj/structure/lattice, +/obj/structure/fluff/broken_flooring{ + dir = 1; + icon_state = "plating"; + name = "broken plating" + }, +/turf/open/space/basic, +/area/space/nearstation) +"X" = ( +/turf/open/floor/plasteel/airless, +/area/ruin/unpowered) +"Y" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/old, +/obj/item/clothing/head/chefhat, +/turf/open/floor/plasteel/airless/cafeteria, +/area/ruin/unpowered) +"Z" = ( +/turf/closed/mineral/random/high_chance, +/area/ruin/unpowered) + +(1,1,1) = {" +G +G +G +G +G +G +G +G +G +G +c +c +c +c +c +c +G +G +G +G +"} +(2,1,1) = {" +G +G +G +G +c +c +c +G +G +c +Z +Z +Z +Z +Z +Z +c +G +G +G +"} +(3,1,1) = {" +G +G +G +c +Z +Z +Z +c +c +Z +Z +Z +Z +Z +Z +Z +Z +c +G +G +"} +(4,1,1) = {" +G +G +c +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +c +G +"} +(5,1,1) = {" +G +G +c +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +c +G +"} +(6,1,1) = {" +G +G +G +c +Z +c +R +E +k +k +k +k +k +k +k +Z +Z +Z +Z +c +"} +(7,1,1) = {" +G +G +f +G +c +o +n +X +X +z +k +H +m +L +k +Z +Z +Z +Z +c +"} +(8,1,1) = {" +G +G +G +G +G +V +C +N +N +l +I +t +j +s +k +Z +Z +Z +Z +c +"} +(9,1,1) = {" +G +G +c +c +G +o +W +A +S +h +x +j +Y +D +k +Z +Z +Z +Z +c +"} +(10,1,1) = {" +G +c +Z +Z +c +o +d +e +Q +U +y +K +t +s +k +Z +Z +Z +c +G +"} +(11,1,1) = {" +c +Z +Z +Z +c +o +M +A +S +l +i +t +j +u +k +X +Z +Z +Z +c +"} +(12,1,1) = {" +c +Z +Z +c +G +G +p +M +N +N +k +q +t +s +E +X +P +Z +Z +c +"} +(13,1,1) = {" +G +c +c +G +G +o +b +X +n +N +r +t +t +t +E +X +X +Z +Z +c +"} +(14,1,1) = {" +G +G +G +B +G +a +o +X +X +z +k +T +T +F +E +X +X +Z +Z +c +"} +(15,1,1) = {" +G +G +G +G +G +c +g +E +k +k +k +k +k +k +k +X +Z +Z +c +G +"} +(16,1,1) = {" +G +G +G +G +c +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +c +G +"} +(17,1,1) = {" +G +G +G +c +Z +Z +Z +Z +Z +Z +c +Z +Z +Z +Z +Z +c +c +G +G +"} +(18,1,1) = {" +G +G +G +c +Z +Z +Z +Z +Z +c +G +c +c +c +c +c +G +G +G +G +"} +(19,1,1) = {" +G +G +G +G +c +Z +Z +Z +Z +c +G +G +G +G +G +G +G +G +G +G +"} +(20,1,1) = {" +G +G +G +G +G +c +c +c +c +G +G +G +G +G +G +G +G +G +G +G +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 47cb91c367..d42b256398 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -352,4 +352,16 @@ id = "roid5" suffix = "roid5.dmm" name = "Mineable Asteroid 3" - description = "Mineral asteroid. Ft. Holofans." \ No newline at end of file + description = "Mineral asteroid. Ft. Holofans." + +/datum/map_template/ruin/spacenearstation/roid6 + id = "roid6" + suffix = "roid6.dmm" + name = "Mineable Asteroid 4" + description = "Mineral asteroid. Ft. Crashed escape pod." + +/datum/map_template/ruin/spacenearstation/roid7 + id = "roid7" + suffix = "roid7.dmm" + name = "Mineable Asteroid 5" + description = "Mineral asteroid. Ft. Derelict space bar." \ No newline at end of file diff --git a/config/stationRuinBlacklist.txt b/config/stationRuinBlacklist.txt index 532ce710fe..86a5e06a32 100644 --- a/config/stationRuinBlacklist.txt +++ b/config/stationRuinBlacklist.txt @@ -7,4 +7,6 @@ #_maps/RandomRuins/StationRuins/Space/roid2.dmm #_maps/RandomRuins/StationRuins/Space/roid3.dmm #_maps/RandomRuins/StationRuins/Space/roid4.dmm -#_maps/RandomRuins/StationRuins/Space/roid5.dmm \ No newline at end of file +#_maps/RandomRuins/StationRuins/Space/roid5.dmm +#_maps/RandomRuins/StationRuins/Space/roid6.dmm +#_maps/RandomRuins/StationRuins/Space/roid7.dmm \ No newline at end of file