Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25478

_maps/map_files/KiloStation2/KiloStation2.dmm

@@ -63836,9 +63836,9 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/central/fore)
 "uwV" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
 /obj/item/assembly/flash/handheld,
 /obj/machinery/status_display/ai/directional/north,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)
 "uwX" = (

_maps/map_files/NSSJourney/NSSJourney.dmm

@@ -39437,8 +39437,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
 /obj/item/clothing/under/rank/centcom/intern,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "hZK" = (

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -46946,7 +46946,6 @@
 /turf/open/floor/wood,
 /area/station/maintenance/abandon_art_studio)
 "iYN" = (
-/obj/structure/closet/secure_closet/detective,
 /obj/item/clothing/under/rank/security/detective,
 /obj/item/clothing/suit/jacket/det_suit{
 	icon_state = "curator"
@@ -46957,6 +46956,7 @@
 /obj/machinery/camera/directional/east{
 	c_tag = "Detective's Study"
 	},
+/obj/structure/filingcabinet/security,
 /turf/open/floor/wood/parquet,
 /area/station/security/detectives_office)
 "iYT" = (
@@ -72121,7 +72121,7 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/entry)
 "nOw" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/silver/bureaucracy,
 /obj/item/clothing/accessory/medal/gold/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/gold/ordom,
@@ -79265,7 +79265,7 @@
 /area/station/maintenance/department/crew_quarters/dorms)
 "pfO" = (
 /obj/structure/rack,
-/obj/item/vending_refill/security_peacekeeper,
+/obj/item/vending_refill/security,
 /obj/item/storage/box/handcuffs,
 /obj/item/storage/box/flashbangs{
 	pixel_x = -2;

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -51429,7 +51429,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/security/checkpoint/supply)
 "ovo" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/gold/ordom,
 /obj/item/storage/briefcase/secure/white,
 /obj/item/clothing/gloves/combat/naval,

_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
 

_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

_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

_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

_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

_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

_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

_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

_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