From 8fd3bb2fa957bf87e870ee8e6e5433678b428359 Mon Sep 17 00:00:00 2001 From: Len Kagamine Date: Tue, 1 Oct 2024 12:00:38 -0400 Subject: [PATCH] Initial fix and some roids. (#3635) yep we got roids. --- .../~monkestation/asteroid_maps/football.dmm | 270 ++++++++++++++++++ .../asteroid_maps/medium_doom.dmm | 175 ++++++++++++ .../asteroid_maps/medium_rock.dmm | 125 ++++---- _maps/~monkestation/asteroid_maps/room.dmm | 167 +++++++++++ .../asteroids/asteroid_templates.dm | 20 ++ 5 files changed, 696 insertions(+), 61 deletions(-) create mode 100644 _maps/~monkestation/asteroid_maps/football.dmm create mode 100644 _maps/~monkestation/asteroid_maps/medium_doom.dmm create mode 100644 _maps/~monkestation/asteroid_maps/room.dmm diff --git a/_maps/~monkestation/asteroid_maps/football.dmm b/_maps/~monkestation/asteroid_maps/football.dmm new file mode 100644 index 000000000000..48f9b68294f9 --- /dev/null +++ b/_maps/~monkestation/asteroid_maps/football.dmm @@ -0,0 +1,270 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/space/basic, +/area/space) +"H" = ( +/obj/item/clothing/suit/hooded/dinojammies, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"I" = ( +/turf/closed/mineral/random/asteroid/tospace, +/area/space) +"Q" = ( +/turf/open/misc/asteroid/airless/tospace, +/area/space) + +(1,1,1) = {" +I +I +I +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +I +I +I +I +I +I +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +I +I +I +I +I +I +I +I +I +a +a +a +a +a +a +"} +(4,1,1) = {" +a +I +I +I +I +I +I +I +I +I +I +a +a +a +a +"} +(5,1,1) = {" +a +I +I +I +I +I +I +I +I +I +I +I +a +a +a +"} +(6,1,1) = {" +a +I +I +Q +I +I +I +I +I +I +I +I +a +a +a +"} +(7,1,1) = {" +a +a +I +I +Q +I +I +I +I +I +I +I +I +a +a +"} +(8,1,1) = {" +a +a +I +I +I +H +I +I +I +I +I +I +I +a +a +"} +(9,1,1) = {" +a +a +I +I +I +I +Q +I +I +I +I +I +I +a +a +"} +(10,1,1) = {" +a +a +a +I +I +I +I +Q +I +I +I +I +I +I +a +"} +(11,1,1) = {" +a +a +a +I +I +I +I +I +Q +I +I +I +I +I +a +"} +(12,1,1) = {" +a +a +a +a +I +I +I +I +I +I +I +I +I +I +a +"} +(13,1,1) = {" +a +a +a +a +a +a +I +I +I +I +I +I +I +I +I +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +I +I +I +I +I +I +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +I +I +I +"} diff --git a/_maps/~monkestation/asteroid_maps/medium_doom.dmm b/_maps/~monkestation/asteroid_maps/medium_doom.dmm new file mode 100644 index 000000000000..726cbb228897 --- /dev/null +++ b/_maps/~monkestation/asteroid_maps/medium_doom.dmm @@ -0,0 +1,175 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/mob_spawn/corpse/human/miner/mod, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"g" = ( +/turf/closed/mineral/random/asteroid/tospace, +/area/space) +"l" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"o" = ( +/obj/effect/spawner/random/lavaland_mob/legion, +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"x" = ( +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"y" = ( +/obj/effect/spawner/random/lavaland_mob/legion, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"Q" = ( +/obj/item/gun/energy/recharge/kinetic_accelerator, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"W" = ( +/turf/open/space/basic, +/area/space) + +(1,1,1) = {" +W +W +W +W +g +g +g +W +W +W +W +"} +(2,1,1) = {" +W +W +g +g +g +g +g +g +g +W +W +"} +(3,1,1) = {" +W +g +g +g +g +g +g +g +g +g +W +"} +(4,1,1) = {" +W +g +g +g +g +l +g +g +g +g +W +"} +(5,1,1) = {" +g +g +g +g +o +a +l +g +g +g +g +"} +(6,1,1) = {" +g +g +g +x +l +l +Q +x +g +g +g +"} +(7,1,1) = {" +g +g +g +g +x +x +y +g +g +g +g +"} +(8,1,1) = {" +W +g +g +g +g +x +g +g +g +g +W +"} +(9,1,1) = {" +W +g +g +g +g +g +g +g +g +g +W +"} +(10,1,1) = {" +W +W +g +g +g +g +g +g +g +W +W +"} +(11,1,1) = {" +W +W +W +W +g +g +g +W +W +W +W +"} diff --git a/_maps/~monkestation/asteroid_maps/medium_rock.dmm b/_maps/~monkestation/asteroid_maps/medium_rock.dmm index cf7e011ddaf6..bc88b1419bb0 100644 --- a/_maps/~monkestation/asteroid_maps/medium_rock.dmm +++ b/_maps/~monkestation/asteroid_maps/medium_rock.dmm @@ -5,102 +5,105 @@ "s" = ( /turf/closed/mineral/artifact, /area/space) +"K" = ( +/turf/closed/mineral/asteroid/tospace, +/area/space) (1,1,1) = {" a a a -s -s -s +K +K +K a a a "} (2,1,1) = {" a -s -s -s -s -s -s -s +K +K +K +K +K +K +K a "} (3,1,1) = {" a -s -s -s -s -s -s -s +K +K +K +K +K +K +K a "} (4,1,1) = {" -s -s -s -s -s -s -s -s -s +K +K +K +K +K +K +K +K +K "} (5,1,1) = {" -s -s -s -s -s -s -s -s -s +K +K +K +K +s +K +K +K +K "} (6,1,1) = {" -s -s -s -s -s -s -s -s -s +K +K +K +K +K +K +K +K +K "} (7,1,1) = {" a -s -s -s -s -s -s -s +K +K +K +K +K +K +K a "} (8,1,1) = {" a -s -s -s -s -s -s -s +K +K +K +K +K +K +K a "} (9,1,1) = {" a a a -s -s -s +K +K +K a a a diff --git a/_maps/~monkestation/asteroid_maps/room.dmm b/_maps/~monkestation/asteroid_maps/room.dmm new file mode 100644 index 000000000000..52f5f65b3889 --- /dev/null +++ b/_maps/~monkestation/asteroid_maps/room.dmm @@ -0,0 +1,167 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/mineral/random/asteroid/tospace, +/area/space) +"f" = ( +/obj/structure/table, +/obj/item/coin/diamond, +/obj/item/coin/diamond{ + pixel_y = 4 + }, +/obj/item/coin/diamond{ + pixel_x = 7 + }, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"m" = ( +/obj/structure/tank_holder/oxygen, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"q" = ( +/obj/structure/bed/double, +/obj/effect/spawner/random/bedsheet/double, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"r" = ( +/obj/structure/table, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"y" = ( +/turf/open/space/basic, +/area/space) +"D" = ( +/obj/item/stack/sheet/bluespace_crystal/five, +/obj/structure/table, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"N" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"O" = ( +/obj/structure/dresser, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"Q" = ( +/obj/machinery/door/airlock/survival_pod, +/obj/structure/fans/tiny, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"R" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"S" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"T" = ( +/obj/structure/table, +/obj/item/pickaxe/diamond, +/turf/open/misc/asteroid/airless/tospace, +/area/space) +"X" = ( +/turf/open/misc/asteroid/airless/tospace, +/area/space) + +(1,1,1) = {" +y +y +y +a +a +a +y +y +y +"} +(2,1,1) = {" +y +a +a +a +a +a +a +a +y +"} +(3,1,1) = {" +y +a +D +r +T +X +m +a +y +"} +(4,1,1) = {" +a +a +f +X +X +X +X +a +a +"} +(5,1,1) = {" +a +a +O +X +R +X +X +X +Q +"} +(6,1,1) = {" +a +a +X +X +X +X +r +a +a +"} +(7,1,1) = {" +y +a +q +X +S +N +r +a +y +"} +(8,1,1) = {" +y +a +a +a +a +a +a +a +y +"} +(9,1,1) = {" +y +y +y +a +a +a +y +y +y +"} diff --git a/monkestation/code/modules/art_sci_overrides/asteroids/asteroid_templates.dm b/monkestation/code/modules/art_sci_overrides/asteroids/asteroid_templates.dm index 7bd16a72d55a..61497199ace0 100644 --- a/monkestation/code/modules/art_sci_overrides/asteroids/asteroid_templates.dm +++ b/monkestation/code/modules/art_sci_overrides/asteroids/asteroid_templates.dm @@ -142,3 +142,23 @@ size = 3 asteroid_weight = 10 + +/datum/map_template/asteroid/room + name = "Asteroid" + suffix = "room.dmm" + size = 4 + + asteroid_weight = 25 + +/datum/map_template/asteroid/legion_mod + name = "Medium Asteroid" + suffix = "medium_doom.dmm" + size = 5 + + asteroid_weight = 20 +/datum/map_template/asteroid/itsastone + name = "Large Oblong Asteroid" + suffix = "football.dmm" + size = 7 + + asteroid_weight = 10