diff --git a/_maps/virtual_domains/ash_drake.dmm b/_maps/virtual_domains/ash_drake.dmm index 50fbac8696ab..6056136a278a 100644 --- a/_maps/virtual_domains/ash_drake.dmm +++ b/_maps/virtual_domains/ash_drake.dmm @@ -21,7 +21,7 @@ /obj/machinery/light/small/blacklight/directional/south, /obj/effect/baseturf_helper/virtual_domain, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, -/area/virtual_domain/powered) +/area/virtual_domain) "i" = ( /obj/structure/marker_beacon/jade, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, @@ -35,7 +35,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "q" = ( -/mob/living/simple_animal/hostile/megafauna/dragon/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/dragon, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "s" = ( diff --git a/_maps/virtual_domains/blood_drunk_miner.dmm b/_maps/virtual_domains/blood_drunk_miner.dmm index c3369a1c822d..bf673bd6dfa0 100644 --- a/_maps/virtual_domains/blood_drunk_miner.dmm +++ b/_maps/virtual_domains/blood_drunk_miner.dmm @@ -27,7 +27,7 @@ /obj/machinery/light/small/blacklight/directional/south, /obj/effect/baseturf_helper/virtual_domain, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, -/area/virtual_domain/powered) +/area/virtual_domain) "i" = ( /obj/structure/stone_tile{ dir = 4 @@ -171,7 +171,7 @@ /obj/structure/stone_tile/surrounding/cracked{ dir = 6 }, -/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors/virtual_domain) "T" = ( diff --git a/_maps/virtual_domains/bubblegum.dmm b/_maps/virtual_domains/bubblegum.dmm index 3381b1735398..a801fa491874 100644 --- a/_maps/virtual_domains/bubblegum.dmm +++ b/_maps/virtual_domains/bubblegum.dmm @@ -29,7 +29,7 @@ /obj/machinery/light/small/blacklight/directional/south, /obj/effect/baseturf_helper/virtual_domain, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, -/area/virtual_domain/powered) +/area/virtual_domain) "x" = ( /obj/structure/marker_beacon/olive, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, @@ -43,7 +43,7 @@ /turf/template_noop, /area/virtual_domain/safehouse) "C" = ( -/mob/living/simple_animal/hostile/megafauna/bubblegum/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/bubblegum, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "F" = ( @@ -134,6 +134,16 @@ F F F F +F +F +F +F +F +F +F +F +F +F R "} (2,1,1) = {" @@ -182,16 +192,492 @@ Z Z Z Z -F -"} -(3,1,1) = {" -F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(3,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(4,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(5,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(6,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(7,1,1) = {" +F +Z +Z +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(8,1,1) = {" +F +Z +Z +F +Z +Z +Z +a +a +Z +Z +Z +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +Z +Z +Z +a +a +a +a +a +a +a +a +Z +Z +a +a +a +a +a +a +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(9,1,1) = {" +F +Z +Z +F +Z +Z +Z +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +Z +Z +Z +Z +Z +Z +F +"} +(10,1,1) = {" +F +Z +Z +Z +Z +Z +Z +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +p +Z +Z +Z +Z +F +Z +F +"} +(11,1,1) = {" +F +Z +Z +Z +Z +Z Z a a -Z -Z -Z a a a @@ -208,9 +694,6 @@ a a a a -Z -Z -Z a a a @@ -219,22 +702,38 @@ a a a a -Z -Z +a +G +a +a +a +a +a a a a a a a +a +p +p +Z Z Z Z F +Z +F "} -(4,1,1) = {" +(12,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -249,6 +748,7 @@ a a a a +x a a a @@ -270,19 +770,28 @@ a a a a +Z a a a a -a -a -a +p +Z +Z +Z +Z +Z Z F "} -(5,1,1) = {" +(13,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -319,24 +828,38 @@ a a a a +Z +Z a a a -a -a -p +Z +Z +Z +Z +Z +Z Z F "} -(6,1,1) = {" +(14,1,1) = {" F Z +Z +Z +Z +Z +Z a a a a a a +p +p +p +p a a a @@ -358,9 +881,6 @@ a a a a -G -a -a a a a @@ -371,19 +891,34 @@ a a a a -p -p +Z +Z +Z +Z +Z +Z Z F "} -(7,1,1) = {" +(15,1,1) = {" F Z +Z +Z +Z +Z +Z +Z a a a a a +Z +Z +Z +p +a a a a @@ -393,7 +928,6 @@ a a a a -x a a a @@ -416,36 +950,90 @@ a a a Z +Z +Z +Z +Z +Z +Z +F +"} +(16,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +a a a a a -p Z -F -"} -(8,1,1) = {" -F Z +Z +p +a +a +a +a +a +a +a +a +a a a a a a a +Z +Z +a +a a a a a a a +p +p +a +a +a a a +Z +Z +Z +Z +Z +Z +F +"} +(17,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z a a a a a +p +Z +p +p a a a @@ -468,23 +1056,39 @@ Z a a a +a +a +a +a +p +a +a +a +a +a +Z +Z +Z +Z Z Z F "} -(9,1,1) = {" +(18,1,1) = {" F Z +Z +Z +Z +Z +Z +Z a a a a a a -p -p -p -p a a a @@ -504,11 +1108,15 @@ a a a a +Z +Z +Z a a a a a +M a a a @@ -518,21 +1126,27 @@ a a Z Z +Z +Z +Z +Z F "} -(10,1,1) = {" +(19,1,1) = {" F Z Z +Z +Z +Z +Z +a +a a a a a a -Z -Z -Z -p a a a @@ -552,6 +1166,10 @@ a a a a +Z +Z +Z +a a a a @@ -566,21 +1184,31 @@ a a Z Z +Z +Z +Z +Z F "} -(11,1,1) = {" +(20,1,1) = {" F Z Z +Z +Z +Z +Z +a +a +a +a +a +a a a a a a -Z -Z -Z -p a a a @@ -596,8 +1224,6 @@ a a a a -Z -Z a a a @@ -606,29 +1232,35 @@ a a a a -p -p +a +c a a a a a +a +Z +Z +Z +Z +Z Z F "} -(12,1,1) = {" +(21,1,1) = {" F Z Z +Z +Z +Z +Z a a a a a -p -Z -p -p a a a @@ -645,9 +1277,10 @@ a a a a +I +a +a a -Z -Z a a a @@ -655,19 +1288,32 @@ a a a a -p a a a a a +a +a +a +a +a +Z +Z +Z +Z +Z Z F "} -(13,1,1) = {" +(22,1,1) = {" F Z Z +Z +Z +Z +Z a a a @@ -679,6 +1325,10 @@ a a a a +W +a +a +a a a a @@ -693,15 +1343,11 @@ a a a a -Z -Z -Z a a a a a -M a a a @@ -709,12 +1355,23 @@ a a a a +a +Z +Z +Z +Z +Z Z F "} -(14,1,1) = {" +(23,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -741,9 +1398,6 @@ a a a a -Z -Z -Z a a a @@ -757,12 +1411,25 @@ a a a a +a +a +a +Z +Z +Z +Z +Z Z F "} -(15,1,1) = {" +(24,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -798,24 +1465,35 @@ a a a a -c a a a a a a +a +Z +Z +Z +Z +Z Z F "} -(16,1,1) = {" +(25,1,1) = {" F Z +Z +F +Z +Z +Z a a a a a +z a a a @@ -832,7 +1510,6 @@ a a a a -I a a a @@ -854,11 +1531,21 @@ a a a Z +Z +Z +Z +Z +Z F "} -(17,1,1) = {" +(26,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -870,13 +1557,6 @@ a a a a -W -a -a -a -a -a -a a a a @@ -900,13 +1580,30 @@ a a a a +w +S +S +S +S +S +T a Z +Z +Z +Z +Z +F F "} -(18,1,1) = {" +(27,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -942,19 +1639,29 @@ a a a a +S +S +S +S +S +S a -a -a -a -a -a -a +Z +Z +Z +Z +Z Z F "} -(19,1,1) = {" +(28,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -974,6 +1681,7 @@ a a a a +C a a a @@ -989,27 +1697,29 @@ a a a a +S +S +S +S +S +S a -a -a -a -a -a -a -a +Z +Z +Z +Z +Z Z F "} -(20,1,1) = {" +(29,1,1) = {" F Z -a -a -a -a -a -z -a +Z +Z +Z +Z +Z a a a @@ -1042,15 +1752,33 @@ a a a a +X a a +S +S +S +S +S +S a Z +Z +Z +Z +Z +Z F "} -(21,1,1) = {" +(30,1,1) = {" F Z +Z +Z +Z +Z +Z +a a a a @@ -1085,20 +1813,29 @@ a a a a -w S S S S S -T +S a Z +Z +Z +Z +Z +Z F "} -(22,1,1) = {" +(31,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -1142,11 +1879,21 @@ S S a Z +Z +Z +Z +Z +Z F "} -(23,1,1) = {" +(32,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -1166,7 +1913,6 @@ a a a a -C a a a @@ -1182,19 +1928,30 @@ a a a a +w S S S S S -S +A a Z +Z +Z +Z +Z +Z F "} -(24,1,1) = {" +(33,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -1207,6 +1964,10 @@ a a a a +f +a +a +a a a a @@ -1227,27 +1988,35 @@ a a a a -X a a -S -S -S -S -S -S a +a +a +a +Z +Z +Z +Z +Z Z F "} -(25,1,1) = {" +(34,1,1) = {" F Z +Z +Z +Z +Z +Z +a a a a a a +Z a a a @@ -1263,6 +2032,7 @@ a a a a +r a a a @@ -1278,25 +2048,35 @@ a a a a -S -S -S -S -S -S a +a +a +a +Z +Z +Z +Z +Z Z F "} -(26,1,1) = {" +(35,1,1) = {" F Z +Z +Z +Z +Z +Z a a a a a a +Z +Z +Z a a a @@ -1326,24 +2106,37 @@ a a a a -S -S -S -S -S -S a +a +a +a +Z +Z +Z +Z +Z Z F "} -(27,1,1) = {" +(36,1,1) = {" F Z +Z +Z +Z +Z +Z +a a a a a a +Z +Z +Z +a +a a a a @@ -1373,20 +2166,24 @@ a a a a -w -S -S -S -S -S -A a +a +Z +Z +Z +Z +Z Z F "} -(28,1,1) = {" +(37,1,1) = {" F Z +Z +Z +Z +Z +Z a a a @@ -1394,12 +2191,12 @@ a a a a +Z a a a a a -f a a a @@ -1430,12 +2227,21 @@ a a a Z +Z +Z +Z +Z +Z F "} -(29,1,1) = {" +(38,1,1) = {" F Z -a +Z +Z +Z +Z +Z a a a @@ -1457,7 +2263,6 @@ a a a a -r a a a @@ -1471,6 +2276,8 @@ a a a a +d +a a a a @@ -1478,20 +2285,29 @@ a a a Z +Z +Z +Z +Z +Z F "} -(30,1,1) = {" +(39,1,1) = {" F Z +Z +Z +Z +Z +Z +Z a a a a +Z a a -Z -Z -Z a a a @@ -1512,6 +2328,7 @@ a a a a +Z a a a @@ -1526,22 +2343,28 @@ a a a Z +Z +Z +Z +Z +Z F "} -(31,1,1) = {" +(40,1,1) = {" F Z +Z +Z +Z +Z +Z +Z a a a a a a -Z -Z -Z -a -a a a a @@ -1553,6 +2376,7 @@ a a a a +X a a a @@ -1561,6 +2385,9 @@ a a a a +Z +Z +Z a a a @@ -1574,11 +2401,22 @@ a a a Z +Z +Z +Z +Z +Z F "} -(32,1,1) = {" +(41,1,1) = {" F Z +Z +Z +Z +Z +Z +Z a a a @@ -1586,10 +2424,6 @@ a a a a -Z -a -a -a a a a @@ -1609,6 +2443,9 @@ a a a a +Z +Z +Z a a a @@ -1622,17 +2459,27 @@ a a a Z +Z +Z +Z +Z +Z F "} -(33,1,1) = {" +(42,1,1) = {" +F +Z +Z F Z +Z +Z +Z a a a a a -Z a a a @@ -1661,7 +2508,6 @@ a a a a -d a a a @@ -1670,40 +2516,50 @@ a a a Z +Z +Z +Z +Z +Z +Z F "} -(34,1,1) = {" +(43,1,1) = {" F Z Z -a -a -a -a Z +Z +Z +Z +a a a +p +p a a a a a +g a a a a +Z a a a a a a +p a a a a a -Z a a a @@ -1718,15 +2574,27 @@ a a a Z +Z +Z +Z +Z +Z +Z F "} -(35,1,1) = {" +(44,1,1) = {" F Z Z +Z +Z +Z +Z a a a +p +p a a a @@ -1736,23 +2604,22 @@ a a a a +Z +Z +Z a a a a a -X -a -a +p +p a a a a a a -Z -Z -Z a a a @@ -1766,13 +2633,23 @@ a a a Z +Z +Z +Z +Z +Z F "} -(36,1,1) = {" +(45,1,1) = {" F Z Z +Z +Z +Z +Z a +c a a a @@ -1798,9 +2675,6 @@ a a a a -Z -Z -Z a a a @@ -1813,13 +2687,26 @@ a a a a +a +a +a +Z +Z +Z +Z +Z Z F "} -(37,1,1) = {" +(46,1,1) = {" F Z Z +Z +Z +Z +Z +a a a a @@ -1853,6 +2740,7 @@ a a a a +Y a a a @@ -1862,34 +2750,32 @@ a a Z Z +Z +Z +Z +Z F "} -(38,1,1) = {" +(47,1,1) = {" F Z +Z +Z +Z +Z +Z a a a -p -p -a -a -a -a -a -g -a a a a -Z a a a a a a -p a a a @@ -1908,18 +2794,9 @@ a a a a -Z -Z -F -"} -(39,1,1) = {" -F -Z a a a -p -p a a a @@ -1932,227 +2809,360 @@ a Z Z Z +Z +Z +Z +F +"} +(48,1,1) = {" +F +Z +Z +Z +Z +Z +Z a +Z +Z +Z +Z a a a a -p -p a +Z +Z +Z +Z a a a +Z +Z +Z +Z +Z a a a a a a +Z +Z +Z +Z a a a a a a +Z +Z a a Z +Z +Z +Z +Z +Z +F +"} +(49,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +Z +Z +Z +Z +F +"} +(50,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +"} +(51,1,1) = {" +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z F "} -(40,1,1) = {" +(52,1,1) = {" F Z -a -c -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +Z +Z +Z +Z Z F -"} -(41,1,1) = {" F Z -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -Y -a -a -a -a -a -a -a +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z Z F -"} -(42,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z F Z -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +Z +Z +Z +Z +Z +Z +Z +Z Z F "} -(43,1,1) = {" +(53,1,1) = {" F Z -a Z Z Z Z -a -a -a -a -a Z Z Z Z -a -a -a Z Z Z Z Z -a -a -a -a -a -a Z Z Z Z -a -a -a -a -a -a Z Z -a -a +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +F +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z Z F "} -(44,1,1) = {" +(54,1,1) = {" F Z Z @@ -2191,16 +3201,36 @@ Z Z Z Z +F +Z +Z +Z +Z +Z +Z +Z +Z Z Z Z +F Z Z Z Z F "} -(45,1,1) = {" +(55,1,1) = {" +F +F +F +F +F +F +F +F +F +F F F F diff --git a/_maps/virtual_domains/colossus.dmm b/_maps/virtual_domains/colossus.dmm index a9c3c6e6d79e..fe97dcace428 100644 --- a/_maps/virtual_domains/colossus.dmm +++ b/_maps/virtual_domains/colossus.dmm @@ -30,7 +30,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "p" = ( -/mob/living/simple_animal/hostile/megafauna/colossus/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/colossus, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "q" = ( @@ -41,7 +41,7 @@ /obj/machinery/light/small/blacklight/directional/south, /obj/effect/baseturf_helper/virtual_domain, /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, -/area/virtual_domain/powered) +/area/virtual_domain) "s" = ( /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors/virtual_domain) diff --git a/_maps/virtual_domains/hierophant.dmm b/_maps/virtual_domains/hierophant.dmm index 02b11ad4e1ef..81f8a9f97a73 100644 --- a/_maps/virtual_domains/hierophant.dmm +++ b/_maps/virtual_domains/hierophant.dmm @@ -37,7 +37,7 @@ /turf/closed/indestructible/binary, /area/lavaland/surface/outdoors/virtual_domain) "E" = ( -/mob/living/simple_animal/hostile/megafauna/hierophant/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/hierophant, /turf/open/indestructible/hierophant/two, /area/lavaland/surface/outdoors/virtual_domain) "H" = ( @@ -51,7 +51,7 @@ /obj/machinery/light/small/blacklight/directional/south, /obj/effect/baseturf_helper/virtual_domain, /turf/open/indestructible/hierophant, -/area/virtual_domain/powered) +/area/virtual_domain) "S" = ( /obj/effect/mob_spawn/corpse/human/miner, /turf/open/indestructible/hierophant, diff --git a/_maps/virtual_domains/wendigo.dmm b/_maps/virtual_domains/wendigo.dmm index 17bcb48d688b..dcce722cbbd0 100644 --- a/_maps/virtual_domains/wendigo.dmm +++ b/_maps/virtual_domains/wendigo.dmm @@ -58,7 +58,7 @@ /turf/open/misc/asteroid/snow/ice/icemoon, /area/icemoon/underground/explored/virtual_domain) "H" = ( -/mob/living/simple_animal/hostile/megafauna/wendigo/virtual_domain, +/mob/living/simple_animal/hostile/megafauna/wendigo, /turf/open/indestructible/necropolis{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/code/modules/bitrunning/components/virtual_elite_mob.dm b/code/modules/bitrunning/components/virtual_elite_mob.dm new file mode 100644 index 000000000000..5a5766ecdf54 --- /dev/null +++ b/code/modules/bitrunning/components/virtual_elite_mob.dm @@ -0,0 +1,18 @@ +/// Removes loot tables from megafauna and lowers their health. +/datum/element/virtual_elite_mob + +/datum/element/virtual_elite_mob/Attach(datum/target) + . = ..() + if(!ismegafauna(target)) + return ELEMENT_INCOMPATIBLE + + var/mob/living/simple_animal/hostile/megafauna/boss = target + + var/new_max = clamp(boss.maxHealth * 0.5, 600, 1200) + boss.maxHealth = new_max + boss.health = new_max + boss.true_spawn = FALSE + boss.loot.Cut() + boss.loot += /obj/structure/closet/crate/secure/bitrunning/encrypted + boss.crusher_loot.Cut() + boss.crusher_loot += /obj/structure/closet/crate/secure/bitrunning/encrypted diff --git a/code/modules/bitrunning/server/signal_handlers.dm b/code/modules/bitrunning/server/signal_handlers.dm index b0464b351faf..40b9d2b2c3f7 100644 --- a/code/modules/bitrunning/server/signal_handlers.dm +++ b/code/modules/bitrunning/server/signal_handlers.dm @@ -83,8 +83,11 @@ if(isliving(thing)) // so we can mutate them var/mob/living/creature = thing - if(creature.can_be_cybercop) - mutation_candidate_refs.Add(WEAKREF(creature)) + if(ismegafauna(creature)) + creature.AddElement(/datum/element/virtual_elite_mob) + continue + + mutation_candidate_refs.Add(WEAKREF(creature)) continue if(istype(thing, /obj/effect/mob_spawn/ghost_role)) // so we get threat alerts diff --git a/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm index 02bb91abc588..83d65a7fb46a 100644 --- a/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm +++ b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm @@ -8,11 +8,3 @@ map_name = "ash_drake" reward_points = BITRUNNER_REWARD_MEDIUM safehouse_path = /datum/map_template/safehouse/lavaland_boss - -/mob/living/simple_animal/hostile/megafauna/dragon/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 1600 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 1600 - true_spawn = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm b/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm index abf2e0fc5a94..ad5d22f51751 100644 --- a/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm +++ b/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm @@ -8,11 +8,3 @@ map_name = "blood_drunk_miner" reward_points = BITRUNNER_REWARD_MEDIUM safehouse_path = /datum/map_template/safehouse/lavaland_boss - -/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 1600 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 1600 - true_spawn = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm index bede97177cb7..4ac4a6476bd2 100644 --- a/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm +++ b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm @@ -9,11 +9,3 @@ map_name = "bubblegum" reward_points = BITRUNNER_REWARD_HIGH safehouse_path = /datum/map_template/safehouse/lavaland_boss - -/mob/living/simple_animal/hostile/megafauna/bubblegum/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 2000 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 2000 - true_spawn = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/colossus.dm b/code/modules/bitrunning/virtual_domain/domains/colossus.dm index 35ba4eee0ca8..9baa011263b3 100644 --- a/code/modules/bitrunning/virtual_domain/domains/colossus.dm +++ b/code/modules/bitrunning/virtual_domain/domains/colossus.dm @@ -9,10 +9,3 @@ reward_points = BITRUNNER_REWARD_HIGH safehouse_path = /datum/map_template/safehouse/lavaland_boss -/mob/living/simple_animal/hostile/megafauna/colossus/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 2000 - maxHealth = 2000 - true_spawn = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/hierophant.dm b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm index 142623f4f812..5b67c9d9bf22 100644 --- a/code/modules/bitrunning/virtual_domain/domains/hierophant.dm +++ b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm @@ -8,11 +8,3 @@ map_name = "hierophant" reward_points = BITRUNNER_REWARD_HIGH safehouse_path = /datum/map_template/safehouse/lavaland_boss - -/mob/living/simple_animal/hostile/megafauna/hierophant/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 1700 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 1700 - true_spawn = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/legion.dm b/code/modules/bitrunning/virtual_domain/domains/legion.dm deleted file mode 100644 index f1ba146f3801..000000000000 --- a/code/modules/bitrunning/virtual_domain/domains/legion.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/lazy_template/virtual_domain/legion - name = "Chamber of Echoes" - cost = BITRUNNER_COST_MEDIUM - desc = "A chilling realm that houses Legion's necropolis. Those who succumb to it are forever damned." - difficulty = BITRUNNER_DIFFICULTY_MEDIUM - forced_outfit = /datum/outfit/job/miner - key = "legion" - map_name = "legion" - reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/lavaland_boss - -/mob/living/simple_animal/hostile/megafauna/legion/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - health = 1500 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 1500 - true_spawn = FALSE - -// You may be thinking, what about those mini-legions? They're not part of the initial created_atoms list diff --git a/code/modules/bitrunning/virtual_domain/domains/wendigo.dm b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm index fcad3db6faf7..fa0d15b92e9f 100644 --- a/code/modules/bitrunning/virtual_domain/domains/wendigo.dm +++ b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm @@ -9,11 +9,3 @@ reward_points = BITRUNNER_REWARD_HIGH safehouse_path = /datum/map_template/safehouse/lavaland_boss -/mob/living/simple_animal/hostile/megafauna/wendigo/virtual_domain - can_be_cybercop = FALSE - crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - guaranteed_butcher_results = list(/obj/item/wendigo_skull = 1) - health = 2000 - loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted) - maxHealth = 2000 - true_spawn = FALSE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 5b7ee004c039..471dec0a9d2d 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -224,6 +224,3 @@ var/datum/stamina_container/stamina /// What our current gravity state is. Used to avoid duplicate animates and such var/gravity_state = null - - /// Whether this mob can be mutated into a cybercop via quantum server get_valid_domain_targets(). Specifically dodges megafauna - var/can_be_cybercop = TRUE diff --git a/tgstation.dme b/tgstation.dme index 02793494e3ba..bdd80b6e386a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3025,6 +3025,7 @@ #include "code\modules\bitrunning\components\avatar_connection.dm" #include "code\modules\bitrunning\components\bitrunning_points.dm" #include "code\modules\bitrunning\components\netpod_healing.dm" +#include "code\modules\bitrunning\components\virtual_elite_mob.dm" #include "code\modules\bitrunning\objects\byteforge.dm" #include "code\modules\bitrunning\objects\clothing.dm" #include "code\modules\bitrunning\objects\disks.dm" @@ -3054,7 +3055,6 @@ #include "code\modules\bitrunning\virtual_domain\domains\colossus.dm" #include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm" #include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm" -#include "code\modules\bitrunning\virtual_domain\domains\legion.dm" #include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm" #include "code\modules\bitrunning\virtual_domain\domains\pirates.dm" #include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm"