[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. <details> <summary>pictures</summary> ![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) </details> 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 <[email protected]> Co-authored-by: Zergspower <[email protected]>
Fluffy-Frontier · Dec 6, 2023 · 2a74d89 · 2a74d89
1 parent a17d028
commit 2a74d89
Show file tree

Hide file tree

Showing 63 changed files with 4,527 additions and 2,924 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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