From 2a74d89455a6844ac669351fb9abf6974b8c6538 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:48:12 +0100 Subject: [PATCH] [MIRROR] Adds a modular bitrunning map, changes safehouse spawns [MDB IGNORE] (#25363) * Adds a modular bitrunning map, changes safehouse spawns (#79937) ## About The Pull Request Primarily, this adds one new map to bitrunning that uses modular rooms.
pictures ![image](https://github.com/tgstation/tgstation/assets/42397676/48d78e05-1134-477c-a269-a4b71064058b) ![Screenshot 2023-11-25 133937](https://github.com/tgstation/tgstation/assets/42397676/851d6235-e939-465c-92e5-830886d50d9c) ![image](https://github.com/tgstation/tgstation/assets/42397676/6094dae6-fc3b-4cc4-9fd5-d7dd6d944cee)
I also added in some changes: - Safehouses are now loaded using the modular map system rather than the bespoke solution qservers had. - Lowers the difficulty of psyker shuffle (which I felt was a little too nightmarish) and boosts its rewards. ## Why It's Good For The Game New maps More integration with prior systems ## Changelog :cl: add: Added a new modular bitrunning domain - Starfront Saloon. balance: Psyker shuffle domain was made slightly easier and has been given more rewards. /:cl: * Adds a modular bitrunning map, changes safehouse spawns * Linterpass minus Milsim * readds Milsim --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: Zergspower --- _maps/safehouses/README.md | 1 + _maps/safehouses/bathroom.dmm | 6 +- _maps/safehouses/den.dmm | 6 +- _maps/safehouses/dig.dmm | 6 +- _maps/safehouses/ice.dmm | 6 +- _maps/safehouses/lavaland_boss.dmm | 6 +- _maps/safehouses/mine.dmm | 6 +- _maps/safehouses/shuttle.dmm | 6 +- _maps/safehouses/shuttle_space.dmm | 6 +- _maps/safehouses/skyrat_ancientmilsim.dmm | 304 ++ _maps/safehouses/test_only_safehouse.dmm | 7 +- _maps/safehouses/wood.dmm | 6 +- _maps/skyrat/safehouses/ancient_milsim.dmm | 9 - _maps/virtual_domains/README.md | 2 +- _maps/virtual_domains/ash_drake.dmm | 4 +- _maps/virtual_domains/beach_bar.dmm | 4 +- _maps/virtual_domains/blood_drunk_miner.dmm | 4 +- _maps/virtual_domains/breeze_bay.dmm | 360 +- _maps/virtual_domains/bubblegum.dmm | 4 +- _maps/virtual_domains/clown_planet.dmm | 4 +- _maps/virtual_domains/colossus.dmm | 4 +- _maps/virtual_domains/gondola_asteroid.dmm | 4 +- _maps/virtual_domains/hierophant.dmm | 4 +- _maps/virtual_domains/pipedream.dmm | 254 +- _maps/virtual_domains/pirates.dmm | 3460 +++++++++-------- _maps/virtual_domains/psyker_shuffle.dmm | 190 +- _maps/virtual_domains/psyker_zombies.dmm | 159 +- .../skyrat_ancientmilsim.dmm} | 512 +-- _maps/virtual_domains/stairs_and_cliffs.dmm | 4 +- _maps/virtual_domains/starfront_saloon.dmm | 1834 +++++++++ _maps/virtual_domains/syndicate_assault.dmm | 36 +- _maps/virtual_domains/test_only.dmm | 4 +- _maps/virtual_domains/vaporwave.dmm | 4 +- _maps/virtual_domains/wendigo.dmm | 4 +- _maps/virtual_domains/xeno_nest.dmm | 32 +- code/modules/bitrunning/objects/landmarks.dm | 11 +- .../modules/bitrunning/server/map_handling.dm | 17 +- .../virtual_domain/domains/ash_drake.dm | 1 - .../virtual_domain/domains/beach_bar.dm | 1 - .../domains/blood_drunk_miner.dm | 1 - .../virtual_domain/domains/breeze_bay.dm | 1 - .../virtual_domain/domains/bubblegum.dm | 1 - .../virtual_domain/domains/clown_planet.dm | 1 - .../virtual_domain/domains/colossus.dm | 2 - .../domains/gondola_asteroid.dm | 1 - .../virtual_domain/domains/hierophant.dm | 1 - .../virtual_domain/domains/pipedream.dm | 1 - .../virtual_domain/domains/psyker_shuffle.dm | 5 +- .../virtual_domain/domains/psyker_zombies.dm | 5 +- .../domains/stairs_and_cliffs.dm | 3 +- .../domains/starfront_saloon.dm | 14 + .../domains/syndicate_assault.dm | 1 - .../virtual_domain/domains/test_only.dm | 1 - .../virtual_domain/domains/vaporwave.dm | 3 +- .../virtual_domain/domains/wendigo.dm | 2 - .../virtual_domain/domains/xeno_nest.dm | 1 - .../bitrunning/virtual_domain/safehouses.dm | 54 - .../virtual_domain/virtual_domain.dm | 2 - code/modules/mapfluff/ruins/generic.dm | 1 + .../bitrunning/code/safehouse_skyrat.dm | 10 - .../ancient_milsim/virtual_domain.dm | 8 +- strings/modular_maps/safehouse.toml | 37 + tgstation.dme | 3 +- 63 files changed, 4527 insertions(+), 2924 deletions(-) create mode 100644 _maps/safehouses/skyrat_ancientmilsim.dmm delete mode 100644 _maps/skyrat/safehouses/ancient_milsim.dmm rename _maps/{skyrat/virtual_domains/ancient_milsim.dmm => virtual_domains/skyrat_ancientmilsim.dmm} (82%) create mode 100644 _maps/virtual_domains/starfront_saloon.dmm create mode 100644 code/modules/bitrunning/virtual_domain/domains/starfront_saloon.dm delete mode 100644 code/modules/bitrunning/virtual_domain/safehouses.dm delete mode 100644 modular_skyrat/modules/bitrunning/code/safehouse_skyrat.dm create mode 100644 strings/modular_maps/safehouse.toml diff --git a/_maps/safehouses/README.md b/_maps/safehouses/README.md index 8027ea38e21..17882fd96da 100644 --- a/_maps/safehouses/README.md +++ b/_maps/safehouses/README.md @@ -6,6 +6,7 @@ 2. Create a new dm file inside `modules\bitrunning\virtual_domain\safe_houses` folder.. 4. Place exit and goal landmarks (obj/effect/landmark/bitrunning/..). Generally, 3 exits and 2 goals are ok. 5. Ideally, leave 3 spaces for gear. This has usually been xy [1x1] [1x2] [1x3] +6. Place the modular map connector at the bottom left tile. ## Notes diff --git a/_maps/safehouses/bathroom.dmm b/_maps/safehouses/bathroom.dmm index 62e928ac054..76712d6193c 100644 --- a/_maps/safehouses/bathroom.dmm +++ b/_maps/safehouses/bathroom.dmm @@ -13,6 +13,10 @@ /obj/effect/decal/cleanable/blood/splatter/over_window, /turf/open/floor/iron/freezer, /area/virtual_domain/safehouse) +"h" = ( +/obj/modular_map_connector, +/turf/closed/wall/mineral/silver, +/area/virtual_domain/safehouse) "q" = ( /obj/structure/urinal/directional/west, /turf/open/floor/iron/freezer, @@ -103,7 +107,7 @@ G G G G -G +h "} (2,1,1) = {" G diff --git a/_maps/safehouses/den.dmm b/_maps/safehouses/den.dmm index 235d786d6e9..15debc7e284 100644 --- a/_maps/safehouses/den.dmm +++ b/_maps/safehouses/den.dmm @@ -7,6 +7,10 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/pod, /area/virtual_domain/safehouse) +"b" = ( +/obj/modular_map_connector, +/turf/closed/wall, +/area/virtual_domain/safehouse) "c" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/east, @@ -172,7 +176,7 @@ C C G G -C +b "} (2,1,1) = {" W diff --git a/_maps/safehouses/dig.dmm b/_maps/safehouses/dig.dmm index 4acff0f2327..73f0d247dfb 100644 --- a/_maps/safehouses/dig.dmm +++ b/_maps/safehouses/dig.dmm @@ -49,6 +49,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/misc/asteroid, /area/virtual_domain/safehouse) +"s" = ( +/obj/modular_map_connector, +/turf/closed/mineral/asteroid, +/area/virtual_domain/safehouse) "u" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -113,7 +117,7 @@ H A A H -H +s "} (2,1,1) = {" A diff --git a/_maps/safehouses/ice.dmm b/_maps/safehouses/ice.dmm index a8293f9502a..f7faa997396 100644 --- a/_maps/safehouses/ice.dmm +++ b/_maps/safehouses/ice.dmm @@ -14,6 +14,10 @@ }, /turf/open/floor/iron, /area/virtual_domain/safehouse) +"e" = ( +/obj/modular_map_connector, +/turf/closed/wall/ice, +/area/virtual_domain/safehouse) "f" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -202,7 +206,7 @@ i g a i -i +e "} (2,1,1) = {" i diff --git a/_maps/safehouses/lavaland_boss.dmm b/_maps/safehouses/lavaland_boss.dmm index 7482846e61f..7331a5b79d7 100644 --- a/_maps/safehouses/lavaland_boss.dmm +++ b/_maps/safehouses/lavaland_boss.dmm @@ -122,6 +122,10 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/virtual_domain/safehouse) +"N" = ( +/obj/modular_map_connector, +/turf/closed/wall, +/area/virtual_domain/safehouse) "O" = ( /obj/item/gun/energy/recharge/kinetic_accelerator{ pixel_x = -6; @@ -191,7 +195,7 @@ f f P P -f +N "} (2,1,1) = {" P diff --git a/_maps/safehouses/mine.dmm b/_maps/safehouses/mine.dmm index 551e2ca0c00..904c3c5378e 100644 --- a/_maps/safehouses/mine.dmm +++ b/_maps/safehouses/mine.dmm @@ -16,6 +16,10 @@ /obj/structure/tank_dispenser/oxygen, /turf/open/floor/iron/dark, /area/virtual_domain/safehouse) +"t" = ( +/obj/modular_map_connector, +/turf/closed/wall, +/area/virtual_domain/safehouse) "w" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -112,7 +116,7 @@ f f P P -f +t "} (2,1,1) = {" P diff --git a/_maps/safehouses/shuttle.dmm b/_maps/safehouses/shuttle.dmm index 92228c95bd3..75fe975258c 100644 --- a/_maps/safehouses/shuttle.dmm +++ b/_maps/safehouses/shuttle.dmm @@ -43,6 +43,10 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/bitrunning_transport, /area/virtual_domain/safehouse) +"m" = ( +/obj/modular_map_connector, +/turf/closed/wall/mineral/titanium, +/area/virtual_domain/safehouse) "q" = ( /obj/effect/turf_decal/stripes/end, /obj/effect/decal/cleanable/dirt, @@ -176,7 +180,7 @@ t e e t -a +m "} (2,1,1) = {" e diff --git a/_maps/safehouses/shuttle_space.dmm b/_maps/safehouses/shuttle_space.dmm index a5afaa475c6..0029f5b0a6e 100644 --- a/_maps/safehouses/shuttle_space.dmm +++ b/_maps/safehouses/shuttle_space.dmm @@ -20,6 +20,10 @@ "i" = ( /turf/closed/wall/mineral/titanium/overspace, /area/virtual_domain/safehouse) +"k" = ( +/obj/modular_map_connector, +/turf/closed/wall/mineral/titanium/overspace, +/area/virtual_domain/safehouse) "l" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -179,7 +183,7 @@ N a a N -i +k "} (2,1,1) = {" a diff --git a/_maps/safehouses/skyrat_ancientmilsim.dmm b/_maps/safehouses/skyrat_ancientmilsim.dmm new file mode 100644 index 00000000000..4b00bcb4370 --- /dev/null +++ b/_maps/safehouses/skyrat_ancientmilsim.dmm @@ -0,0 +1,304 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"b" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/crate/secure/weapon, +/obj/item/storage/pouch/medical/firstaid/stabilizer, +/obj/item/storage/pouch/ammo, +/obj/item/clothing/head/helmet/hecu, +/obj/item/clothing/suit/armor/vest/hecu, +/obj/item/storage/box/survival/syndie, +/obj/item/gun/ballistic/automatic/sol_smg, +/obj/item/knife/combat, +/obj/item/gun/ballistic/automatic/pistol/sol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/storage/belt/military/assault/hecu, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/stack/medical/mesh/bloody, +/obj/item/stack/medical/suture/bloody, +/obj/item/clothing/gloves/military, +/obj/item/clothing/glasses/hud/health/night, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"e" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"g" = ( +/obj/machinery/power/shuttle_engine/heater, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"i" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 4 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"j" = ( +/obj/effect/landmark/bitrunning/cache_goal_turf, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/bitrunning_transport, +/area/virtual_domain/safehouse) +"m" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"o" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"p" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/east, +/obj/structure/sign/departments/medbay/alt/directional/east, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"q" = ( +/obj/modular_map_connector, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"r" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"s" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/virtual_domain/safehouse) +"v" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/sand/volcanic, +/turf/open/floor/iron/white, +/area/virtual_domain/safehouse) +"w" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/bitrunning/hololadder_spawn, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"x" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/bitrunning/hololadder_spawn, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"z" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/iv_drip/health_station/directional/east, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"D" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/item/taperecorder/empty, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"G" = ( +/obj/effect/turf_decal/stripes/end, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/secure/weapon, +/obj/item/storage/pouch/medical/firstaid/stabilizer, +/obj/item/storage/pouch/ammo, +/obj/item/clothing/head/helmet/hecu, +/obj/item/clothing/suit/armor/vest/hecu, +/obj/item/storage/box/survival/syndie, +/obj/item/gun/ballistic/automatic/sol_smg, +/obj/item/knife/combat, +/obj/item/gun/ballistic/automatic/pistol/sol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/storage/belt/military/assault/hecu, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/stack/medical/mesh/bloody, +/obj/item/stack/medical/suture/bloody, +/obj/item/clothing/gloves/military, +/obj/item/clothing/glasses/hud/health/night, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"H" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/bitrunning/cache_goal_turf, +/obj/effect/turf_decal/loading_area, +/obj/machinery/light/small/directional/south, +/turf/open/floor/bitrunning_transport, +/area/virtual_domain/safehouse) +"I" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer{ + dir = 2; + name = "hovercraft console"; + icon_screen = "shuttle"; + desc = "An armored hovercraft control computer. Doesn't work anymore... who would've thought." + }, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"J" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/virtual_domain/safehouse) +"K" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"L" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"M" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/decal/cleanable/generic, +/obj/effect/landmark/bitrunning/hololadder_spawn, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"N" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/reinforced, +/obj/item/tape/ruins/ancient_milsim/devlog_one, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) +"U" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/effect/turf_decal/sand/volcanic, +/obj/structure/closet/crate/secure/weapon, +/obj/item/storage/pouch/medical/firstaid/loaded, +/obj/item/storage/pouch/medical/loaded, +/obj/item/clothing/head/helmet/hecu, +/obj/item/clothing/suit/armor/vest/hecu, +/obj/item/storage/box/survival/syndie, +/obj/item/gun/ballistic/automatic/sol_smg, +/obj/item/knife/combat, +/obj/item/gun/ballistic/automatic/pistol/sol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/ammo_box/magazine/c35sol_pistol, +/obj/item/storage/belt/military/assault/hecu, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/ammo_box/magazine/c35sol_pistol/stendo, +/obj/item/stack/medical/mesh/bloody, +/obj/item/stack/medical/suture/bloody, +/obj/item/clothing/gloves/military, +/obj/item/clothing/glasses/hud/health/night, +/turf/open/floor/iron, +/area/virtual_domain/safehouse) + +(1,1,1) = {" +r +J +r +r +J +q +"} +(2,1,1) = {" +r +U +b +G +j +g +"} +(3,1,1) = {" +r +L +o +e +H +g +"} +(4,1,1) = {" +v +K +o +m +M +g +"} +(5,1,1) = {" +s +N +D +m +w +g +"} +(6,1,1) = {" +s +I +p +z +x +g +"} +(7,1,1) = {" +r +i +r +r +i +a +"} diff --git a/_maps/safehouses/test_only_safehouse.dmm b/_maps/safehouses/test_only_safehouse.dmm index c23f8c4a22b..986dad78e04 100644 --- a/_maps/safehouses/test_only_safehouse.dmm +++ b/_maps/safehouses/test_only_safehouse.dmm @@ -10,10 +10,15 @@ "u" = ( /turf/open/floor/plating, /area/virtual_domain/safehouse) +"U" = ( +/obj/effect/landmark/bitrunning/hololadder_spawn, +/obj/modular_map_connector, +/turf/open/floor/plating, +/area/virtual_domain/safehouse) (1,1,1) = {" u -d +U "} (2,1,1) = {" u diff --git a/_maps/safehouses/wood.dmm b/_maps/safehouses/wood.dmm index 0bb6b273fce..05fbb97f915 100644 --- a/_maps/safehouses/wood.dmm +++ b/_maps/safehouses/wood.dmm @@ -27,6 +27,10 @@ /obj/item/newspaper, /turf/open/indestructible/hotelwood, /area/virtual_domain/safehouse) +"w" = ( +/obj/modular_map_connector, +/turf/closed/wall/mineral/wood, +/area/virtual_domain/safehouse) "x" = ( /obj/structure/railing/corner/end{ dir = 4 @@ -68,7 +72,7 @@ G i G G -G +w "} (2,1,1) = {" i diff --git a/_maps/skyrat/safehouses/ancient_milsim.dmm b/_maps/skyrat/safehouses/ancient_milsim.dmm deleted file mode 100644 index 9e3eeca63dd..00000000000 --- a/_maps/skyrat/safehouses/ancient_milsim.dmm +++ /dev/null @@ -1,9 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/virtual_domain/safehouse) - -(1,1,1) = {" -a -"} diff --git a/_maps/virtual_domains/README.md b/_maps/virtual_domains/README.md index 723af1b34c2..6e9abc65568 100644 --- a/_maps/virtual_domains/README.md +++ b/_maps/virtual_domains/README.md @@ -3,7 +3,7 @@ ## REQUIRED: 1. One way that the encrypted cache can spawn. This can be from a mob drop, a landmark (place a few, it'll pick one), or a signable landmark if you have a points system. 2. Place a virtual domain baseturf helper in each area. -3. Ensure that the map has ONE tile marked with the safehouse bottom left landmark. If you're using modular safehouses, it will need an open 7x6 area. +3. If you're using modular safehouses, ensure that the map has ONE tile marked with the safehouse modular map loader (and set the KEY). it will need an open 7x6 area. 4. Placing a safehouse area is redundant, but it will ensure there is power in the starting safehouse. 5. Create the dm file that defines the map qualities. You can use the existing ones as a template. diff --git a/_maps/virtual_domains/ash_drake.dmm b/_maps/virtual_domains/ash_drake.dmm index 6056136a278..f789e44fbc6 100644 --- a/_maps/virtual_domains/ash_drake.dmm +++ b/_maps/virtual_domains/ash_drake.dmm @@ -56,7 +56,9 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors/virtual_domain) "L" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) "P" = ( diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm index 628265552f1..edea28b064f 100644 --- a/_maps/virtual_domains/beach_bar.dmm +++ b/_maps/virtual_domains/beach_bar.dmm @@ -754,7 +754,9 @@ /turf/closed/wall/mineral/sandstone, /area/virtual_domain/fullbright) "FM" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "mine" + }, /turf/template_noop, /area/virtual_domain/safehouse) "FQ" = ( diff --git a/_maps/virtual_domains/blood_drunk_miner.dmm b/_maps/virtual_domains/blood_drunk_miner.dmm index bf673bd6dfa..7fffbabfc0b 100644 --- a/_maps/virtual_domains/blood_drunk_miner.dmm +++ b/_maps/virtual_domains/blood_drunk_miner.dmm @@ -146,7 +146,9 @@ /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "L" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) "O" = ( diff --git a/_maps/virtual_domains/breeze_bay.dmm b/_maps/virtual_domains/breeze_bay.dmm index eb305cb7788..b1d9b904d83 100644 --- a/_maps/virtual_domains/breeze_bay.dmm +++ b/_maps/virtual_domains/breeze_bay.dmm @@ -13,14 +13,14 @@ "e" = ( /turf/open/floor/carpet/red, /area/virtual_domain/fullbright) -"f" = ( -/obj/machinery/light/small/directional/west, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) "g" = ( /obj/item/toy/beach_ball/branded, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +"h" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) "i" = ( /turf/open/water/beach, /area/virtual_domain/fullbright) @@ -29,9 +29,12 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "l" = ( -/obj/machinery/light/small/directional/south, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) +/obj/effect/baseturf_helper/virtual_domain, +/obj/modular_map_root/safehouse{ + key = "wood" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) "m" = ( /obj/item/fishing_rod{ pixel_x = 5; @@ -60,11 +63,6 @@ /obj/structure/fluff/beach_umbrella/syndi, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"v" = ( -/obj/effect/baseturf_helper/virtual_domain, -/obj/effect/landmark/bitrunning/safehouse_spawn, -/turf/template_noop, -/area/virtual_domain/safehouse) "y" = ( /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/beach/sand, @@ -73,9 +71,6 @@ /mob/living/basic/crab, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"A" = ( -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) "B" = ( /obj/structure/flora/tree/jungle/style_6, /turf/open/misc/beach/sand, @@ -103,7 +98,6 @@ /turf/template_noop, /area/virtual_domain/safehouse) "J" = ( -/obj/machinery/light/small/directional/north, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "K" = ( @@ -122,7 +116,7 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "N" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/directional/north, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "O" = ( @@ -165,6 +159,10 @@ /obj/structure/flora/tree/jungle/style_3, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) +"T" = ( +/obj/machinery/light/small/directional/east, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) "U" = ( /obj/structure/flora/tree/palm/style_random, /turf/open/misc/beach/sand, @@ -172,6 +170,10 @@ "X" = ( /turf/open/floor/wood/large, /area/virtual_domain/fullbright) +"Y" = ( +/obj/machinery/light/small/directional/west, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) "Z" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/indestructible/binary, @@ -209,13 +211,13 @@ a K G y -A -N -A -A -A -A -N +J +T +J +J +J +J +T z P i @@ -233,17 +235,17 @@ a "} (3,1,1) = {" a -A +J O -A -l +J +h I I I I I -v -J +l +N P Q i @@ -260,17 +262,17 @@ a "} (4,1,1) = {" a -A +J C -A -A +J +J I I I I I I -A +J P i i @@ -287,17 +289,17 @@ a "} (5,1,1) = {" a -A +J y -A -A +J +J I I I I I I -A +J P i i @@ -315,9 +317,9 @@ a (6,1,1) = {" a S -A -A -A +J +J +J I I I @@ -343,15 +345,15 @@ a a G G -A -A +J +J I I I I I I -A +J P i i @@ -368,17 +370,17 @@ a "} (8,1,1) = {" a -A +J H g -A +J I I I I I I -A +J P i i @@ -397,15 +399,15 @@ a a G y -A -l +J +h I I I I I I -J +N P i i @@ -423,16 +425,16 @@ a (10,1,1) = {" a o -A -A -A -f -A -A -A -A -f -A +J +J +J +Y +J +J +J +J +Y +J P i i @@ -449,17 +451,17 @@ a "} (11,1,1) = {" a -A -A -A -A -A -A -A -A -A -A -A +J +J +J +J +J +J +J +J +J +J +J P i i @@ -476,17 +478,17 @@ a "} (12,1,1) = {" a -A +J B y -A -A -A +J +J +J U c -A -A -A +J +J +J P i i @@ -503,17 +505,17 @@ a "} (13,1,1) = {" a -A -A -A -A +J +J +J +J s -A -A -A -A +J +J +J +J k -A +J P i i @@ -532,15 +534,15 @@ a a K y -A -A +J +J p p -A -A -A +J +J +J m -A +J P i i @@ -557,17 +559,17 @@ a "} (15,1,1) = {" a -A -A -A -A +J +J +J +J t -A -A -A -A +J +J +J +J L -A +J P i i @@ -584,17 +586,17 @@ a "} (16,1,1) = {" a -A +J C -A -A +J +J e e -A -A -A -A -A +J +J +J +J +J P i i @@ -612,16 +614,16 @@ a (17,1,1) = {" a G -A -A -A +J +J +J F -A -A -A -A -A -A +J +J +J +J +J +J P i i @@ -640,15 +642,15 @@ a a S G -A -A +J +J D D -A -A -A -A -A +J +J +J +J +J X X X @@ -665,17 +667,17 @@ a "} (19,1,1) = {" a -A -A -A -A +J +J +J +J R -A -A -A -A -A -A +J +J +J +J +J +J X X X @@ -692,17 +694,17 @@ a "} (20,1,1) = {" a -A +J H -A -A -A -A -A -A -A -A -A +J +J +J +J +J +J +J +J +J P i i @@ -719,17 +721,17 @@ a "} (21,1,1) = {" a -A +J O -A -A -A -A -A -A +J +J +J +J +J +J c -A -A +J +J P i i @@ -747,16 +749,16 @@ a (22,1,1) = {" a o -A +J y -A -A -A -A -A +J +J +J +J +J U -A -A +J +J P i i @@ -773,17 +775,17 @@ a "} (23,1,1) = {" a -A +J G -A -A -A -A -A -A +J +J +J +J +J +J y -A -A +J +J P i i @@ -800,17 +802,17 @@ a "} (24,1,1) = {" a -A +J B -A +J z -A +J y -A -A -A -A -A +J +J +J +J +J P i Q diff --git a/_maps/virtual_domains/bubblegum.dmm b/_maps/virtual_domains/bubblegum.dmm index a801fa49187..ef695744892 100644 --- a/_maps/virtual_domains/bubblegum.dmm +++ b/_maps/virtual_domains/bubblegum.dmm @@ -69,7 +69,9 @@ /turf/template_noop, /area/virtual_domain/safehouse) "T" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) "W" = ( diff --git a/_maps/virtual_domains/clown_planet.dmm b/_maps/virtual_domains/clown_planet.dmm index 7dbeefe3043..fe259ffea48 100644 --- a/_maps/virtual_domains/clown_planet.dmm +++ b/_maps/virtual_domains/clown_planet.dmm @@ -370,7 +370,9 @@ /turf/open/floor/noslip, /area/virtual_domain) "xt" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "mine" + }, /turf/template_noop, /area/virtual_domain/safehouse) "yd" = ( diff --git a/_maps/virtual_domains/colossus.dmm b/_maps/virtual_domains/colossus.dmm index fe97dcace42..19570e13daf 100644 --- a/_maps/virtual_domains/colossus.dmm +++ b/_maps/virtual_domains/colossus.dmm @@ -73,7 +73,9 @@ /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/surface/outdoors/virtual_domain) "N" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) "T" = ( diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm index d6377a4a4c1..cb8f2625f0d 100644 --- a/_maps/virtual_domains/gondola_asteroid.dmm +++ b/_maps/virtual_domains/gondola_asteroid.dmm @@ -97,7 +97,9 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/powered/virtual_domain) "O" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, /turf/template_noop, /area/virtual_domain/safehouse) "Q" = ( diff --git a/_maps/virtual_domains/hierophant.dmm b/_maps/virtual_domains/hierophant.dmm index 81f8a9f97a7..997dfa74fac 100644 --- a/_maps/virtual_domains/hierophant.dmm +++ b/_maps/virtual_domains/hierophant.dmm @@ -41,7 +41,9 @@ /turf/open/indestructible/hierophant/two, /area/lavaland/surface/outdoors/virtual_domain) "H" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) "K" = ( diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm index 3ffb21e0917..af42f707252 100644 --- a/_maps/virtual_domains/pipedream.dmm +++ b/_maps/virtual_domains/pipedream.dmm @@ -29,6 +29,10 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/virtual_domain) +"bl" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) "bq" = ( /obj/machinery/light/small/red/dim{ dir = 1 @@ -216,6 +220,7 @@ /area/virtual_domain) "gc" = ( /obj/structure/disposalpipe/broken, +/obj/effect/landmark/bitrunning/mob_segment, /turf/open/floor/plating, /area/virtual_domain) "gj" = ( @@ -266,6 +271,11 @@ }, /turf/open/floor/iron, /area/virtual_domain) +"io" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, +/turf/open/floor/iron, +/area/virtual_domain) "iw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -285,6 +295,9 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/iron, /area/virtual_domain) +"iZ" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) "jv" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 8 @@ -358,10 +371,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/virtual_domain) -"lt" = ( -/obj/effect/landmark/bitrunning/mob_segment, -/turf/open/floor/plating, -/area/virtual_domain) "lx" = ( /obj/machinery/door/poddoor/shutters/indestructible{ dir = 4; @@ -473,12 +482,6 @@ }, /turf/open/floor/carpet/orange, /area/virtual_domain) -"pb" = ( -/obj/structure/broken_flooring/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain) "pf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/effect/mapping_helpers/damaged_window, @@ -515,13 +518,6 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/iron, /area/virtual_domain) -"qd" = ( -/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, -/obj/effect/turf_decal/stripes{ - dir = 9 - }, -/turf/open/floor/iron, -/area/virtual_domain) "qk" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -634,13 +630,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/virtual_domain) -"tE" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/landmark/bitrunning/mob_segment, -/turf/open/floor/plating, -/area/virtual_domain) "ud" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/carpet/royalblue{ @@ -854,6 +843,19 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/virtual_domain) +"zd" = ( +/mob/living/basic/pet/cat/space, +/obj/structure/bed/dogbed{ + name = "cat bed" + }, +/obj/item/toy/plush/moth{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/light/small/dim/directional/south, +/obj/structure/sign/poster/official/moth_hardhat/directional/west, +/turf/open/floor/plating, +/area/virtual_domain) "zp" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -889,17 +891,18 @@ /obj/item/stack/rods/two, /turf/open/space/basic, /area/virtual_domain) -"Aw" = ( -/obj/structure/lattice/catwalk{ - name = "industrial lift" - }, -/turf/open/chasm, -/area/virtual_domain) "AJ" = ( /obj/effect/decal/cleanable/generic, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/virtual_domain) +"AO" = ( +/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, +/obj/effect/turf_decal/stripes{ + dir = 9 + }, +/turf/open/floor/iron, +/area/virtual_domain) "AP" = ( /obj/structure/railing, /turf/open/floor/plating, @@ -920,12 +923,6 @@ /obj/structure/broken_flooring/corner/directional/east, /turf/open/floor/plating, /area/virtual_domain) -"Bt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/virtual_domain) "Bx" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -1023,9 +1020,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/virtual_domain) -"DD" = ( -/turf/template_noop, -/area/virtual_domain) "DE" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -1045,6 +1039,12 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/airless, /area/virtual_domain) +"EE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/virtual_domain) "EI" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -1062,6 +1062,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/virtual_domain) +"EK" = ( +/obj/structure/disposalpipe/broken, +/turf/open/floor/plating, +/area/virtual_domain) "Ff" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 4 @@ -1225,10 +1229,6 @@ /obj/structure/sign/warning/chem_diamond/directional/west, /turf/open/floor/plating, /area/virtual_domain) -"JG" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/template_noop, -/area/virtual_domain) "JT" = ( /obj/structure/lattice/catwalk{ name = "industrial lift" @@ -1252,9 +1252,10 @@ /turf/open/floor/plating, /area/virtual_domain) "KX" = ( -/obj/structure/disposalpipe/broken, -/obj/effect/landmark/bitrunning/mob_segment, -/turf/open/floor/plating, +/obj/structure/lattice/catwalk{ + name = "industrial lift" + }, +/turf/open/chasm, /area/virtual_domain) "Ln" = ( /obj/structure/disposalpipe/broken{ @@ -1375,6 +1376,10 @@ }, /turf/open/floor/plating, /area/virtual_domain) +"Ou" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/plating, +/area/virtual_domain) "OJ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes{ @@ -1502,6 +1507,13 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/virtual_domain) +"Rs" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/plating, +/area/virtual_domain) "Ru" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1551,10 +1563,6 @@ }, /turf/open/floor/iron, /area/virtual_domain) -"St" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, -/turf/template_noop, -/area/virtual_domain) "SR" = ( /obj/effect/turf_decal/trimline/yellow/line, /obj/effect/decal/cleanable/glass, @@ -1566,6 +1574,12 @@ }, /turf/closed/mineral, /area/virtual_domain) +"ST" = ( +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) "SU" = ( /obj/effect/spawner/structure/window, /obj/item/stack/rods/two, @@ -1583,6 +1597,12 @@ /obj/effect/mob_spawn/corpse/human/factory/qm, /turf/open/floor/iron, /area/virtual_domain) +"Tn" = ( +/obj/structure/broken_flooring/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/virtual_domain) "Tp" = ( /obj/machinery/door/poddoor/shutters/indestructible{ dir = 4; @@ -1813,19 +1833,6 @@ /obj/structure/broken_flooring/corner/directional/west, /turf/open/floor/plating, /area/virtual_domain) -"Ym" = ( -/mob/living/basic/pet/cat/space, -/obj/structure/bed/dogbed{ - name = "cat bed" - }, -/obj/item/toy/plush/moth{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/machinery/light/small/dim/directional/south, -/obj/structure/sign/poster/official/moth_hardhat/directional/west, -/turf/open/floor/plating, -/area/virtual_domain) "Yt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -1864,11 +1871,6 @@ icon_state = "carpet_royalblue-157" }, /area/virtual_domain) -"Zs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/closet_empty/crate/with_loot, -/turf/open/floor/iron, -/area/virtual_domain) "Zy" = ( /obj/structure/table, /obj/item/flashlight/lantern, @@ -2157,11 +2159,11 @@ yQ yQ RJ eg -qd +AO Dr bw Jq -gc +EK eg RJ eg @@ -2259,8 +2261,8 @@ RJ eg uU gj -lt -pb +Ou +Tn OR eg RJ @@ -2427,12 +2429,12 @@ eY aK aK aK -DD -DD -DD -DD -DD -St +iZ +iZ +iZ +iZ +iZ +ST aK RJ "} @@ -2477,12 +2479,12 @@ eY eY aK aK -DD -DD -DD -DD -DD -DD +iZ +iZ +iZ +iZ +iZ +iZ aK RJ "} @@ -2506,7 +2508,7 @@ kU pv AP IZ -Aw +KX Wd uv DE @@ -2527,12 +2529,12 @@ XL eg tr eY -DD -DD -DD -DD -DD -DD +iZ +iZ +iZ +iZ +iZ +iZ aK RJ "} @@ -2555,14 +2557,14 @@ mu uF xl AP -Aw +KX JT bG -tE +Rs DA DA zE -KX +gc mu Yz lW @@ -2577,12 +2579,12 @@ Wp Ru hi gs -DD -DD -DD -DD -DD -DD +iZ +iZ +iZ +iZ +iZ +iZ aK RJ "} @@ -2605,8 +2607,8 @@ iz jS gj rJ -Aw -Aw +KX +KX Wd Ff lN @@ -2627,12 +2629,12 @@ cw eY tr eY -DD -DD -DD -DD -DD -DD +iZ +iZ +iZ +iZ +iZ +iZ aK RJ "} @@ -2677,12 +2679,12 @@ eY eY aK aK -DD -DD -DD -DD -DD -DD +iZ +iZ +iZ +iZ +iZ +iZ aK RJ "} @@ -2700,7 +2702,7 @@ QW My Qy kU -Zs +io eg tr Is @@ -2727,12 +2729,12 @@ eY aK aK aK -DD -DD -DD -DD -DD -JG +iZ +iZ +iZ +iZ +iZ +bl aK RJ "} @@ -2756,7 +2758,7 @@ Tp Tp Tp eg -Ym +zd eg eg xa @@ -2857,11 +2859,11 @@ Yl pJ eg kn -pb +Tn kU -lt +Ou kU -Bt +EE kU YF eg @@ -2909,7 +2911,7 @@ eg rc mu rM -gc +EK vQ vQ mu diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm index 04be3d3a42d..5db01cc36a9 100644 --- a/_maps/virtual_domains/pirates.dmm +++ b/_maps/virtual_domains/pirates.dmm @@ -1,43 +1,43 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ag" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/garbage, -/turf/open/floor/wood, +"af" = ( +/obj/structure/flora/rock/pile/style_2, +/turf/open/water/beach, /area/virtual_domain/fullbright) -"by" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, +"al" = ( +/obj/structure/flora/bush/sunny, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"bb" = ( +/obj/effect/turf_decal/weather/sand, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"bz" = ( -/obj/structure/flora/bush/grassy{ - pixel_y = 8 - }, -/obj/structure/flora/bush/lavendergrass{ - pixel_y = -10 +"bc" = ( +/turf/open/misc/beach/coast{ + dir = 10 }, -/turf/open/misc/grass, /area/virtual_domain/fullbright) -"bP" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/grass, -/area/virtual_domain/fullbright) -"cl" = ( -/obj/structure/flora/rock/style_3, +"be" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/rock/pile, /turf/open/water/beach, /area/virtual_domain/fullbright) -"ct" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/head/costume/pirate/armored, -/obj/item/clothing/suit/costume/pirate/captain/armored, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"cx" = ( -/turf/closed/indestructible/binary, +"bI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/gun/energy/laser/musket{ + pixel_y = 7 + }, +/obj/item/gun/energy/laser/musket{ + pixel_y = 2 + }, +/obj/item/gun/energy/laser/musket{ + pixel_y = -3 + }, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"cJ" = ( +"cr" = ( /obj/item/stack/cannonball/shellball{ pixel_x = 13; pixel_y = 11 @@ -49,312 +49,181 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"cQ" = ( -/obj/structure/flora/grass/jungle/b{ - pixel_x = -15; - pixel_y = 9 +"cX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/claymore/cutlass, +/obj/item/clothing/head/costume/pirate/bandana/armored{ + pixel_x = -9; + pixel_y = 7 }, -/obj/structure/flora/rock/pile/jungle/large/style_2{ - pixel_x = -3; - pixel_y = -1 +/obj/structure/table/wood, +/obj/item/gun/energy/laser{ + pixel_y = -3 + }, +/turf/open/floor/wood{ + icon_state = "wood_large" }, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"dp" = ( -/turf/closed/wall/mineral/wood/nonmetal, -/area/virtual_domain/fullbright) -"dA" = ( -/obj/structure/bonfire/prelit, -/turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"dQ" = ( -/obj/structure/flora/rock/style_4, +"db" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, /turf/open/water/beach, /area/virtual_domain/fullbright) -"eb" = ( -/obj/structure/flora/bush/sparsegrass, -/turf/open/misc/grass, +"dc" = ( +/turf/open/misc/beach/coast/corner, /area/virtual_domain/fullbright) -"eD" = ( -/obj/structure/flora/coconuts{ - pixel_x = 9; - pixel_y = -14 +"dN" = ( +/obj/machinery/door/airlock/vault{ + color = "#825427"; + name = "Ye Olde Strong Door" }, -/obj/structure/flora/tree/palm/style_2, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"eQ" = ( -/turf/open/floor/carpet/blue, +/turf/open/floor/wood/parquet, /area/virtual_domain) -"eW" = ( -/obj/effect/turf_decal/weather/sand{ +"eO" = ( +/obj/structure/flora/rock/pile, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"eP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/misc/beach/coast{ dir = 6 }, -/turf/open/floor/wood, /area/virtual_domain/fullbright) -"fx" = ( -/obj/structure/fluff/beach_umbrella{ - pixel_x = -7; - pixel_y = -10 - }, +"eS" = ( /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"gk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/bitrunning/cache_spawn, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"gw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood{ - icon_state = "wood_large" - }, +"fd" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"ht" = ( -/obj/structure/bookcase/random/fiction, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"hH" = ( -/obj/item/clothing/suit/armor/militia{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/clothing/suit/armor/militia{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/clothing/suit/armor/militia{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/clothing/head/costume/fancy{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/clothing/head/costume/fancy{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/clothing/head/hats/coordinator{ - pixel_x = 8; - pixel_y = -5 - }, -/obj/structure/closet/cabinet, -/turf/open/floor/wood, +"fh" = ( +/obj/structure/flora/bush/sparsegrass, +/obj/structure/flora/bush/lavendergrass, +/turf/open/misc/grass, /area/virtual_domain/fullbright) -"hM" = ( -/obj/structure/closet/crate/goldcrate, -/turf/open/misc/dirt/jungle, +"fk" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/grass, /area/virtual_domain/fullbright) -"hW" = ( -/obj/structure/chair/comfy/carp{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"iM" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, +"fw" = ( +/obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/basic/trooper/pirate/ranged/space, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"iO" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"jl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/flashlight/flare/torch{ - pixel_y = 10; - pixel_x = 7 - }, -/obj/item/reagent_containers/cup/bucket/wooden{ - pixel_y = -16; - pixel_x = 12 - }, -/obj/machinery/recharger{ - pixel_y = 6; - pixel_x = -5 +"fR" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"gf" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 5 }, +/obj/effect/decal/cleanable/glass, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"jz" = ( +"gu" = ( +/obj/structure/flora/bush/stalky, +/turf/open/misc/beach/coast, +/area/virtual_domain/fullbright) +"gx" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"jB" = ( +"gB" = ( /obj/effect/turf_decal/weather/sand{ - dir = 4 + dir = 9 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/jukebox, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"jC" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages."; - name = "Ghost Pirate Rum"; - pixel_x = -4; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -7; - pixel_y = 5 +"gK" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/ferny, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"hb" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain/fullbright) +"hn" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 3; - pixel_y = 7 +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"hq" = ( +/obj/structure/closet/crate/grave, +/obj/structure/flora/grass/jungle/b, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"iw" = ( +/obj/modular_map_root/safehouse{ + key = "wood" }, -/turf/open/floor/carpet/blue, +/turf/template_noop, +/area/virtual_domain/safehouse) +"jp" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"jE" = ( +/turf/open/floor/wood/parquet, /area/virtual_domain) -"jQ" = ( -/obj/item/gun/energy/laser/hellgun{ +"jH" = ( +/obj/structure/headpike/bone, +/turf/open/misc/beach/coast, +/area/virtual_domain/fullbright) +"jN" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"lF" = ( +/obj/structure/table/wood, +/obj/item/melee/energy/sword/pirate{ pixel_y = 10 }, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"kg" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 4 }, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"kl" = ( -/obj/structure/cannon, -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/ash/large{ - pixel_y = -5; - pixel_x = 8 +/obj/item/lighter{ + pixel_x = 10; + pixel_y = -8 }, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"kF" = ( -/turf/closed/wall/mineral/wood/nonmetal, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/blue, /area/virtual_domain) -"lC" = ( +"lK" = ( /obj/item/stack/cannonball{ pixel_x = 7; pixel_y = 8 }, /obj/item/stack/cannonball{ pixel_x = 11; - pixel_y = -4 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"me" = ( -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"mw" = ( -/obj/structure/flora/grass/jungle/b/style_random{ - pixel_x = -13; - pixel_y = 18 - }, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"mP" = ( -/obj/structure/flora/bush/fullgrass, -/turf/open/misc/grass, -/area/virtual_domain/fullbright) -"nz" = ( -/obj/effect/mob_spawn/corpse/human/pirate, -/turf/open/misc/beach/coast{ - dir = 8 - }, -/area/virtual_domain/fullbright) -"nQ" = ( -/obj/machinery/loot_locator, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"nS" = ( -/obj/structure/flora/rock/pile/jungle/large, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"nX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/basic/trooper/pirate/melee/space, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"oo" = ( -/obj/machinery/smartfridge/drying_rack, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"oU" = ( -/turf/open/misc/beach/coast{ - dir = 10 - }, -/area/virtual_domain/fullbright) -"pq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"px" = ( -/obj/structure/headpike/bone{ - pixel_y = 24 - }, -/turf/open/misc/beach/coast, -/area/virtual_domain/fullbright) -"pP" = ( -/turf/open/misc/beach/coast, -/area/virtual_domain/fullbright) -"pU" = ( -/obj/effect/mob_spawn/corpse/human/pirate, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"qj" = ( -/obj/structure/barricade/wooden, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"qm" = ( -/obj/effect/turf_decal/siding/wood, -/obj/item/melee/sabre{ - pixel_y = 12; - pixel_x = -10 + pixel_y = -4 }, -/obj/item/gun/energy/laser/retro, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"qx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/effect/turf_decal/weather/sand{ + dir = 1 }, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/basic/trooper/pirate/ranged, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"qN" = ( -/obj/structure/flora/bush/sunny/style_3{ - pixel_y = 22 +"mp" = ( +/turf/open/misc/beach/coast{ + dir = 4 }, -/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"qX" = ( +"mR" = ( +/obj/machinery/smartfridge/drying_rack, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"nb" = ( /obj/effect/turf_decal/weather/sand{ dir = 9 }, @@ -367,37 +236,131 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"rW" = ( -/turf/template_noop, +"nr" = ( +/mob/living/basic/trooper/pirate/melee, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"nN" = ( +/obj/structure/flora/rock, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"oB" = ( +/obj/structure/flora/grass/jungle, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"oL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed/maint, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"oM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"pi" = ( +/obj/structure/flora/rock/style_3, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"pn" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"qk" = ( +/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"sn" = ( +"qE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/ordnance, /turf/open/floor/carpet/blue, /area/virtual_domain) -"so" = ( +"qS" = ( +/obj/effect/decal/cleanable/ants, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"ri" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/mob/living/basic/trooper/pirate/ranged/space, /turf/open/floor/carpet/blue, /area/virtual_domain) -"th" = ( -/obj/effect/turf_decal/weather/sand, +"rm" = ( +/obj/structure/closet/crate/goldcrate, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"rn" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/flashlight/flare/torch{ + pixel_y = 10; + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_y = -16; + pixel_x = 12 + }, +/obj/machinery/recharger{ + pixel_y = 6; + pixel_x = -5 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"tk" = ( -/obj/structure/flora/bush/flowers_pp, -/turf/open/misc/grass, +"ru" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed/maint{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/item/toy/plush/beeplushie, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"to" = ( -/mob/living/basic/trooper/pirate/melee, -/turf/open/misc/grass, +"sj" = ( +/obj/effect/mine/explosive/light, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"td" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"tw" = ( +/obj/structure/bookcase/random/adult, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"tH" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/head/costume/pirate/armored, +/obj/item/clothing/suit/costume/pirate/captain/armored, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"tQ" = ( +/obj/structure/barricade/sandbags, +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/turf/open/floor/wood{ + icon_state = "wood_large" + }, /area/virtual_domain/fullbright) "ub" = ( /turf/template_noop, /area/virtual_domain/safehouse) -"uw" = ( +"uk" = ( +/obj/structure/flora/rock{ + pixel_x = 7 + }, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"uG" = ( /obj/structure/barricade/sandbags, /obj/effect/turf_decal/weather/sand{ dir = 4 @@ -406,158 +369,245 @@ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"uM" = ( -/obj/structure/flora/bush/stalky{ - pixel_y = 13; - pixel_x = -8 +"uH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood, +/obj/item/flashlight/flare/torch{ + pixel_y = 10 + }, +/obj/item/flashlight/flare/torch{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/wood{ + icon_state = "wood_large" }, -/turf/open/water/beach, /area/virtual_domain/fullbright) -"uT" = ( -/obj/structure/closet/crate/grave, -/obj/structure/flora/grass/jungle/b, -/turf/open/misc/dirt/jungle, +"vR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"wb" = ( -/obj/structure/flora/rock, -/turf/open/water/beach, +"wj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"we" = ( -/obj/effect/mine/explosive/light, +"wu" = ( +/obj/structure/flora/grass/jungle/b{ + pixel_x = -15; + pixel_y = 9 + }, +/obj/structure/flora/rock/pile/jungle/large/style_2{ + pixel_x = -3; + pixel_y = -1 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"wH" = ( +/obj/structure/fluff/beach_umbrella{ + pixel_x = -7; + pixel_y = -10 + }, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"xc" = ( -/turf/open/misc/beach/coast{ - dir = 4 +"wP" = ( +/obj/structure/railing{ + color = "#4C3117"; + name = "wooden railing" + }, +/obj/effect/turf_decal/weather/sand{ + dir = 9 }, +/turf/open/floor/wood, /area/virtual_domain/fullbright) "xg" = ( /turf/template_noop, /area/template_noop) -"xm" = ( -/obj/structure/barricade/wooden/crude, -/turf/closed/wall/mineral/wood/nonmetal, +"xp" = ( +/turf/open/water/beach, /area/virtual_domain/fullbright) -"xB" = ( -/obj/structure/fermenting_barrel/gunpowder{ - pixel_x = -4; - pixel_y = 17 +"zc" = ( +/obj/item/gun/energy/laser/hellgun{ + pixel_y = 10 }, -/obj/structure/fermenting_barrel/gunpowder{ - pixel_x = 4 +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"zj" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/garbage, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"zk" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/melee/sabre{ + pixel_y = 12; + pixel_x = -10 }, -/obj/item/stack/cannonball/four{ - pixel_x = -9; - pixel_y = -10 +/obj/item/gun/energy/laser/retro, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"zR" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"zU" = ( +/obj/structure/flora/coconuts{ + pixel_x = 12 }, -/obj/item/stack/cannonball{ - pixel_x = 3; +/obj/structure/flora/tree/palm, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"zW" = ( +/obj/structure/flora/bush/grassy{ pixel_y = 8 }, -/obj/item/reagent_containers/cup/bucket/wooden{ +/obj/structure/flora/bush/lavendergrass{ pixel_y = -10 }, -/turf/open/misc/beach/sand, +/turf/open/misc/grass, /area/virtual_domain/fullbright) -"xC" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +"AB" = ( +/obj/structure/headpike/bone{ + pixel_y = 24 }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"xI" = ( -/obj/structure/flora/rock/pile/style_2, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"yc" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"ye" = ( -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"yi" = ( -/mob/living/basic/trooper/pirate/melee, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"yq" = ( -/obj/structure/barricade/sandbags, -/turf/open/misc/beach/sand, +/turf/open/misc/beach/coast, /area/virtual_domain/fullbright) -"yw" = ( +"AF" = ( /obj/effect/mapping_helpers/burnt_floor, -/mob/living/basic/trooper/pirate/ranged, -/obj/structure/chair/wood, -/turf/open/floor/wood{ - icon_state = "wood_large" +/obj/structure/rack{ + icon = 'icons/obj/fluff/general.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/storage/bag/money/dutchmen{ + pixel_y = 13 + }, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"AP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"Bu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed/maint{ + pixel_x = 2; + pixel_y = 13 }, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"yA" = ( -/obj/item/bedsheet/rainbow/double, -/obj/structure/bed/double, +"BU" = ( /turf/open/floor/carpet/blue, /area/virtual_domain) -"zf" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/ferny, -/turf/open/misc/grass, +"BV" = ( +/obj/structure/bonfire/prelit, +/turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"zg" = ( -/obj/structure/flora/rock/pile/style_3, +"BX" = ( +/obj/structure/flora/bush/sunny/style_3{ + pixel_y = 22 + }, /turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"zR" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/template_noop, -/area/virtual_domain/safehouse) -"Ax" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/effect/turf_decal/weather/dirt, -/turf/open/water/beach, +"Ci" = ( +/turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/fullbright) -"AU" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +"Cu" = ( +/obj/item/kirbyplants/organic/plant21{ + pixel_x = -8 }, -/turf/open/water/beach, +/obj/structure/filingcabinet{ + pixel_x = 11 + }, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"CL" = ( +/obj/structure/flora/rock/pile/jungle/large, +/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"BC" = ( +"Dd" = ( /obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"BO" = ( -/obj/structure/bookcase/random/adult, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"Cc" = ( +"DM" = ( +/turf/closed/mineral/random/jungle, +/area/virtual_domain/fullbright) +"Eb" = ( /obj/structure/flora/tree/palm, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"Ct" = ( -/turf/open/misc/beach/coast/corner, -/area/virtual_domain/fullbright) -"Dm" = ( +"EL" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/item/flashlight/flare/torch{ - pixel_y = 10 +/mob/living/basic/trooper/pirate/melee/space, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"ER" = ( +/obj/effect/turf_decal/siding/wood, +/mob/living/basic/trooper/pirate/ranged, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"Fl" = ( +/obj/structure/barricade/sandbags, +/obj/effect/turf_decal/weather/sand, +/turf/open/floor/wood{ + icon_state = "wood_large" }, -/obj/item/flashlight/flare/torch{ - pixel_x = 8; - pixel_y = 6 +/area/virtual_domain/fullbright) +"FP" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 4 }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/jukebox, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"Dr" = ( +"Gl" = ( +/obj/structure/flora/rock/pile/style_3, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"Gy" = ( +/obj/structure/flora/rock/style_2, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"Hn" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain) -"DJ" = ( +"HO" = ( +/obj/structure/table/wood, +/mob/living/basic/parrot{ + name = "pepper" + }, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"ID" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"IW" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"Jf" = ( +/obj/structure/flora/bush/sparsegrass, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"Jq" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/structure/bed/maint{ pixel_x = -10; @@ -566,257 +616,225 @@ /obj/effect/decal/cleanable/wrapping, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"DL" = ( -/obj/structure/flora/bush/sunny, -/turf/open/misc/grass, +"Jx" = ( +/obj/item/bedsheet/rainbow/double, +/obj/structure/bed/double, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"JK" = ( +/obj/structure/flora/bush/stalky{ + pixel_y = 13; + pixel_x = -8 + }, +/turf/open/water/beach, /area/virtual_domain/fullbright) -"ED" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/weather/sand{ - dir = 10 +"JX" = ( +/turf/open/misc/beach/coast/corner{ + dir = 1 }, -/obj/effect/turf_decal/weather/sand{ - dir = 9 +/area/virtual_domain/fullbright) +"KS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"KV" = ( +/obj/structure/flora/rock/pile/jungle/style_3{ + pixel_x = -15; + pixel_y = -4 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"LC" = ( +/mob/living/basic/trooper/pirate/melee, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"LK" = ( +/obj/structure/fermenting_barrel/gunpowder{ + pixel_x = -4; + pixel_y = 17 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"EZ" = ( +"LP" = ( /obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/turf/open/floor/wood{ - icon_state = "wood_large" + dir = 5 }, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"FG" = ( +"Mf" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/claymore/cutlass, -/obj/item/clothing/head/costume/pirate/bandana/armored{ - pixel_x = -9; - pixel_y = 7 - }, -/obj/structure/table/wood, -/obj/item/gun/energy/laser{ - pixel_y = -3 - }, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"FT" = ( -/turf/closed/mineral/random/jungle, -/area/virtual_domain/fullbright) -"GF" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/rock/pile, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"GG" = ( +"MG" = ( /obj/structure/barricade/sandbags, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"MP" = ( /obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/item/binoculars{ - pixel_x = -1; - pixel_y = 1 + dir = 4 }, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"NE" = ( +/obj/effect/mob_spawn/corpse/human/damaged, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"NN" = ( +/obj/structure/flora/bush/fullgrass, +/turf/open/misc/grass, +/area/virtual_domain/fullbright) +"NP" = ( +/obj/effect/mapping_helpers/burnt_floor, +/mob/living/basic/trooper/pirate/ranged, +/obj/structure/chair/wood, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"Hp" = ( -/obj/effect/turf_decal/siding/wood, -/mob/living/basic/trooper/pirate/ranged, -/turf/open/floor/wood, +"NU" = ( +/obj/structure/flora/grass/jungle/b/style_random{ + pixel_x = -13; + pixel_y = 18 + }, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"Oi" = ( +/obj/effect/mob_spawn/corpse/human/pirate, +/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"HY" = ( +"Ov" = ( /turf/open/misc/beach/coast{ dir = 6 }, /area/virtual_domain/fullbright) -"It" = ( -/obj/structure/flora/bush/sparsegrass, -/obj/structure/flora/bush/lavendergrass, -/turf/open/misc/grass, -/area/virtual_domain/fullbright) -"Iz" = ( +"Ox" = ( +/obj/structure/chair/comfy/carp{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed/maint, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"Oz" = ( +/obj/structure/flora/rock/pile/jungle/style_2, +/turf/open/misc/dirt/jungle, +/area/virtual_domain/fullbright) +"OD" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"IF" = ( +"OW" = ( /obj/effect/turf_decal/weather/dirt{ - dir = 4 + dir = 1 }, /turf/open/water/beach, /area/virtual_domain/fullbright) -"IG" = ( -/obj/effect/mob_spawn/corpse/human/pirate, -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"IM" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 10 - }, +"Qc" = ( +/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood{ icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"Jo" = ( -/obj/effect/landmark/bitrunning/cache_spawn, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"Jr" = ( -/obj/structure/headpike/bone, -/turf/open/misc/beach/coast, -/area/virtual_domain/fullbright) -"Jv" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, +"QF" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/beach, /area/virtual_domain/fullbright) -"JT" = ( -/obj/effect/decal/cleanable/ants, -/turf/open/misc/grass, +"QG" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/beach, /area/virtual_domain/fullbright) -"Kb" = ( -/obj/structure/railing{ - color = "#4C3117"; - name = "wooden railing" - }, -/obj/effect/decal/cleanable/vomit/old, +"QN" = ( +/obj/structure/barricade/sandbags, /obj/effect/turf_decal/weather/sand{ - dir = 1 + dir = 6 }, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"Kl" = ( -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"Kw" = ( -/obj/machinery/door/airlock/vault{ - color = "#825427"; - name = "Ye Olde Strong Door" +/obj/item/binoculars{ + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"KC" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 +/turf/open/floor/wood{ + icon_state = "wood_large" }, +/area/virtual_domain/fullbright) +"QU" = ( +/obj/effect/mob_spawn/corpse/human/pirate/melee, /turf/open/water/beach, /area/virtual_domain/fullbright) -"KG" = ( +"QX" = ( +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = 12 + }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/table/wood, -/obj/item/gun/energy/laser/musket{ - pixel_y = 7 +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/militia{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/clothing/head/costume/fancy{ + pixel_x = 6; + pixel_y = 12 }, -/obj/item/gun/energy/laser/musket{ - pixel_y = 2 +/obj/item/clothing/head/costume/fancy{ + pixel_x = 6; + pixel_y = 6 }, -/obj/item/gun/energy/laser/musket{ - pixel_y = -3 +/obj/item/clothing/head/hats/coordinator{ + pixel_x = 8; + pixel_y = -5 }, +/obj/structure/closet/cabinet, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"KQ" = ( -/obj/structure/flora/rock/style_2, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"Ld" = ( -/obj/structure/flora/rock/pile, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"Ma" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/turf/open/misc/grass, -/area/virtual_domain/fullbright) -"Mi" = ( +"RJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"MW" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/decal/cleanable/glass, +/mob/living/basic/trooper/pirate/ranged, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"Nh" = ( -/obj/structure/flora/rock/pile/jungle/style_3{ - pixel_x = -15; - pixel_y = -4 +"RO" = ( +/obj/structure/flora/coconuts{ + pixel_x = 9; + pixel_y = -14 }, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"Nk" = ( -/turf/open/floor/wood, +/obj/structure/flora/tree/palm/style_2, +/turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"Nz" = ( +"Sc" = ( /obj/structure/flora/bush/jungle, /turf/open/misc/grass, /area/virtual_domain/fullbright) -"NI" = ( -/obj/structure/railing{ - color = "#4C3117"; - name = "wooden railing" +"SD" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/weather/sand{ + dir = 10 }, /obj/effect/turf_decal/weather/sand{ dir = 9 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"ON" = ( -/obj/item/kirbyplants/organic/plant21{ - pixel_x = -8 - }, -/obj/structure/filingcabinet{ - pixel_x = 11 - }, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"OP" = ( -/obj/structure/flora/bush/stalky, +"SK" = ( /turf/open/misc/beach/coast, /area/virtual_domain/fullbright) -"Pq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed/maint{ - pixel_x = 2; - pixel_y = 13 - }, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"Pz" = ( -/obj/structure/table/wood, -/mob/living/basic/parrot{ - name = "pepper" - }, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"PQ" = ( -/obj/structure/flora/grass/jungle/b, -/turf/open/misc/dirt/jungle, -/area/virtual_domain/fullbright) -"Qb" = ( -/obj/structure/flora/rock{ - pixel_x = 7 - }, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"Rr" = ( +"ST" = ( /obj/structure/bed/maint{ pixel_x = -5; pixel_y = 9 @@ -826,38 +844,26 @@ }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"RR" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood{ - icon_state = "wood_large" - }, -/area/virtual_domain/fullbright) -"Sm" = ( -/obj/structure/flora/tree/jungle, -/obj/structure/flora/bush/fullgrass/style_random, +"Ta" = ( +/obj/structure/flora/bush/flowers_pp, /turf/open/misc/grass, /area/virtual_domain/fullbright) -"St" = ( -/obj/structure/table/wood, -/obj/item/melee/energy/sword/pirate{ - pixel_y = 10 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = 4 - }, -/obj/item/lighter{ - pixel_x = 10; - pixel_y = -8 +"Th" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 10 }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/blue, -/area/virtual_domain) -"Tp" = ( -/turf/open/misc/beach/coast/corner{ - dir = 1 +/turf/open/floor/wood{ + icon_state = "wood_large" }, /area/virtual_domain/fullbright) -"Tt" = ( +"To" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/wood/parquet, +/area/virtual_domain) +"Ul" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/virtual_domain) +"Uw" = ( /obj/structure/cannon{ dir = 1 }, @@ -866,119 +872,115 @@ }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"TO" = ( +"Vx" = ( +/obj/structure/flora/rock/style_4, +/turf/open/water/beach, +/area/virtual_domain/fullbright) +"VE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/virtual_domain/fullbright) +"VG" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/light/small/directional/south, -/obj/effect/landmark/bitrunning/cache_spawn, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, /area/virtual_domain) -"TP" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +"Wu" = ( +/obj/structure/fermenting_barrel/gunpowder{ + pixel_x = -4; + pixel_y = 17 }, -/turf/open/misc/beach/coast{ - dir = 6 +/obj/structure/fermenting_barrel/gunpowder{ + pixel_x = 4 }, -/area/virtual_domain/fullbright) -"TQ" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed/maint{ - pixel_x = 2; - pixel_y = 1 +/obj/item/stack/cannonball/four{ + pixel_x = -9; + pixel_y = -10 }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/toy/plush/beeplushie, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) -"Uy" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/closed/indestructible/binary, -/area/virtual_domain/fullbright) -"UE" = ( -/obj/structure/barricade/sandbags, -/obj/effect/turf_decal/weather/sand{ - dir = 10 +/obj/item/stack/cannonball{ + pixel_x = 3; + pixel_y = 8 }, -/turf/open/floor/wood{ - icon_state = "wood_large" +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_y = -10 }, +/turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"Vg" = ( -/obj/effect/mob_spawn/corpse/human/pirate/melee, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -"Vk" = ( -/obj/structure/barricade/sandbags, -/obj/effect/turf_decal/weather/sand, -/turf/open/floor/wood{ - icon_state = "wood_large" - }, +"Wx" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, /area/virtual_domain/fullbright) -"VC" = ( -/obj/effect/mob_spawn/corpse/human/damaged, -/turf/open/water/beach, +"WW" = ( +/turf/template_noop, /area/virtual_domain/fullbright) -"VF" = ( -/turf/open/water/beach, +"XP" = ( +/obj/structure/barricade/wooden/crude, +/turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/fullbright) -"VX" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/rack{ - icon = 'icons/obj/fluff/general.dmi'; - icon_state = "minibar"; - name = "skeletal minibar" - }, -/obj/item/storage/bag/money/dutchmen{ - pixel_y = 13 +"XW" = ( +/obj/effect/mob_spawn/corpse/human/pirate, +/turf/open/misc/beach/coast{ + dir = 8 }, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"WM" = ( -/obj/structure/flora/rock/pile/jungle/style_2, -/turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) -"WP" = ( -/turf/open/floor/wood/parquet, +"Yf" = ( +/obj/machinery/loot_locator, +/turf/open/floor/carpet/blue, /area/virtual_domain) -"Xn" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, -/turf/template_noop, -/area/virtual_domain/safehouse) -"XG" = ( -/obj/structure/fermenting_barrel/gunpowder{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/effect/decal/cleanable/dirt/dust, +"Yr" = ( +/obj/effect/mob_spawn/corpse/human/pirate, +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/misc/beach/sand, +/area/virtual_domain/fullbright) +"Yy" = ( /turf/open/floor/wood, /area/virtual_domain/fullbright) -"Yj" = ( -/obj/effect/landmark/bitrunning/cache_spawn, +"YJ" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages."; + name = "Ghost Pirate Rum"; + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 3; + pixel_y = 7 + }, +/turf/open/floor/carpet/blue, +/area/virtual_domain) +"Za" = ( +/obj/structure/barricade/wooden, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"Yk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/parquet, -/area/virtual_domain) -"Yq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 +"Zq" = ( +/obj/structure/railing{ + color = "#4C3117"; + name = "wooden railing" + }, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/turf_decal/weather/sand{ + dir = 1 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"Zk" = ( -/obj/structure/flora/coconuts{ - pixel_x = 12 +"Zt" = ( +/obj/structure/cannon, +/obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/ash/large{ + pixel_y = -5; + pixel_x = 8 }, -/obj/structure/flora/tree/palm, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) -"ZZ" = ( -/obj/structure/flora/grass/jungle, -/turf/open/misc/dirt/jungle, +/turf/open/floor/wood, /area/virtual_domain/fullbright) (1,1,1) = {" @@ -996,14 +998,14 @@ xg xg xg xg -cx -cx -cx -cx -cx -cx -cx -cx +hb +hb +hb +hb +hb +hb +hb +hb xg xg xg @@ -1039,17 +1041,17 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -FT -cx -cx -cx +hb +hb +DM +DM +DM +DM +DM +DM +hb +hb +hb xg xg xg @@ -1081,19 +1083,19 @@ xg xg xg xg -cx -cx -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -cx +hb +hb +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +hb xg xg xg @@ -1124,20 +1126,20 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -cx +hb +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +hb xg xg xg @@ -1168,20 +1170,20 @@ xg xg xg xg -cx -FT -FT -FT -FT -FT -FT -zf -eb -we -FT -FT -FT -cx +hb +DM +DM +DM +DM +DM +DM +gK +Jf +sj +DM +DM +DM +hb xg xg xg @@ -1210,28 +1212,28 @@ xg xg xg xg -cx -cx -cx -FT -FT -FT -Sm -Ma -bz -JT -Kl -Kl -Kl -FT -FT -cx -cx -cx -cx -cx -cx -cx +hb +hb +hb +DM +DM +DM +jN +fk +zW +qS +eS +eS +eS +DM +DM +hb +hb +hb +hb +hb +hb +hb xg xg xg @@ -1251,31 +1253,31 @@ xg xg xg xg -cx -cx -cx -cx -FT -FT -FT -FT -It -tk -DL -Kl -Kl -Kl -Cc -Kl -IG -FT -cx -cx -FT -FT -FT -FT -cx +hb +hb +hb +hb +DM +DM +DM +DM +fh +Ta +al +eS +eS +eS +Eb +eS +Yr +DM +hb +hb +DM +DM +DM +DM +hb xg xg xg @@ -1294,32 +1296,32 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -Nz -bP -mP -to -Kl -Kl -we -Kl -Kl -Kl -Kl -we -cx -cx -FT -FT -FT -FT -cx +hb +hb +DM +DM +DM +DM +DM +Sc +pn +NN +LC +eS +eS +sj +eS +eS +eS +eS +sj +hb +hb +DM +DM +DM +DM +hb xg xg xg @@ -1337,36 +1339,36 @@ xg xg xg xg -cx -cx -FT -dp -dp -dp -dp -xB -yq -yq -Kl -Kl -Ct -xc -xc -xc -xc -xc -xc -xc -HY -VF -VF -VF -VF -VF -cx -cx -cx -cx +hb +hb +DM +Ci +Ci +Ci +Ci +Wu +MG +MG +eS +eS +dc +mp +mp +mp +mp +mp +mp +mp +Ov +xp +xp +xp +xp +xp +hb +hb +hb +hb xg xg xg @@ -1381,38 +1383,38 @@ xg xg xg xg -cx -FT -dp -dp -Pq -qx -Mi -th -Kl -yq -Kl -IG -OP -uM -VF -VF -VF -VF -VF -VF -VF -VF -VC -VF -VF -VF -VF -VF -dp -cx -cx -cx +hb +DM +Ci +Ci +Bu +RJ +wj +bb +eS +MG +eS +Yr +gu +JK +xp +xp +xp +xp +xp +xp +xp +xp +NE +xp +xp +xp +xp +xp +Ci +hb +hb +hb xg xg xg @@ -1424,705 +1426,705 @@ xg (11,1,1) = {" xg xg -cx -cx -FT -dp -TQ -Iz -DJ -ag -eW -Kl -Kl -ED -Kl -Jr -VF -VF -VF -VF -VF -VF -VF -VF -VF -KQ -VF -VF -VF -VF -VF -dp -KG -pq -cx -cx -cx -cx -cx -cx -cx -Uy +hb +hb +DM +Ci +ru +oL +Jq +zj +OD +eS +eS +SD +eS +jH +xp +xp +xp +xp +xp +xp +xp +xp +xp +Gy +xp +xp +xp +xp +xp +Ci +bI +VE +hb +hb +hb +hb +hb +hb +hb +fR "} (12,1,1) = {" xg xg -cx -FT -FT -dp -Yj -MW -iO -Rr -qj -Kl -NI -xm -Ct -HY -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -wb -dp -jl -pq -BC +hb +DM +DM +Ci +jp +gf +MP +ST +Za +eS +wP +XP +dc +Ov +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +nN +Ci +rn +VE +fw ub ub ub ub ub -Xn -cx +iw +hb "} (13,1,1) = {" -cx -cx -cx -FT -FT -FT -qj -Kl -Kl -Kl -Kl -Kl -lC -kl -pP -VF -VF -VF -VF -VF -VF -Vg -VF -VF -VF -VF -VF -VF -VF -VF -cl -dp -hH -Nk -qm +hb +hb +hb +DM +DM +DM +Za +eS +eS +eS +eS +eS +lK +Zt +SK +xp +xp +xp +xp +xp +xp +QU +xp +xp +xp +xp +xp +xp +xp +xp +pi +Ci +QX +Yy +zk ub ub ub ub ub ub -cx +hb "} (14,1,1) = {" -cx -kF -kF -kF -kF -kF -Dr -oo -Kl -Kl -Kl -Kl -Kb -dp -px -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -dp -dp -Nk -Jv +hb +Ul +Ul +Ul +Ul +Ul +Hn +mR +eS +eS +eS +eS +Zq +Ci +AB +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +Ci +Ci +Yy +Dd ub ub ub ub ub ub -cx +hb "} (15,1,1) = {" -cx -kF -BO -ht -VX -ct -kF -yi -Kl -dA -Kl -Kl -by -Hp -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -me +hb +Ul +tw +To +AF +tH +Ul +nr +eS +BV +eS +eS +LP +ER +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +Wx ub ub ub ub ub ub -cx +hb "} (16,1,1) = {" -cx -kF -ON -WP -nX -Yk -Kw -Kl -Kl -Kl -Kl -Kl -Kl -dp -px -VF -VF -VF -VF -Qb -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF +hb +Ul +Cu +jE +EL +AP +dN +eS +eS +eS +eS +eS +eS +Ci +AB +xp +xp +xp +xp +uk +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp ub ub ub ub ub ub -cx +hb "} (17,1,1) = {" -cx -kF -jC -iM -so -TO -kF -Kl -Kl -EZ -IM -Kl -Kl -Kl -pP -VF -VF -VF -VF -cl -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF +hb +Ul +YJ +ri +VG +KS +Ul +eS +eS +gB +Th +eS +eS +eS +SK +xp +xp +xp +xp +pi +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp ub ub ub ub ub ub -cx +hb "} (18,1,1) = {" -cx -kF -sn -hW -eQ -gk -kF -dp -qX -gw -jz -UE -Kl -Zk -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -me -VF +hb +Ul +qE +Ox +BU +td +Ul +Ci +nb +Mf +gx +tQ +eS +zU +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +Wx +xp ub ub ub ub ub zR -cx +hb "} (19,1,1) = {" -cx -kF -St -Pz -nQ -yA -kF -dp -Dm -jz -jz -Vk -Kl -Kl -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -dp -BC -VF -VF -VF -VF -VF -VF -cx -cx +hb +Ul +lF +HO +Yf +Jx +Ul +Ci +uH +gx +gx +Fl +eS +eS +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +Ci +fw +xp +xp +xp +xp +xp +xp +hb +hb "} (20,1,1) = {" -cx -kF -kF -kF -kF -kF -kF -xm -FG -RR -yw -Vk -Kl -Kl -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -Tt -cJ -Yq -VF -VF -VF -VF -VF -cx +hb +Ul +Ul +Ul +Ul +Ul +Ul +XP +cX +Qc +NP +Fl +eS +eS +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +Uw +cr +vR +xp +xp +xp +xp +xp +hb xg "} (21,1,1) = {" -cx -cx -cx -FT -FT -Kl -Kl -dp -dp -jB -uw -GG -Kl -Kl -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -xI -dp -XG -BC -VF -VF -VF -VF -VF -cx +hb +hb +hb +DM +DM +eS +eS +Ci +Ci +FP +uG +QN +eS +eS +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +af +Ci +LK +fw +xp +xp +xp +xp +xp +hb xg "} (22,1,1) = {" xg xg -cx -FT -FT -fx -Kl -Kl -dp -dp -Kl -Kl -Kl -Kl -pP -VF -VF -VF -VF -VF -VF -dQ -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -kg -pq -Ld -VF -VF -VF -VF -VF -cx +hb +DM +DM +wH +eS +eS +Ci +Ci +eS +eS +eS +eS +SK +xp +xp +xp +xp +xp +xp +Vx +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +oM +VE +eO +xp +xp +xp +xp +xp +hb xg "} (23,1,1) = {" xg xg -cx -FT -FT -FT -Kl -Kl -Kl -Kl -Kl -Kl -Kl -Kl -Tp -oU -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -FT -FT -cx +hb +DM +DM +DM +eS +eS +eS +eS +eS +eS +eS +eS +JX +bc +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +DM +DM +hb xg "} (24,1,1) = {" xg xg -cx -FT -FT -FT -FT -dp -Kl -eD -Kl -Kl -Kl -Kl -Kl -Tp -nz -oU -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -FT -FT -cx +hb +DM +DM +DM +DM +Ci +eS +RO +eS +eS +eS +eS +eS +JX +XW +bc +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +DM +DM +hb xg "} (25,1,1) = {" xg xg -cx -cx -FT -FT -FT -FT -Kl -Kl -Kl -Kl -Kl -Kl -yi -Kl -Kl -pP -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -FT -FT -FT -cx +hb +hb +DM +DM +DM +DM +eS +eS +eS +eS +eS +eS +nr +eS +eS +SK +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +DM +DM +DM +hb xg "} (26,1,1) = {" xg xg xg -cx -cx -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -TP -VF -FT -FT -cx -cx -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -cx -FT -FT -FT -FT -cx +hb +hb +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +eP +xp +DM +DM +hb +hb +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +hb +DM +DM +DM +DM +hb xg "} (27,1,1) = {" @@ -2130,43 +2132,43 @@ xg xg xg xg -rW -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -PQ -AU -FT -FT -FT -cx -cx -VF -VF -VF -VF -VF -VF -VF -VF -VF -VF -cx -cx -FT -FT -FT -cx -cx +WW +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +fd +OW +DM +DM +DM +hb +hb +xp +xp +xp +xp +xp +xp +xp +xp +xp +xp +hb +hb +DM +DM +DM +hb +hb xg "} (28,1,1) = {" @@ -2175,41 +2177,41 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -Nh -AU -FT -FT -FT -FT -cx -cx -cx -cx -VF -VF -VF -VF -VF -VF -cx -cx -cx -cx -cx -cx -cx +hb +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +KV +OW +DM +DM +DM +DM +hb +hb +hb +hb +xp +xp +xp +xp +xp +xp +hb +hb +hb +hb +hb +hb +hb xg xg "} @@ -2220,34 +2222,34 @@ xg xg xg xg -cx -cx -cx -cx -cx -cx -FT -FT -FT -FT -FT -ye -KC -VF -FT -FT -FT -FT -FT -FT -cx -cx -cx -cx -cx -cx -cx -cx +hb +hb +hb +hb +hb +hb +DM +DM +DM +DM +DM +qk +IW +xp +DM +DM +DM +DM +DM +DM +hb +hb +hb +hb +hb +hb +hb +hb xg xg xg @@ -2268,25 +2270,25 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -zg -ye -KC -IF -VF -FT -FT -FT -FT -FT -cx -cx +hb +hb +DM +DM +DM +DM +DM +Gl +qk +IW +hn +xp +DM +DM +DM +DM +DM +hb +hb xg xg xg @@ -2313,25 +2315,25 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -ye -ye -pU -AU -VF -GF -WM -FT -FT -FT -cx -cx +hb +hb +DM +DM +DM +DM +DM +qk +qk +Oi +OW +xp +be +Oz +DM +DM +DM +hb +hb xg xg xg @@ -2358,24 +2360,24 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -FT -ye -nS -KC -VF -Ax -ye -hM -FT -FT -FT -cx +hb +hb +DM +DM +DM +DM +DM +qk +CL +IW +xp +QG +qk +rm +DM +DM +DM +hb xg xg xg @@ -2403,23 +2405,23 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -ZZ -ye -cQ -KC -yc -qN -ye -hM -FT -FT -cx +hb +hb +DM +DM +DM +DM +oB +qk +wu +IW +QF +BX +qk +rm +DM +DM +hb xg xg xg @@ -2448,22 +2450,22 @@ xg xg xg xg -cx -cx -FT -FT -FT -FT -ye -ye -mw -xC -uT -jQ -Jo -FT -FT -cx +hb +hb +DM +DM +DM +DM +qk +qk +NU +db +hq +zc +ID +DM +DM +hb xg xg xg @@ -2493,21 +2495,21 @@ xg xg xg xg -cx -cx -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -cx +hb +hb +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +hb xg xg xg @@ -2539,19 +2541,19 @@ xg xg xg xg -cx -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -cx +hb +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +DM +hb xg xg xg @@ -2583,19 +2585,19 @@ xg xg xg xg -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx +hb +hb +hb +hb +hb +hb +hb +hb +hb +hb +hb +hb +hb xg xg xg diff --git a/_maps/virtual_domains/psyker_shuffle.dmm b/_maps/virtual_domains/psyker_shuffle.dmm index 9c846c650da..e53ec600e8a 100644 --- a/_maps/virtual_domains/psyker_shuffle.dmm +++ b/_maps/virtual_domains/psyker_shuffle.dmm @@ -96,10 +96,6 @@ /obj/item/gun/ballistic/revolver/mateba, /turf/open/indestructible/dark, /area/ruin/space/has_grav/powered/virtual_domain) -"G" = ( -/obj/structure/closet/crate, -/turf/open/indestructible/dark, -/area/ruin/space/has_grav/powered/virtual_domain) "K" = ( /obj/structure/closet/crate/eva, /turf/open/indestructible/dark, @@ -133,7 +129,9 @@ /turf/open/indestructible/dark, /area/ruin/space/has_grav/powered/virtual_domain) "U" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "bathroom" + }, /turf/template_noop, /area/virtual_domain/safehouse) "X" = ( @@ -151,118 +149,6 @@ (1,1,1) = {" o o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -"} -(2,1,1) = {" -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -"} -(3,1,1) = {" -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -"} -(4,1,1) = {" -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -"} -(5,1,1) = {" -o -o Y Y Y @@ -288,12 +174,12 @@ o o o "} -(6,1,1) = {" +(2,1,1) = {" o o Y Y -r +Q Q Q Q @@ -316,7 +202,7 @@ o o o "} -(7,1,1) = {" +(3,1,1) = {" o o Y @@ -344,7 +230,7 @@ o o o "} -(8,1,1) = {" +(4,1,1) = {" o o Y @@ -372,7 +258,7 @@ o o o "} -(9,1,1) = {" +(5,1,1) = {" o o Y @@ -400,7 +286,7 @@ o o o "} -(10,1,1) = {" +(6,1,1) = {" o o Y @@ -428,7 +314,7 @@ o o o "} -(11,1,1) = {" +(7,1,1) = {" o o Y @@ -456,7 +342,7 @@ o o o "} -(12,1,1) = {" +(8,1,1) = {" o o Y @@ -484,7 +370,7 @@ o o o "} -(13,1,1) = {" +(9,1,1) = {" o o Y @@ -512,12 +398,12 @@ Y Y o "} -(14,1,1) = {" +(10,1,1) = {" o o Y a -a +Q Y Q Q @@ -540,7 +426,7 @@ U Y Y "} -(15,1,1) = {" +(11,1,1) = {" o o Y @@ -548,7 +434,7 @@ Y Y Y Q -G +Q Q Y Y @@ -568,7 +454,7 @@ t B Y "} -(16,1,1) = {" +(12,1,1) = {" o o Y @@ -596,7 +482,7 @@ t B Y "} -(17,1,1) = {" +(13,1,1) = {" o o Y @@ -624,7 +510,7 @@ t B Y "} -(18,1,1) = {" +(14,1,1) = {" o o Y @@ -652,7 +538,7 @@ t B Y "} -(19,1,1) = {" +(15,1,1) = {" o o Y @@ -680,7 +566,7 @@ t B Y "} -(20,1,1) = {" +(16,1,1) = {" o o Y @@ -708,7 +594,7 @@ N B Y "} -(21,1,1) = {" +(17,1,1) = {" o o Y @@ -736,7 +622,7 @@ Y B Y "} -(22,1,1) = {" +(18,1,1) = {" o o Y @@ -764,7 +650,7 @@ Y B Y "} -(23,1,1) = {" +(19,1,1) = {" o o o @@ -792,7 +678,7 @@ Y Y Y "} -(24,1,1) = {" +(20,1,1) = {" o o Y @@ -820,7 +706,7 @@ o o o "} -(25,1,1) = {" +(21,1,1) = {" Y Y Y @@ -848,7 +734,7 @@ o o o "} -(26,1,1) = {" +(22,1,1) = {" Y a Q @@ -876,7 +762,7 @@ o o o "} -(27,1,1) = {" +(23,1,1) = {" Y Q Q @@ -904,7 +790,7 @@ o o o "} -(28,1,1) = {" +(24,1,1) = {" Y Y Q @@ -919,10 +805,10 @@ Q F Q Y -s Q Q -a +Q +Q Y o o @@ -932,7 +818,7 @@ o o o "} -(29,1,1) = {" +(25,1,1) = {" Y Y Q @@ -960,7 +846,7 @@ o o o "} -(30,1,1) = {" +(26,1,1) = {" Y Q Q @@ -988,7 +874,7 @@ o o o "} -(31,1,1) = {" +(27,1,1) = {" Y a Q @@ -1016,9 +902,9 @@ o o o "} -(32,1,1) = {" +(28,1,1) = {" Y -a +Q Y Y Y @@ -1026,7 +912,7 @@ o Y Y Q -a +Q Y Y Y @@ -1044,7 +930,7 @@ o o o "} -(33,1,1) = {" +(29,1,1) = {" Y Y Y diff --git a/_maps/virtual_domains/psyker_zombies.dmm b/_maps/virtual_domains/psyker_zombies.dmm index 556d875710a..a20e260bbcf 100644 --- a/_maps/virtual_domains/psyker_zombies.dmm +++ b/_maps/virtual_domains/psyker_zombies.dmm @@ -11,6 +11,11 @@ /obj/structure/sign/warning/directional/west, /turf/open/chasm, /area/ruin/space/has_grav/powered/virtual_domain) +"e" = ( +/obj/effect/mob_spawn/corpse/human/cyber_police, +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) "h" = ( /obj/structure/rack, /turf/open/indestructible/dark, @@ -69,7 +74,9 @@ /turf/open/indestructible/dark, /area/ruin/space/has_grav/powered/virtual_domain) "O" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "bathroom" + }, /turf/template_noop, /area/virtual_domain/safehouse) "Q" = ( @@ -112,8 +119,6 @@ o o o o -o -o a a a @@ -131,7 +136,6 @@ o o o o -o "} (2,1,1) = {" o @@ -140,8 +144,6 @@ o o o o -o -o a a a @@ -150,7 +152,7 @@ Y Y Y Y -Y +U a a o @@ -161,11 +163,8 @@ o o o o -o "} (3,1,1) = {" -o -o a a a @@ -191,13 +190,10 @@ o o o o -o "} (4,1,1) = {" -o -o a -W +e X Y B @@ -221,11 +217,8 @@ o o o o -o "} (5,1,1) = {" -o -o a b b @@ -251,11 +244,8 @@ o o o o -o "} (6,1,1) = {" -o -o a a a @@ -281,11 +271,8 @@ o o o o -o "} (7,1,1) = {" -o -o a a a @@ -311,11 +298,8 @@ o o o o -o "} (8,1,1) = {" -o -o a a X @@ -341,11 +325,8 @@ o o o o -o "} (9,1,1) = {" -o -o a a W @@ -371,11 +352,8 @@ o o o o -o "} (10,1,1) = {" -o -o a a Y @@ -401,11 +379,8 @@ o o o o -o "} (11,1,1) = {" -o -o a Y Y @@ -431,11 +406,8 @@ o o o o -o "} (12,1,1) = {" -o -o a Y Y @@ -461,11 +433,8 @@ o o o o -o "} (13,1,1) = {" -o -o a Y Y @@ -491,11 +460,8 @@ o o o o -o "} (14,1,1) = {" -o -o a Y Y @@ -521,11 +487,8 @@ o o o o -o "} (15,1,1) = {" -o -o a Y R @@ -551,11 +514,8 @@ o o o o -o "} (16,1,1) = {" -o -o a Y Y @@ -581,11 +541,8 @@ a a a a -o "} (17,1,1) = {" -o -o a Y V @@ -611,13 +568,10 @@ t t O a -o "} (18,1,1) = {" -o -o a -Y +U a Q a @@ -641,11 +595,8 @@ t t t a -o "} (19,1,1) = {" -o -o a Q Q @@ -671,17 +622,14 @@ t t t a -o "} (20,1,1) = {" -o -o a Q Q Q a -Y +U Y Y a @@ -701,11 +649,8 @@ t t t a -o "} (21,1,1) = {" -o -o a a Q @@ -731,11 +676,8 @@ t t t a -o "} (22,1,1) = {" -o -o a a Q @@ -761,11 +703,8 @@ t t t a -o "} (23,1,1) = {" -o -o a a Q @@ -791,11 +730,8 @@ t t r a -o "} (24,1,1) = {" -o -o a a Q @@ -821,11 +757,8 @@ a a a a -o "} (25,1,1) = {" -o -o a c Q @@ -851,11 +784,8 @@ o o o o -o "} (26,1,1) = {" -o -o a Q Q @@ -881,11 +811,8 @@ o o o o -o "} (27,1,1) = {" -o -o a Y Y @@ -911,11 +838,8 @@ o o o o -o "} (28,1,1) = {" -o -o a Y X @@ -941,11 +865,8 @@ o o o o -o "} (29,1,1) = {" -o -o a Y a @@ -971,11 +892,8 @@ o o o o -o "} (30,1,1) = {" -o -o a Y Y @@ -1001,11 +919,8 @@ o o o o -o "} (31,1,1) = {" -o -o a Y Y @@ -1031,11 +946,8 @@ o o o o -o "} (32,1,1) = {" -o -o a Y Y @@ -1061,11 +973,8 @@ o o o o -o "} (33,1,1) = {" -o -o a a R @@ -1091,12 +1000,9 @@ o o o o -o "} (34,1,1) = {" o -o -o a Y Y @@ -1110,7 +1016,7 @@ a a Y M -Y +U W i Q @@ -1121,14 +1027,11 @@ o o o o -o "} (35,1,1) = {" o -o -o a -Y +U Y Y Y @@ -1151,12 +1054,9 @@ o o o o -o "} (36,1,1) = {" o -o -o a a a @@ -1181,35 +1081,4 @@ o o o o -o -"} -(37,1,1) = {" -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o -o "} diff --git a/_maps/skyrat/virtual_domains/ancient_milsim.dmm b/_maps/virtual_domains/skyrat_ancientmilsim.dmm similarity index 82% rename from _maps/skyrat/virtual_domains/ancient_milsim.dmm rename to _maps/virtual_domains/skyrat_ancientmilsim.dmm index 0cf206507c4..86a71a32584 100644 --- a/_maps/skyrat/virtual_domains/ancient_milsim.dmm +++ b/_maps/virtual_domains/skyrat_ancientmilsim.dmm @@ -14,18 +14,6 @@ }, /turf/open/floor/plating, /area/virtual_domain) -"aK" = ( -/obj/item/gun/ballistic/automatic/pistol/plasma_thrower, -/obj/item/ammo_box/magazine/recharge/plasma_battery{ - pixel_y = -12; - pixel_x = -9 - }, -/obj/item/ammo_box/magazine/recharge/plasma_battery{ - pixel_y = -14; - pixel_x = -2 - }, -/turf/open/floor/iron/dark, -/area/virtual_domain) "aP" = ( /obj/structure/trash_pile, /turf/open/misc/grass/planet/ancient_milsim, @@ -64,10 +52,6 @@ }, /turf/open/floor/iron/dark, /area/virtual_domain) -"bF" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "bM" = ( /obj/item/stack/rods, /turf/open/misc/grass/planet/ancient_milsim, @@ -92,15 +76,10 @@ }, /turf/open/floor/plating, /area/virtual_domain) -"cr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/sand/volcanic, -/turf/open/floor/iron/white, -/area/virtual_domain/safehouse) +"cF" = ( +/obj/item/gun/ballistic/shotgun/automatic/combat/compact, +/turf/open/floor/iron, +/area/virtual_domain) "cV" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -147,32 +126,6 @@ /obj/effect/mob_spawn/ghost_role/human/ancient_milsim, /turf/open/floor/iron, /area/virtual_domain) -"ey" = ( -/obj/effect/turf_decal/stripes/end, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/weapon, -/obj/item/storage/pouch/medical/firstaid/stabilizer, -/obj/item/storage/pouch/ammo, -/obj/item/clothing/head/helmet/hecu, -/obj/item/clothing/suit/armor/vest/hecu, -/obj/item/storage/box/survival/syndie, -/obj/item/gun/ballistic/automatic/sol_smg, -/obj/item/knife/combat, -/obj/item/gun/ballistic/automatic/pistol/sol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/storage/belt/military/assault/hecu, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/stack/medical/mesh/bloody, -/obj/item/stack/medical/suture/bloody, -/obj/item/clothing/gloves/military, -/obj/item/clothing/glasses/hud/health/night, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "eC" = ( /obj/effect/landmark/bitrunning/mob_segment, /obj/structure/chair/stool/directional/south, @@ -194,24 +147,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/virtual_domain) -"eT" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/iv_drip/health_station/directional/east, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "fk" = ( /obj/machinery/light/floor, /turf/open/floor/plating, /area/virtual_domain) -"fl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "ft" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/open/floor/iron/smooth_large, @@ -222,19 +161,6 @@ }, /turf/open/floor/iron, /area/virtual_domain) -"fC" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer{ - name = "hovercraft console"; - icon_screen = "shuttle"; - desc = "An armored hovercraft control computer. Doesn't work anymore... who would've thought." - }, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "fF" = ( /obj/structure/railing, /turf/open/misc/grass/planet/ancient_milsim, @@ -358,46 +284,10 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/virtual_domain) -"kx" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/reinforced, -/obj/item/tape/ruins/ancient_milsim/devlog_one, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "kC" = ( /obj/effect/spawner/random/trash/food_packaging, /turf/open/misc/dirt/planet, /area/virtual_domain) -"kF" = ( -/obj/structure/rack/shelf, -/obj/item/ammo_box/advanced/s12gauge/pt20{ - pixel_y = -7; - pixel_x = -5 - }, -/obj/item/ammo_box/advanced/s12gauge/pt20{ - pixel_y = -7; - pixel_x = -5 - }, -/obj/item/ammo_box/advanced/s12gauge{ - pixel_x = 3 - }, -/obj/item/ammo_box/advanced/s12gauge{ - pixel_x = 3 - }, -/obj/item/ammo_box/advanced/s12gauge/flechette{ - pixel_y = 9; - pixel_x = -5 - }, -/obj/item/ammo_box/advanced/s12gauge/flechette{ - pixel_y = 9; - pixel_x = -5 - }, -/turf/open/floor/iron, -/area/virtual_domain) "kJ" = ( /obj/structure/chair/stool/directional/west, /turf/open/misc/dirt/planet, @@ -418,13 +308,6 @@ "kX" = ( /turf/open/floor/plating, /area/virtual_domain) -"kZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/bitrunning/cache_goal_turf, -/obj/effect/turf_decal/loading_area, -/obj/machinery/light/small/directional/south, -/turf/open/floor/bitrunning_transport, -/area/virtual_domain/safehouse) "lc" = ( /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron, @@ -455,8 +338,7 @@ /turf/open/floor/iron, /area/virtual_domain) "lE" = ( -/obj/machinery/power/shuttle_engine/heater, -/turf/closed/wall/mineral/plastitanium/nodiagonal, +/turf/template_noop, /area/virtual_domain/safehouse) "lG" = ( /obj/effect/landmark/bitrunning/mob_segment, @@ -472,20 +354,10 @@ /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) "mu" = ( -/obj/structure/table/wood, /obj/item/knife/combat/survival, +/obj/structure/table, /turf/open/floor/iron, /area/virtual_domain) -"mN" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, -/obj/item/taperecorder/empty, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) -"mV" = ( -/obj/item/ammo_box/c310_cargo_box/piercing, -/turf/open/floor/plating, -/area/virtual_domain) "mZ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, @@ -586,9 +458,8 @@ /turf/open/misc/dirt/planet, /area/virtual_domain) "qp" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/virtual_domain/safehouse) +/area/virtual_domain) "qs" = ( /obj/machinery/light/directional/south, /obj/structure/barricade/sandbags, @@ -602,14 +473,6 @@ }, /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) -"qU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/decal/cleanable/generic, -/obj/effect/landmark/bitrunning/hololadder_spawn, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "qV" = ( /obj/machinery/vending/medical, /turf/open/floor/iron/white, @@ -663,18 +526,8 @@ /turf/open/floor/iron, /area/virtual_domain) "td" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/c310_cargo_box/piercing{ - pixel_y = 9; - pixel_x = -5 - }, -/obj/item/ammo_box/c27_54cesarzowa/rubber{ - pixel_y = 2; - pixel_x = 4 - }, -/obj/item/storage/box/utensils{ - pixel_x = -12 - }, +/obj/item/storage/box/utensils, +/obj/structure/table, /turf/open/floor/iron, /area/virtual_domain) "te" = ( @@ -702,16 +555,6 @@ /obj/item/surgery_tray/full/deployed, /turf/open/floor/iron/white, /area/virtual_domain) -"tD" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/small/red/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/emergency, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "tH" = ( /obj/item/ammo_box/c35sol, /turf/open/floor/iron/smooth, @@ -822,26 +665,7 @@ /turf/open/floor/plating, /area/virtual_domain) "wr" = ( -/obj/structure/rack/shelf, -/obj/item/ammo_box/magazine/wylom{ - pixel_y = 10; - pixel_x = 4 - }, -/obj/item/ammo_box/magazine/wylom{ - pixel_y = 10; - pixel_x = -6 - }, -/obj/item/ammo_box/magazine/miecz{ - pixel_y = -3; - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/miecz{ - pixel_y = -3 - }, -/obj/item/ammo_box/magazine/miecz{ - pixel_y = -3; - pixel_x = 5 - }, +/obj/item/deployable_turret_folded, /turf/open/floor/iron, /area/virtual_domain) "wv" = ( @@ -853,6 +677,10 @@ dir = 1 }, /area/virtual_domain) +"wy" = ( +/obj/item/ammo_box/c980grenade/shrapnel, +/turf/open/misc/grass/planet/ancient_milsim, +/area/virtual_domain) "wz" = ( /obj/structure/flora/tree/stump, /turf/open/misc/grass/planet/ancient_milsim, @@ -918,27 +746,10 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/virtual_domain) -"zd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "zf" = ( /obj/effect/spawner/random/trash/bucket, /turf/open/floor/iron, /area/virtual_domain) -"zj" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/bitrunning/hololadder_spawn, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "zp" = ( /obj/machinery/door/puzzle/keycard/yellow_required, /turf/open/floor/iron/smooth_large, @@ -978,8 +789,8 @@ /turf/open/floor/iron, /area/virtual_domain) "AN" = ( -/obj/structure/table/wood, /obj/structure/bedsheetbin, +/obj/structure/table, /turf/open/floor/iron, /area/virtual_domain) "AR" = ( @@ -1018,13 +829,6 @@ }, /turf/open/floor/iron/white, /area/virtual_domain) -"Co" = ( -/obj/structure/sign/poster/random/directional/west, -/obj/item/gun/ballistic/automatic/wylom, -/obj/structure/rack/gunrack, -/obj/item/gun/ballistic/automatic/miecz, -/turf/open/floor/iron, -/area/virtual_domain) "Cr" = ( /obj/structure/chair/office/light{ dir = 4 @@ -1050,6 +854,11 @@ dir = 1 }, /area/virtual_domain) +"CR" = ( +/obj/item/ammo_box/advanced/s12gauge/flechette, +/obj/item/ammo_box/advanced/s12gauge/flechette, +/turf/open/floor/iron, +/area/virtual_domain) "CT" = ( /obj/structure/table, /obj/machinery/iv_drip/health_station/directional/north, @@ -1083,7 +892,7 @@ /turf/open/floor/iron/smooth_large, /area/virtual_domain) "Dt" = ( -/obj/item/gun/ballistic/automatic/wylom, +/obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil/no_mag, /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) "Dy" = ( @@ -1091,6 +900,10 @@ /obj/structure/mirror/directional/south, /turf/open/floor/iron, /area/virtual_domain) +"DL" = ( +/obj/item/ammo_box/c980grenade/smoke, +/turf/open/misc/grass/planet/ancient_milsim, +/area/virtual_domain) "DN" = ( /obj/structure/table, /obj/item/stack/medical/mesh/bloody, @@ -1137,18 +950,11 @@ /obj/item/keycard/yellow, /turf/open/floor/iron/smooth, /area/virtual_domain) -"Eq" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/obj/machinery/light/small/red/directional/east, -/obj/structure/sign/departments/medbay/alt/directional/east, +"Ey" = ( +/obj/item/ammo_box/advanced/s12gauge, +/obj/item/ammo_box/advanced/s12gauge, /turf/open/floor/iron, -/area/virtual_domain/safehouse) +/area/virtual_domain) "EB" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/effect/mapping_helpers/airlock/locked, @@ -1199,6 +1005,10 @@ "Fv" = ( /turf/open/floor/iron/smooth_half, /area/virtual_domain) +"FN" = ( +/obj/item/ammo_box/c980grenade/shrapnel/phosphor, +/turf/open/misc/grass/planet/ancient_milsim, +/area/virtual_domain) "FT" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -1249,18 +1059,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/virtual_domain) -"HL" = ( -/obj/structure/table/wood, -/obj/item/gun/ballistic/automatic/lanca{ - pixel_y = 6; - pixel_x = -2 - }, -/obj/item/ammo_box/magazine/lanca{ - pixel_y = 1; - pixel_x = -4 - }, -/turf/open/floor/iron, -/area/virtual_domain) "HM" = ( /obj/machinery/vending/wardrobe/bar_wardrobe, /obj/machinery/light/directional/south, @@ -1276,10 +1074,6 @@ /obj/effect/mob_spawn/ghost_role/human/ancient_milsim, /turf/open/floor/iron, /area/virtual_domain) -"Il" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/virtual_domain/safehouse) "Ir" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/open/floor/iron/smooth, @@ -1298,34 +1092,6 @@ /obj/effect/spawner/random/trash/caution_sign, /turf/open/misc/dirt/planet, /area/virtual_domain) -"ID" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/effect/turf_decal/sand/volcanic, -/obj/structure/closet/crate/secure/weapon, -/obj/item/storage/pouch/medical/firstaid/loaded, -/obj/item/storage/pouch/medical/loaded, -/obj/item/clothing/head/helmet/hecu, -/obj/item/clothing/suit/armor/vest/hecu, -/obj/item/storage/box/survival/syndie, -/obj/item/gun/ballistic/automatic/sol_smg, -/obj/item/knife/combat, -/obj/item/gun/ballistic/automatic/pistol/sol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/storage/belt/military/assault/hecu, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/stack/medical/mesh/bloody, -/obj/item/stack/medical/suture/bloody, -/obj/item/clothing/gloves/military, -/obj/item/clothing/glasses/hud/health/night, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "IH" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/smooth_corner{ @@ -1348,14 +1114,11 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/virtual_domain) -"JT" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 4 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/virtual_domain/safehouse) "JU" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, +/obj/modular_map_root/safehouse{ + key = "ancient_milsim" + }, +/turf/template_noop, /area/virtual_domain/safehouse) "Kf" = ( /obj/effect/spawner/random/trash/bin, @@ -1376,13 +1139,6 @@ dir = 4 }, /area/virtual_domain) -"Lc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "Lr" = ( /turf/open/floor/iron/white, /area/virtual_domain) @@ -1419,15 +1175,8 @@ /turf/open/floor/plating, /area/virtual_domain) "MW" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/lanca{ - pixel_y = -1; - pixel_x = -4 - }, -/obj/item/ammo_box/magazine/lanca{ - pixel_y = 2; - pixel_x = 4 - }, +/obj/item/gun/ballistic/rifle/boltaction/sporterized, +/obj/structure/table, /turf/open/floor/iron, /area/virtual_domain) "MY" = ( @@ -1443,15 +1192,10 @@ /obj/structure/closet/crate/cardboard, /turf/open/floor/iron, /area/virtual_domain) -"Nx" = ( -/obj/effect/landmark/bitrunning/cache_goal_turf, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/bitrunning_transport, -/area/virtual_domain/safehouse) "NA" = ( -/obj/structure/table/wood, /obj/structure/sign/poster/random/directional/west, /obj/item/storage/toolbox/maint_kit, +/obj/structure/table, /turf/open/floor/iron, /area/virtual_domain) "OA" = ( @@ -1508,6 +1252,11 @@ /obj/machinery/power/shuttle_engine/huge, /turf/open/misc/dirt/planet, /area/virtual_domain) +"Qn" = ( +/obj/item/ammo_box/advanced/s12gauge/pt20, +/obj/item/ammo_box/advanced/s12gauge/pt20, +/turf/open/floor/iron, +/area/virtual_domain) "Qv" = ( /obj/structure/flora/bush/ferny/style_random, /obj/structure/railing{ @@ -1516,13 +1265,9 @@ /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) "QF" = ( -/obj/item/ammo_box/magazine/lanca, +/obj/item/ammo_box/c40sol, /turf/open/floor/plating, /area/virtual_domain) -"QV" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/virtual_domain/safehouse) "Rk" = ( /obj/item/surgery_tray/full/deployed, /turf/open/floor/iron, @@ -1541,14 +1286,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/virtual_domain) -"Rx" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/bitrunning/hololadder_spawn, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "RA" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/ammo_box/magazine/c35sol_pistol/stendo, @@ -1601,47 +1338,16 @@ /obj/item/folder/blue, /turf/open/floor/iron/dark, /area/virtual_domain) -"SJ" = ( -/obj/structure/rack/shelf, -/obj/item/gun/ballistic/revolver/shotgun_revolver, -/turf/open/floor/iron, -/area/virtual_domain) -"Td" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/closet/crate/secure/weapon, -/obj/item/storage/pouch/medical/firstaid/stabilizer, -/obj/item/storage/pouch/ammo, -/obj/item/clothing/head/helmet/hecu, -/obj/item/clothing/suit/armor/vest/hecu, -/obj/item/storage/box/survival/syndie, -/obj/item/gun/ballistic/automatic/sol_smg, -/obj/item/knife/combat, -/obj/item/gun/ballistic/automatic/pistol/sol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/ammo_box/magazine/c35sol_pistol, -/obj/item/storage/belt/military/assault/hecu, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/ammo_box/magazine/c35sol_pistol/stendo, -/obj/item/stack/medical/mesh/bloody, -/obj/item/stack/medical/suture/bloody, -/obj/item/clothing/gloves/military, -/obj/item/clothing/glasses/hud/health/night, -/turf/open/floor/iron, -/area/virtual_domain/safehouse) "TB" = ( /obj/structure/fence/door{ dir = 4 }, /turf/open/misc/dirt/planet, /area/virtual_domain) +"TE" = ( +/obj/item/storage/toolbox/ammobox/full/mosin, +/turf/open/floor/iron, +/area/virtual_domain) "TG" = ( /obj/item/grown/log, /obj/item/grown/log, @@ -1700,7 +1406,7 @@ /turf/open/floor/plating, /area/virtual_domain) "Vr" = ( -/obj/item/ammo_box/magazine/wylom, +/obj/item/ammo_box/magazine/c980_grenade/starts_empty, /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) "VA" = ( @@ -1725,6 +1431,10 @@ /obj/item/storage/backpack/duffelbag/syndie/c4, /turf/open/floor/plating, /area/virtual_domain) +"VZ" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) "Wh" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -1752,7 +1462,7 @@ /turf/open/floor/iron/smooth, /area/virtual_domain) "WY" = ( -/obj/item/gun/ballistic/automatic/lanca, +/obj/item/gun/ballistic/rifle/boltaction/sporterized, /turf/open/floor/plating, /area/virtual_domain) "Xh" = ( @@ -1788,12 +1498,6 @@ /obj/structure/sign/flag/nri/directional/north, /turf/open/misc/grass/planet/ancient_milsim, /area/virtual_domain) -"YC" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/virtual_domain/safehouse) "YY" = ( /turf/open/floor/iron, /area/virtual_domain) @@ -2300,7 +2004,7 @@ qn Cd Cd Eh -aK +ki RP RP EB @@ -2721,14 +2425,14 @@ Cd Wr hj rB -SJ +YY UQ Pw De YY DW wr -Co +De ob uZ jS @@ -2779,9 +2483,9 @@ Cd hj hj rB -YY -YY -YY +Qn +Ey +CR YY YY YY @@ -2837,8 +2541,8 @@ Hq hj hj rB -kF YY +cF tg YY YY @@ -3078,7 +2782,7 @@ dd AB DW et -HL +td YY HM dd @@ -3191,10 +2895,10 @@ Sh Sh iI dd -mu +jc te -YY -YY +TE +TE ZQ mu dd @@ -3876,7 +3580,7 @@ dd dd yl Is -mV +kX dd OV kX @@ -4070,11 +3774,11 @@ Cd Cd Cd kS -JU -YC -JU -JU -YC +lE +lE +lE +lE +lE JU qp qn @@ -4128,11 +3832,11 @@ Cd Cd Cd Cd -JU -ID -Td -ey -Nx +lE +lE +lE +lE +lE lE bd qn @@ -4186,11 +3890,11 @@ Cd Cd Cd Cd -JU -tD -bF -Lc -kZ +lE +lE +lE +lE +lE lE qn qn @@ -4244,11 +3948,11 @@ Cd Cd Cd Cd -cr -fl -bF -zd -qU +lE +lE +lE +lE +lE lE qn qn @@ -4302,11 +4006,11 @@ Cd Cd Cd Cd -QV -kx -mN -zd -Rx +lE +lE +lE +lE +lE lE qn qn @@ -4360,11 +4064,11 @@ Cd Cd Cd Cd -QV -fC -Eq -eT -zj +lE +lE +lE +lE +lE lE bd qn @@ -4418,13 +4122,13 @@ Cd Cd Cd kS -JU -JT -JU -JU -JT -JU -Il +lE +lE +lE +lE +lE +VZ +qp qn qn qn @@ -4432,7 +4136,7 @@ Uz "} (46,1,1) = {" Uz -Cd +FN bB bB ki @@ -4550,7 +4254,7 @@ Uz Uz Dt Vr -Cd +wy Cd Cd Cd @@ -4606,7 +4310,7 @@ Uz "} (49,1,1) = {" Uz -Cd +DL Vr Cd Cd diff --git a/_maps/virtual_domains/stairs_and_cliffs.dmm b/_maps/virtual_domains/stairs_and_cliffs.dmm index 82e15fcc090..3c9e0711e02 100644 --- a/_maps/virtual_domains/stairs_and_cliffs.dmm +++ b/_maps/virtual_domains/stairs_and_cliffs.dmm @@ -112,7 +112,9 @@ /turf/template_noop, /area/virtual_domain/safehouse) "vz" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "ice" + }, /turf/template_noop, /area/virtual_domain/safehouse) "xB" = ( diff --git a/_maps/virtual_domains/starfront_saloon.dmm b/_maps/virtual_domains/starfront_saloon.dmm new file mode 100644 index 00000000000..277382b6dbb --- /dev/null +++ b/_maps/virtual_domains/starfront_saloon.dmm @@ -0,0 +1,1834 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ae" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"cK" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/template_noop, +/area/virtual_domain) +"cU" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"df" = ( +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/sepia, +/area/virtual_domain) +"do" = ( +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/sepia, +/area/virtual_domain) +"eU" = ( +/obj/effect/spawner/random/structure/crate, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"gh" = ( +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/sepia, +/area/virtual_domain) +"hz" = ( +/obj/item/clothing/head/cowboy, +/obj/item/clothing/head/cowboy, +/obj/item/clothing/head/cowboy, +/obj/structure/closet, +/turf/template_noop, +/area/virtual_domain/safehouse) +"il" = ( +/turf/open/floor/sepia, +/area/virtual_domain) +"it" = ( +/obj/modular_map_root/generic{ + key = "station_medium" + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"iJ" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"iO" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"jt" = ( +/obj/item/gun/energy/marksman_revolver{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/gun/energy/marksman_revolver{ + pixel_x = 4 + }, +/obj/item/gun/energy/marksman_revolver{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/structure/table, +/turf/template_noop, +/area/virtual_domain/safehouse) +"ma" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/decoration/generic, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"mq" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/virtual_domain) +"mu" = ( +/turf/closed/wall, +/area/virtual_domain) +"on" = ( +/obj/structure/table/greyscale, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/machinery/recharger{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"oR" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 8 + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"po" = ( +/obj/effect/baseturf_helper/virtual_domain, +/obj/modular_map_root/safehouse{ + key = "den" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) +"sX" = ( +/obj/effect/spawner/random/decoration/statue, +/turf/open/floor/sepia, +/area/virtual_domain) +"uW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/sepia, +/area/virtual_domain) +"ve" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"wB" = ( +/obj/effect/spawner/random/engineering/tank, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"wK" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"yF" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/food_or_drink/snack, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"zU" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/turf_decal/tile/dark_red/half, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"Au" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"AF" = ( +/obj/effect/turf_decal/tile/dark_red/half, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"Bi" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 4 + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"BX" = ( +/obj/effect/spawner/random/trash/graffiti, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"Ey" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/decoration/ornament, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"EK" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/sepia, +/area/virtual_domain) +"Gz" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/tile/dark_red/half, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/sepia, +/area/virtual_domain) +"GY" = ( +/obj/effect/spawner/random/entertainment/arcade, +/turf/open/floor/sepia, +/area/virtual_domain) +"Ib" = ( +/obj/effect/spawner/random/trash/bin, +/turf/open/floor/sepia, +/area/virtual_domain) +"Il" = ( +/obj/effect/turf_decal/tile/dark_red/half, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/sepia, +/area/virtual_domain) +"Ix" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/exotic/antag_gear, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"Ja" = ( +/turf/closed/indestructible/binary, +/area/virtual_domain) +"JA" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"KD" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/template_noop, +/area/virtual_domain) +"KN" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/virtual_domain) +"Lu" = ( +/obj/structure/table/greyscale, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/machinery/recharger{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/dark_red/half, +/obj/machinery/light/directional/south, +/turf/open/floor/sepia, +/area/virtual_domain) +"MG" = ( +/obj/effect/spawner/random/trash/graffiti, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"Oq" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/sepia, +/area/virtual_domain) +"Ox" = ( +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/five, +/obj/effect/spawner/random/armory/laser_gun, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"OX" = ( +/turf/open/floor/catwalk_floor, +/area/virtual_domain) +"OZ" = ( +/obj/effect/spawner/random/structure/billboard, +/turf/open/floor/sepia, +/area/virtual_domain) +"PE" = ( +/turf/template_noop, +/area/virtual_domain) +"Qi" = ( +/obj/modular_map_root/generic{ + key = "station_small" + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"QM" = ( +/obj/modular_map_root/generic{ + key = "station_large" + }, +/turf/open/floor/sepia, +/area/virtual_domain) +"QO" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/sepia, +/area/virtual_domain) +"Rk" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/sepia, +/area/virtual_domain) +"Te" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"Tn" = ( +/turf/open/space/basic, +/area/virtual_domain) +"TM" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"VX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sepia, +/area/virtual_domain) +"Wd" = ( +/obj/effect/turf_decal/tile/dark_red/half, +/turf/open/floor/sepia, +/area/virtual_domain) +"Wp" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/sepia, +/area/virtual_domain) + +(1,1,1) = {" +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +mq +"} +(2,1,1) = {" +Ja +il +il +il +il +mu +df +il +cU +cU +cU +cU +cU +po +il +OX +Ja +"} +(3,1,1) = {" +Ja +mu +mu +mu +mu +mu +il +il +cU +jt +on +hz +cU +cU +il +OX +Ja +"} +(4,1,1) = {" +Ja +OX +OX +OX +OX +OX +Qi +il +cU +cU +cU +cU +cU +cU +il +OX +Ja +"} +(5,1,1) = {" +Ja +PE +PE +PE +PE +PE +gh +il +cU +cU +cU +cU +cU +cU +il +OX +Ja +"} +(6,1,1) = {" +Ja +PE +PE +PE +PE +PE +il +il +cU +cU +cU +cU +cU +cU +il +OX +Ja +"} +(7,1,1) = {" +Ja +PE +PE +PE +PE +PE +il +il +cU +cU +cU +cU +cU +cU +il +OX +Ja +"} +(8,1,1) = {" +Ja +PE +PE +PE +PE +PE +il +il +cU +cU +cU +cU +cU +cU +il +il +Ja +"} +(9,1,1) = {" +Ja +PE +PE +PE +PE +PE +il +il +il +il +il +il +il +il +il +il +Ja +"} +(10,1,1) = {" +Ja +Ix +OX +OX +OX +OX +il +il +it +il +il +il +TM +mu +KN +KN +Ja +"} +(11,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +Ib +il +il +il +ae +KN +Tn +Tn +Ja +"} +(12,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(13,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Il +KN +Tn +Tn +Ja +"} +(14,1,1) = {" +Ja +PE +PE +PE +cK +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(15,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(16,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +VX +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(17,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(18,1,1) = {" +Ja +Au +OX +OX +OX +OX +il +il +it +il +sX +il +iO +KN +Tn +Tn +Ja +"} +(19,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Te +mu +Tn +Tn +Ja +"} +(20,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(21,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +AF +KN +Tn +Tn +Ja +"} +(22,1,1) = {" +Ja +PE +PE +PE +cK +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(23,1,1) = {" +Ja +PE +KD +PE +PE +PE +PE +PE +il +il +il +Wp +Wd +KN +Tn +Tn +Ja +"} +(24,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(25,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +VX +il +Wd +KN +Tn +Tn +Ja +"} +(26,1,1) = {" +Ja +wB +OX +OX +OX +OX +il +il +it +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(27,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +Ib +il +il +il +iJ +mu +Tn +Tn +Ja +"} +(28,1,1) = {" +Ja +PE +KD +PE +PE +PE +PE +PE +il +uW +il +il +ae +KN +Tn +Tn +Ja +"} +(29,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +oR +oR +il +Wd +KN +Tn +Tn +Ja +"} +(30,1,1) = {" +Ja +PE +PE +PE +cK +PE +PE +PE +Oq +mu +mu +il +Wd +KN +Tn +Tn +Ja +"} +(31,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +Bi +EK +il +Wd +KN +Tn +Tn +Ja +"} +(32,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(33,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(34,1,1) = {" +Ja +wK +ve +OX +OX +OX +VX +il +it +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(35,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +OZ +il +zU +mu +Tn +Tn +Ja +"} +(36,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(37,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +VX +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(38,1,1) = {" +Ja +PE +PE +PE +cK +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(39,1,1) = {" +Ja +PE +KD +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(40,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(41,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +uW +il +il +Wd +KN +Tn +Tn +Ja +"} +(42,1,1) = {" +Ja +Ox +OX +OX +OX +OX +il +il +it +uW +il +Wp +Gz +KN +Tn +Tn +Ja +"} +(43,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +uW +il +il +Lu +mu +Tn +Tn +Ja +"} +(44,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +do +il +il +il +ae +KN +Tn +Tn +Ja +"} +(45,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(46,1,1) = {" +Ja +PE +KD +PE +cK +PE +PE +PE +il +il +il +VX +Wd +KN +Tn +Tn +Ja +"} +(47,1,1) = {" +Ja +PE +PE +PE +PE +KD +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(48,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(49,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +Ib +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(50,1,1) = {" +Ja +MG +OX +OX +OX +OX +VX +il +il +il +QM +il +Wd +KN +Tn +Tn +Ja +"} +(51,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +yF +mu +Tn +Tn +Ja +"} +(52,1,1) = {" +Ja +PE +KD +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(53,1,1) = {" +Ja +PE +PE +cK +PE +PE +KD +PE +PE +PE +uW +il +Wd +KN +Tn +Tn +Ja +"} +(54,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +uW +il +Wd +KN +Tn +Tn +Ja +"} +(55,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(56,1,1) = {" +Ja +PE +PE +PE +PE +PE +cK +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(57,1,1) = {" +Ja +PE +KD +PE +PE +PE +KD +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(58,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +GY +il +Wd +KN +Tn +Tn +Ja +"} +(59,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(60,1,1) = {" +Ja +eU +OX +OX +OX +OX +il +il +it +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(61,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +Ib +il +il +il +Ey +mu +Tn +Tn +Ja +"} +(62,1,1) = {" +Ja +PE +PE +KD +PE +PE +PE +PE +do +il +il +VX +ae +KN +Tn +Tn +Ja +"} +(63,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(64,1,1) = {" +Ja +PE +PE +PE +cK +PE +PE +PE +il +il +Wp +il +Wd +KN +Tn +Tn +Ja +"} +(65,1,1) = {" +Ja +PE +KD +PE +PE +KD +PE +PE +il +il +sX +il +Wd +KN +Tn +Tn +Ja +"} +(66,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +il +il +il +il +Wd +KN +Tn +Tn +Ja +"} +(67,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +Rk +il +il +uW +Wd +KN +Tn +Tn +Ja +"} +(68,1,1) = {" +Ja +wB +OX +OX +OX +OX +VX +il +il +il +QM +uW +Wd +KN +Tn +Tn +Ja +"} +(69,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +ma +mu +Tn +Tn +Ja +"} +(70,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(71,1,1) = {" +Ja +PE +PE +KD +PE +PE +PE +KD +PE +PE +il +uW +Wd +KN +Tn +Tn +Ja +"} +(72,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(73,1,1) = {" +Ja +PE +PE +cK +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(74,1,1) = {" +Ja +PE +PE +PE +PE +PE +cK +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(75,1,1) = {" +Ja +PE +KD +PE +PE +PE +KD +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(76,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +il +Wd +KN +Tn +Tn +Ja +"} +(77,1,1) = {" +Ja +PE +PE +PE +PE +PE +PE +PE +PE +PE +il +VX +BX +KN +Tn +Tn +Ja +"} +(78,1,1) = {" +Ja +eU +JA +OX +OX +OX +OX +OX +OX +il +QO +il +Wd +KN +Tn +Tn +Ja +"} +(79,1,1) = {" +Ja +mu +mu +mu +mu +mu +mu +mu +mu +mu +mu +mu +mu +mu +Tn +Tn +Ja +"} +(80,1,1) = {" +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +"} diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm index de97ca08398..42e9f96a389 100644 --- a/_maps/virtual_domains/syndicate_assault.dmm +++ b/_maps/virtual_domains/syndicate_assault.dmm @@ -309,10 +309,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/virtual_domain) -"kJ" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, -/turf/template_noop, -/area/virtual_domain/safehouse) "li" = ( /obj/structure/transit_tube/station/dispenser/reverse{ dir = 4 @@ -369,14 +365,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/virtual_domain) -"nO" = ( -/obj/machinery/mineral/ore_redemption{ - name = "Syndicate ore redemption machine"; - ore_multiplier = 4; - req_access = list("syndicate") - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/powered/virtual_domain) "nU" = ( /obj/structure/sign/poster/contraband/syndicate_pistol, /turf/closed/wall/r_wall/syndicate, @@ -534,6 +522,12 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/virtual_domain) +"tR" = ( +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, +/turf/template_noop, +/area/virtual_domain/safehouse) "uP" = ( /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/virtual_domain) @@ -960,10 +954,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/powered/virtual_domain) -"Nv" = ( -/obj/effect/landmark/bitrunning/mob_segment, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/powered/virtual_domain) "Of" = ( /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -1026,6 +1016,10 @@ /obj/structure/tank_dispenser/oxygen, /turf/closed/mineral/random, /area/space) +"QX" = ( +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/virtual_domain) "Ra" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2, /obj/machinery/light/small/directional/north, @@ -2019,7 +2013,7 @@ ru Io uP uP -Nv +QX lN uP uP @@ -2028,7 +2022,7 @@ uP uP lN uP -Nv +QX uP Io hA @@ -2318,7 +2312,7 @@ pM vK uP uP -Nv +QX sL Im ru @@ -2523,7 +2517,7 @@ sM sM sM sM -kJ +tR qx Hq "} @@ -2738,7 +2732,7 @@ nB ru eB uP -nO +uP uP ru nB diff --git a/_maps/virtual_domains/test_only.dmm b/_maps/virtual_domains/test_only.dmm index 1fc9cfba0fd..b5339bf8bea 100644 --- a/_maps/virtual_domains/test_only.dmm +++ b/_maps/virtual_domains/test_only.dmm @@ -11,7 +11,9 @@ /turf/open/floor, /area/virtual_domain) "U" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "test_only" + }, /turf/open/floor, /area/virtual_domain/safehouse) diff --git a/_maps/virtual_domains/vaporwave.dmm b/_maps/virtual_domains/vaporwave.dmm index 984bbbe2914..4d5b3ab57ad 100644 --- a/_maps/virtual_domains/vaporwave.dmm +++ b/_maps/virtual_domains/vaporwave.dmm @@ -221,7 +221,9 @@ /turf/open/misc/asteroid/airless, /area/ruin/space/has_grav/powered/virtual_domain) "Uy" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "shuttle_space" + }, /turf/template_noop, /area/virtual_domain/safehouse) "UE" = ( diff --git a/_maps/virtual_domains/wendigo.dmm b/_maps/virtual_domains/wendigo.dmm index dcce722cbbd..9d57c242aff 100644 --- a/_maps/virtual_domains/wendigo.dmm +++ b/_maps/virtual_domains/wendigo.dmm @@ -80,7 +80,9 @@ /turf/template_noop, /area/virtual_domain/safehouse) "Z" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +/obj/modular_map_root/safehouse{ + key = "lavaland_boss" + }, /turf/template_noop, /area/virtual_domain/safehouse) diff --git a/_maps/virtual_domains/xeno_nest.dmm b/_maps/virtual_domains/xeno_nest.dmm index 01d57cc06ef..5d2952a5b1a 100644 --- a/_maps/virtual_domains/xeno_nest.dmm +++ b/_maps/virtual_domains/xeno_nest.dmm @@ -22,6 +22,11 @@ /obj/effect/decal/cleanable/blood, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) +"h" = ( +/obj/structure/alien/weeds, +/obj/effect/landmark/bitrunning/mob_segment, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/space/has_grav/powered/virtual_domain) "i" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, @@ -91,15 +96,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) -"v" = ( -/obj/effect/landmark/bitrunning/safehouse_spawn, +"w" = ( +/obj/modular_map_root/safehouse{ + key = "shuttle" + }, /turf/template_noop, /area/virtual_domain/safehouse) -"w" = ( -/obj/structure/alien/weeds/node, -/obj/effect/landmark/bitrunning/mob_segment, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/space/has_grav/powered/virtual_domain) "x" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, @@ -107,7 +109,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) "y" = ( -/obj/structure/alien/weeds, +/obj/structure/alien/weeds/node, /obj/effect/landmark/bitrunning/mob_segment, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/space/has_grav/powered/virtual_domain) @@ -474,7 +476,7 @@ a E z e -y +h m K J @@ -684,7 +686,7 @@ e e e e -y +h e z E @@ -823,7 +825,7 @@ E z I e -w +y e W z @@ -1127,7 +1129,7 @@ E E G t -y +h e z z @@ -1324,7 +1326,7 @@ n n n n -v +w A E "} @@ -1380,7 +1382,7 @@ z z T e -y +h V W z @@ -1871,7 +1873,7 @@ E z I e -y +h e e e diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm index 20dcef3e929..0eb26b9c588 100644 --- a/code/modules/bitrunning/objects/landmarks.dm +++ b/code/modules/bitrunning/objects/landmarks.dm @@ -22,11 +22,6 @@ name = "Bitrunning crate spawn" icon_state = "crate" -/// Where the safehouse will spawn -/obj/effect/landmark/bitrunning/safehouse_spawn - name = "Bitrunning safehouse spawn" - icon_state = "safehouse" - ///Swaps the locations of an encrypted crate in the area with another randomly selected crate. ///Randomizes names, so you have to inspect crates manually. /obj/effect/landmark/bitrunning/crate_replacer @@ -70,3 +65,9 @@ /obj/effect/landmark/bitrunning/mob_segment name = "Bitrunning modular mob segment" icon_state = "mob_segment" + +/// Bitrunning safehouses. Typically 7x6 rooms with a single entrance. +/obj/modular_map_root/safehouse + config_file = "strings/modular_maps/safehouse.toml" + icon = 'icons/effects/bitrunning.dmi' + icon_state = "safehouse" diff --git a/code/modules/bitrunning/server/map_handling.dm b/code/modules/bitrunning/server/map_handling.dm index 325a9e15809..5018e464d6a 100644 --- a/code/modules/bitrunning/server/map_handling.dm +++ b/code/modules/bitrunning/server/map_handling.dm @@ -45,7 +45,7 @@ playsound(src, 'sound/machines/terminal_processing.ogg', 30, 2) /// If any one of these fail, it reverts the entire process - if(!load_domain(map_key) || !load_safehouse() || !load_map_items() || !load_mob_segments()) + if(!load_domain(map_key) || !load_map_items() || !load_mob_segments()) balloon_alert_to_viewers("initialization failed.") scrub_vdom() is_ready = TRUE @@ -115,21 +115,6 @@ return TRUE -/// Loads the safehouse -/obj/machinery/quantum_server/proc/load_safehouse() - var/obj/effect/landmark/bitrunning/safehouse_spawn/landmark = locate() in GLOB.landmarks_list - if(isnull(landmark)) - CRASH("vdom: failed to find safehouse spawn landmark") - - var/turf/spawn_loc = get_turf(landmark) - qdel(landmark) - - var/datum/map_template/safehouse/new_safehouse = new generated_domain.safehouse_path() - if(!new_safehouse.load(spawn_loc)) - CRASH("vdom: failed to load safehouse") - - return TRUE - /// Stops the current virtual domain and disconnects all users /obj/machinery/quantum_server/proc/reset(fast = FALSE) is_ready = FALSE diff --git a/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm index 83d65a7fb46..acf9131a482 100644 --- a/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm +++ b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm @@ -7,4 +7,3 @@ key = "ash_drake" map_name = "ash_drake" reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/lavaland_boss diff --git a/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm index f632b0681bf..ae00fc56cf7 100644 --- a/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm +++ b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm @@ -6,7 +6,6 @@ Maybe a few drinks of liquid charm will get the spirits up. As the saying goes, if you can't beat 'em, join 'em." key = "beach_bar" map_name = "beach_bar" - safehouse_path = /datum/map_template/safehouse/mine /datum/lazy_template/virtual_domain/beach_bar/setup_domain(list/created_atoms) . = ..() 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 ad5d22f5175..ff665b66a1e 100644 --- a/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm +++ b/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm @@ -7,4 +7,3 @@ key = "blood_drunk_miner" map_name = "blood_drunk_miner" reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/lavaland_boss diff --git a/code/modules/bitrunning/virtual_domain/domains/breeze_bay.dm b/code/modules/bitrunning/virtual_domain/domains/breeze_bay.dm index 5035a323d7c..118e2fa3f86 100644 --- a/code/modules/bitrunning/virtual_domain/domains/breeze_bay.dm +++ b/code/modules/bitrunning/virtual_domain/domains/breeze_bay.dm @@ -5,7 +5,6 @@ key = "breeze_bay" map_name = "breeze_bay" reward_points = BITRUNNER_REWARD_LOW - safehouse_path = /datum/map_template/safehouse/wood /datum/lazy_template/virtual_domain/breeze_bay/setup_domain(list/created_atoms) . = ..() diff --git a/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm index 4ac4a6476bd..f7f58273d89 100644 --- a/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm +++ b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm @@ -8,4 +8,3 @@ key = "bubblegum" map_name = "bubblegum" reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse/lavaland_boss diff --git a/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm b/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm index 92f000c9cf3..f1bf4468608 100644 --- a/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm +++ b/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm @@ -10,4 +10,3 @@ key = "clown_planet" map_name = "clown_planet" reward_points = BITRUNNER_REWARD_LOW - safehouse_path = /datum/map_template/safehouse/mine diff --git a/code/modules/bitrunning/virtual_domain/domains/colossus.dm b/code/modules/bitrunning/virtual_domain/domains/colossus.dm index 9baa011263b..e36243b2859 100644 --- a/code/modules/bitrunning/virtual_domain/domains/colossus.dm +++ b/code/modules/bitrunning/virtual_domain/domains/colossus.dm @@ -7,5 +7,3 @@ key = "colossus" map_name = "colossus" reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse/lavaland_boss - diff --git a/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm index 1f385542361..42fbb0c1427 100644 --- a/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm +++ b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm @@ -6,7 +6,6 @@ I bet there's a way to move it myself." key = "gondola_asteroid" map_name = "gondola_asteroid" - safehouse_path = /datum/map_template/safehouse/shuttle_space /// Very pushy gondolas, great for moving loot crates. /obj/structure/closet/crate/secure/bitrunning/encrypted/gondola diff --git a/code/modules/bitrunning/virtual_domain/domains/hierophant.dm b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm index 5b67c9d9bf2..e2220c4197c 100644 --- a/code/modules/bitrunning/virtual_domain/domains/hierophant.dm +++ b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm @@ -7,4 +7,3 @@ key = "hierophant" map_name = "hierophant" reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse/lavaland_boss diff --git a/code/modules/bitrunning/virtual_domain/domains/pipedream.dm b/code/modules/bitrunning/virtual_domain/domains/pipedream.dm index 8b0fdbbd780..3eb23b94386 100644 --- a/code/modules/bitrunning/virtual_domain/domains/pipedream.dm +++ b/code/modules/bitrunning/virtual_domain/domains/pipedream.dm @@ -15,7 +15,6 @@ /datum/modular_mob_segment/hivebots_strong ) reward_points = BITRUNNER_REWARD_LOW - safehouse_path = /datum/map_template/safehouse/shuttle // ID Trims /datum/id_trim/factory diff --git a/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm b/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm index 2ca32bce983..25df69e2893 100644 --- a/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm +++ b/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm @@ -4,9 +4,8 @@ desc = "Sneak into an abandoned corner of the virtual world, where they store all of the crates. \ Warning -- Virtual domain does not support visual display. This mission must be completed using echolocation." difficulty = BITRUNNER_DIFFICULTY_MEDIUM + forced_outfit = /datum/outfit/echolocator help_text = "Getting used to echolocation may be difficult. Remember to walk slowly, and carefully inspect every crate you come across." key = "psyker_shuffle" map_name = "psyker_shuffle" - reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/bathroom - forced_outfit = /datum/outfit/echolocator + reward_points = BITRUNNER_REWARD_HIGH diff --git a/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm b/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm index 6d545f7c652..9cb299055dd 100644 --- a/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm +++ b/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm @@ -4,11 +4,10 @@ desc = "Another neglected corner of the virtual world. This one had to be abandoned due to zombie virus. \ Warning -- Virtual domain does not support visual display. This mission must be completed using echolocation." difficulty = BITRUNNER_DIFFICULTY_MEDIUM + extra_loot = list(/obj/item/radio/headset/psyker = 1) //Looks cool, might make your local burdened chaplain happy. + forced_outfit = /datum/outfit/echolocator help_text = "This once-beloved virtual domain has been corrupted by a virus, rendering it unstable, full of holes, and full of ZOMBIES! \ There should be a Mystery Box nearby to help get you armed. Get armed, and finish what the cyber-police started!" key = "psyker_zombies" map_name = "psyker_zombies" reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse/bathroom - forced_outfit = /datum/outfit/echolocator - extra_loot = list(/obj/item/radio/headset/psyker = 1) //Looks cool, might make your local burdened chaplain happy. diff --git a/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm b/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm index 2d9bcca3645..1c79d8fd21d 100644 --- a/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm +++ b/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm @@ -5,13 +5,12 @@ help_text = "Ever heard of 'Snakes and Ladders'? It's like that, but with \ instead of ladders its stairs and instead of snakes its a steep drop down a \ cliff into rough rocks or liquid plasma." - extra_loot = list(/obj/item/clothing/suit/costume/snowman = 2) difficulty = BITRUNNER_DIFFICULTY_LOW + extra_loot = list(/obj/item/clothing/suit/costume/snowman = 2) forced_outfit = /datum/outfit/job/virtual_domain_iceclimber key = "stairs_and_cliffs" map_name = "stairs_and_cliffs" reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/ice /turf/open/cliff/snowrock/virtual_domain name = "icy cliff" diff --git a/code/modules/bitrunning/virtual_domain/domains/starfront_saloon.dm b/code/modules/bitrunning/virtual_domain/domains/starfront_saloon.dm new file mode 100644 index 00000000000..eae9dabc49e --- /dev/null +++ b/code/modules/bitrunning/virtual_domain/domains/starfront_saloon.dm @@ -0,0 +1,14 @@ +/datum/lazy_template/virtual_domain/starfront_saloon + name = "Starfront Saloon" + cost = BITRUNNER_COST_MEDIUM + desc = "Looks like you stepped onto the wrong street, partner. Hope you brought your gunslinging skills." + difficulty = BITRUNNER_DIFFICULTY_HIGH + help_text = "One of these rooms has the cache we're looking for. Find it and get out." + is_modular = TRUE + key = "starfront_saloon" + map_name = "starfront_saloon" + mob_modules = list( + /datum/modular_mob_segment/syndicate_team, + /datum/modular_mob_segment/syndicate_elite, + ) + reward_points = BITRUNNER_REWARD_HIGH diff --git a/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm index dd56684abc6..24fa6e5482a 100644 --- a/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm +++ b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm @@ -12,4 +12,3 @@ map_name = "syndicate_assault" mob_modules = list(/datum/modular_mob_segment/syndicate_team) reward_points = BITRUNNER_REWARD_MEDIUM - safehouse_path = /datum/map_template/safehouse/shuttle diff --git a/code/modules/bitrunning/virtual_domain/domains/test_only.dm b/code/modules/bitrunning/virtual_domain/domains/test_only.dm index 6e5e852fb5c..185ed4335e6 100644 --- a/code/modules/bitrunning/virtual_domain/domains/test_only.dm +++ b/code/modules/bitrunning/virtual_domain/domains/test_only.dm @@ -4,7 +4,6 @@ key = "test_only" map_name = "test_only" test_only = TRUE - safehouse_path = /datum/map_template/safehouse/test_only /datum/lazy_template/virtual_domain/test_only/expensive key = "test_only_expensive" diff --git a/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm b/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm index 0b1bfedbdb9..b704441edaa 100644 --- a/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm +++ b/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm @@ -3,8 +3,7 @@ cost = BITRUNNER_COST_EXTREME desc = "Suspended in the silent void of space, the Neon Relic is a haunting echo of a retro-futuristic era. Hang out, enjoy the view." difficulty = BITRUNNER_DIFFICULTY_NONE - extra_loot = list(/obj/item/stack/spacecash/c500 = 3) + extra_loot = list(/obj/item/stack/spacecash/c500 = 4) key = "vaporwave" map_name = "vaporwave" reward_points = BITRUNNER_REWARD_EXTREME - safehouse_path = /datum/map_template/safehouse/shuttle_space diff --git a/code/modules/bitrunning/virtual_domain/domains/wendigo.dm b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm index fa0d15b92e9..c2ea1a2b57f 100644 --- a/code/modules/bitrunning/virtual_domain/domains/wendigo.dm +++ b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm @@ -7,5 +7,3 @@ key = "wendigo" map_name = "wendigo" reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse/lavaland_boss - diff --git a/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm b/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm index ccf5fac23ad..ed708d0592c 100644 --- a/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm +++ b/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm @@ -11,4 +11,3 @@ map_name = "xeno_nest" mob_modules = list(/datum/modular_mob_segment/xenos) reward_points = BITRUNNER_REWARD_LOW - safehouse_path = /datum/map_template/safehouse/shuttle diff --git a/code/modules/bitrunning/virtual_domain/safehouses.dm b/code/modules/bitrunning/virtual_domain/safehouses.dm deleted file mode 100644 index 79c8d5fe895..00000000000 --- a/code/modules/bitrunning/virtual_domain/safehouses.dm +++ /dev/null @@ -1,54 +0,0 @@ -/** - * # Safe Houses - * The starting point for virtual domains. - * Create your own: Read the readme file in the '_maps/safehouses' folder. - */ -/datum/map_template/safehouse - name = "virtual domain: safehouse" - - /// The map file to load - var/filename = "den" - -/datum/map_template/safehouse/New() - mappath = "_maps/safehouses/[filename].dmm" - ..(path = mappath) - -/datum/map_template/safehouse/test_only - filename = "test_only_safehouse.dmm" - -/// The default safehouse map template. -/datum/map_template/safehouse/den - filename = "den" - -/datum/map_template/safehouse/wood - filename = "wood" - -/datum/map_template/safehouse/dig - filename = "dig" - -/datum/map_template/safehouse/shuttle - filename = "shuttle" - -// Has space tiles on the four corners. -/datum/map_template/safehouse/shuttle_space - filename = "shuttle_space" - -/datum/map_template/safehouse/mine - filename = "mine" - -// Comes preloaded with mining combat gear. -/datum/map_template/safehouse/lavaland_boss - filename = "lavaland_boss" - -// Chill out -/datum/map_template/safehouse/ice - filename = "ice" - -/datum/map_template/safehouse/bathroom - filename = "bathroom" - -/** - * Your safehouse here - * /datum/map_template/safehouse/your_type - * filename = "your_map" - */ diff --git a/code/modules/bitrunning/virtual_domain/virtual_domain.dm b/code/modules/bitrunning/virtual_domain/virtual_domain.dm index 6e7b98ccdb4..838834f45a7 100644 --- a/code/modules/bitrunning/virtual_domain/virtual_domain.dm +++ b/code/modules/bitrunning/virtual_domain/virtual_domain.dm @@ -9,8 +9,6 @@ /// Cost of this map to load var/cost = BITRUNNER_COST_NONE - /// The safehouse to load into the map - var/datum/map_template/safehouse/safehouse_path = /datum/map_template/safehouse/den /// Any outfit that you wish to force on avatars. Overrides preferences var/datum/outfit/forced_outfit /// The description of the map for the console UI diff --git a/code/modules/mapfluff/ruins/generic.dm b/code/modules/mapfluff/ruins/generic.dm index 8c05bb2a58e..eecc4d1e2bf 100644 --- a/code/modules/mapfluff/ruins/generic.dm +++ b/code/modules/mapfluff/ruins/generic.dm @@ -1,3 +1,4 @@ +/// Generic maps with several available biomes. /obj/modular_map_root/generic config_file = "strings/modular_maps/generic.toml" diff --git a/modular_skyrat/modules/bitrunning/code/safehouse_skyrat.dm b/modular_skyrat/modules/bitrunning/code/safehouse_skyrat.dm deleted file mode 100644 index da82a295d86..00000000000 --- a/modular_skyrat/modules/bitrunning/code/safehouse_skyrat.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/map_template/safehouse_skyrat - name = "virtual domain: safehouse (skyrat)" - - returns_created_atoms = TRUE - /// The map file to load - var/filename = "den.dmm" - -/datum/map_template/safehouse_skyrat/New() - mappath = "_maps/skyrat/safehouses/" + filename - ..(path = mappath) diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm index 7ad4e794ecf..9d20d537ed9 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm @@ -1,3 +1,4 @@ +/// Modular Map Loader doesnt like subfolders /datum/lazy_template/virtual_domain/ancient_milsim name = "Ancient Military Simulator" cost = BITRUNNER_COST_HIGH @@ -8,11 +9,6 @@ help_text = "The last part of this domain has a chance to be very PvP-centric. It's best if you don't come alone, and smuggle some ability and gear disks." forced_outfit = /datum/outfit/solfed_bitrun key = "ancient_milsim" - map_dir = "_maps/skyrat/virtual_domains" - map_name = "ancient_milsim" + map_name = "skyrat_ancientmilsim" mob_modules = list(/datum/modular_mob_segment/cin_mobs) reward_points = BITRUNNER_REWARD_HIGH - safehouse_path = /datum/map_template/safehouse_skyrat/ancient_milsim - -/datum/map_template/safehouse_skyrat/ancient_milsim - filename = "ancient_milsim.dmm" diff --git a/strings/modular_maps/safehouse.toml b/strings/modular_maps/safehouse.toml new file mode 100644 index 00000000000..98feaa323e3 --- /dev/null +++ b/strings/modular_maps/safehouse.toml @@ -0,0 +1,37 @@ +directory = "_maps/safehouses/" + +[rooms.bathroom] +modules = ["bathroom.dmm"] + +[rooms.den] +modules = ["den.dmm"] + +[rooms.dig] +modules = ["dig.dmm"] + +[rooms.ice] +modules = ["ice.dmm"] + +[rooms.lavaland_boss] +modules = ["lavaland_boss.dmm"] + +[rooms.mine] +modules = ["mine.dmm"] + +[rooms.shuttle] +modules = ["shuttle.dmm"] + +[rooms.shuttle_space] +modules = ["shuttle_space.dmm"] + +[rooms.test_only] +modules = ["test_only_safehouse.dmm"] + +[rooms.wood] +modules = ["wood.dmm"] + +# SKYRAT EDIT ADDITION START - custom domains / Disabled until solution found +[rooms.ancient_milsim] +modules = ["skyrat_ancientmilsim.dmm"] +# SKYRAT EDIT ADDITION END + diff --git a/tgstation.dme b/tgstation.dme index 1435ef13aef..db6471ec1ed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3482,7 +3482,6 @@ #include "code\modules\bitrunning\util\virtual_megafauna.dm" #include "code\modules\bitrunning\util\virtual_mob.dm" #include "code\modules\bitrunning\virtual_domain\modular_mob_segment.dm" -#include "code\modules\bitrunning\virtual_domain\safehouses.dm" #include "code\modules\bitrunning\virtual_domain\virtual_domain.dm" #include "code\modules\bitrunning\virtual_domain\domains\ash_drake.dm" #include "code\modules\bitrunning\virtual_domain\domains\beach_bar.dm" @@ -3498,6 +3497,7 @@ #include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm" #include "code\modules\bitrunning\virtual_domain\domains\psyker_zombies.dm" #include "code\modules\bitrunning\virtual_domain\domains\stairs_and_cliffs.dm" +#include "code\modules\bitrunning\virtual_domain\domains\starfront_saloon.dm" #include "code\modules\bitrunning\virtual_domain\domains\syndicate_assault.dm" #include "code\modules\bitrunning\virtual_domain\domains\test_only.dm" #include "code\modules\bitrunning\virtual_domain\domains\vaporwave.dm" @@ -6597,7 +6597,6 @@ #include "modular_skyrat\modules\better_vox\code\vox_clothing.dm" #include "modular_skyrat\modules\better_vox\code\vox_species.dm" #include "modular_skyrat\modules\better_vox\code\vox_sprite_accessories.dm" -#include "modular_skyrat\modules\bitrunning\code\safehouse_skyrat.dm" #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\choice_beacon.dm" #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\disk.dm" #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fluff.dm"