Syndicate Depot and Various Unrelated Map Fixes that Pooba Asked For

_maps/map_files/Blueshift/Blueshift.dmm

@@ -16129,6 +16129,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/station/security/courtroom)
+"dbk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/station/tcommsat/computer)
 "dbo" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -21530,6 +21537,8 @@
 	},
 /obj/machinery/light/floor/has_bulb,
 /obj/effect/landmark/start/signal_technician,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "egB" = (
@@ -30158,6 +30167,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "fOy" = (
@@ -34355,6 +34366,8 @@
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
 /obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "gFA" = (
@@ -36608,6 +36621,8 @@
 /area/station/maintenance/department/security/prison_upper)
 "hcO" = (
 /obj/machinery/camera/autoname/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "hcY" = (
@@ -61389,6 +61404,8 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "lTC" = (
@@ -66950,6 +66967,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/department/eva)
+"mYY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/tcommsat/computer)
 "mZc" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -68824,6 +68846,7 @@
 "nud" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "nuj" = (
@@ -69673,6 +69696,10 @@
 "nCt" = (
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
+"nCw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/circuit,
+/area/station/tcommsat/computer)
 "nCy" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
@@ -79216,6 +79243,9 @@
 /obj/machinery/computer/telecomms/traffic{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "pus" = (
@@ -83432,6 +83462,9 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva/upper)
 "qlU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/circuit,
 /area/station/tcommsat/computer)
 "qlY" = (
@@ -89826,6 +89859,8 @@
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "rvj" = (
@@ -95262,6 +95297,9 @@
 	dir = 8;
 	network = "tcommsat"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "szm" = (
@@ -107523,6 +107561,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/ai_monitored/command/storage/eva)
+"uPY" = (
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Server Room"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "tcomms-internal"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/tcommsat/computer)
 "uQb" = (
 /obj/structure/chair/sofa/bench/right{
 	dir = 4;
@@ -121501,6 +121552,8 @@
 "xxh" = (
 /obj/machinery/light/floor/has_bulb,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "xxl" = (
@@ -123285,6 +123338,7 @@
 	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "xQa" = (
@@ -149404,7 +149458,7 @@ kTo
 exp
 dNC
 ofE
-qlU
+nCw
 hcO
 qlU
 nds
@@ -150433,7 +150487,7 @@ exp
 ofE
 grm
 wim
-wim
+dbk
 tLu
 nds
 pFN
@@ -150692,13 +150746,13 @@ oqU
 xPO
 nud
 nud
-xuI
+uPY
 xxh
 gFt
-pFN
-pFN
+mYY
+mYY
 gFt
-pFN
+mYY
 egy
 tzO
 nds

_maps/map_files/MetaStation/MetaStation.dmm

@@ -67202,12 +67202,13 @@
 /turf/open/space,
 /area/space/nearstation)
 "xnd" = (
-/obj/machinery/smartfridge/organ,
 /obj/machinery/door/poddoor/preopen{
 	id = "surgeryc";
 	name = "Privacy Shutter"
 	},
-/turf/open/floor/iron/dark,
+/obj/effect/spawner/structure/window,
+/obj/machinery/smartfridge/organ,
+/turf/open/floor/plating,
 /area/station/medical/surgery/aft)
 "xnk" = (
 /obj/structure/disposalpipe/segment{

_maps/map_files/tramstation/tramstation.dmm

@@ -7944,7 +7944,6 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/disposalpipe/trunk,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},

code/datums/ruins/space.dm

@@ -466,3 +466,9 @@
 	suffix = "infested_frigate.dmm"
 	name = "SYN-C Brutus"
 	description = "This wasn't an outbreak, this was a repelled attack."
+
+/datum/map_template/ruin/space/syndicate_depot
+	id = "syndicate_depot"
+	suffix = "syndicate_depot.dmm"
+	name = "Syndicate Depot"
+	description = "A small depot ran by the Syndicate sitting out in space, responsible for logistics across the vast reaches of space."

code/modules/mob_spawn/ghost_roles/space_roles.dm

@@ -175,15 +175,15 @@
 
 /// Deep Storage Syndicate base
 
-/obj/effect/mob_spawn/ghost_role/human/deepstorage_syndicate/comms
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/deepstorage/comms
 	name = "Syndicate Comms Agent"
 	prompt_name = "a syndicate comms agent"
 	you_are_text = "You are a syndicate comms agent, employed in a remote research bunker."
 	flavour_text = "Unfortunately, your hated enemy, Nanotrasen, has a station in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!"
 	important_text = "DO NOT abandon the base. However, you may freely explore your surrounding within your current space quadrant (Z-Level)"
 	outfit = /datum/outfit/lavaland_syndicate/comms
 
-/obj/effect/mob_spawn/ghost_role/human/deepstorage_syndicate
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/deepstorage
 	name = "Syndicate Bioweapon Scientist"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper_s"
@@ -204,3 +204,6 @@
 	ears = /obj/item/radio/headset/syndicate/alt
 	shoes = /obj/item/clothing/shoes/combat
 	r_pocket = /obj/item/gun/ballistic/automatic/pistol
+
+/datum/outfit/deepstorage_syndicate/post_equip(mob/living/carbon/human/syndicate, visualsOnly = FALSE)
+	syndicate.faction |= ROLE_SYNDICATE

code/modules/recycling/disposal/outlet.dm

@@ -42,9 +42,13 @@
 		trunk = found_trunk
 
 /obj/structure/disposaloutlet/Destroy()
+	var/obj/structure/disposalpipe/trunk/found_trunk = locate() in loc
 	if(trunk)
 		trunk.linked = null
 		trunk = null
+	else if(found_trunk)
+		if(found_trunk.linked == src)
+			found_trunk.linked = null
 	QDEL_NULL(stored)
 	return ..()
 

monkestation/code/modules/syndicate_ghostroles/depot.dm

@@ -0,0 +1,105 @@
+// syndicate depot, meant to be a safe space for syndicate ghostroles to evacuate to if they're knocked out and to provide supplies and materials for their comrades.
+
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/depot_syndicate
+	name = "Syndicate Depot Worker"
+	prompt_name = "a syndicate depot worker"
+	you_are_text = "You are a depot worker, employed at a Syndicate depot."
+	flavour_text = "Produce and move supplies for Syndicate bases in the region, as well as ensure they are safely evacuated should they be lost. Do not let the base fall into enemy hands!"
+	important_text = "DO NOT abandon the base or approach active Nanotrasen installations. However, you may freely explore your surrounding within your current space quadrant (Z-Level), and may fly to other Syndicate bases in space to deliver and move supplies with the permission of the Quartermaster."
+	outfit = /datum/outfit/syndicate_empty/depot
+	spawner_job_path = /datum/job/lavaland_syndicate/space
+
+/datum/outfit/syndicate_empty/depot
+	name = "Syndicate Depot Technician"
+	suit = /obj/item/clothing/suit/hazardvest
+	back = /obj/item/storage/backpack
+	head = /obj/item/clothing/head/utility/hardhat
+	l_pocket = /obj/item/gun/ballistic/automatic/pistol
+	r_pocket = /obj/item/flashlight
+	box = /obj/item/storage/box/survival/syndie
+
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/depot_syndicate/guard
+	name = "Syndicate Depot Guard"
+	prompt_name = "a syndicate depot guard"
+	you_are_text = "You are a security guard, employed at a Syndicate depot."
+	flavour_text = "Protect the depot from enemy forces and prevent its destruction at all costs."
+	important_text = "DO NOT abandon the base. You are here to protect it, and cannot perform deliveries."
+	outfit = /datum/outfit/syndicate_empty/depot/guard
+
+/datum/outfit/syndicate_empty/depot/guard
+	name = "Syndicate Depot Guard"
+	suit = /obj/item/clothing/suit/armor/vest
+	back = /obj/item/storage/backpack/security
+	head = /obj/item/clothing/head/helmet/swat
+	mask = /obj/item/clothing/mask/gas
+	l_pocket = /obj/item/gun/ballistic/automatic/pistol
+	r_pocket = /obj/item/flashlight/seclite
+	suit_store = /obj/item/gun/ballistic/shotgun/riot/sol/evil //silly evil gun
+
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/depot_syndicate/quartermaster
+	name = "Syndicate Depot Quartermaster"
+	prompt_name = "a syndicate depot quartermaster"
+	you_are_text = "You are a Quartermaster, in charge of a Syndicate depot."
+	flavour_text = "Operate the depot to ensure it continues to safely ship supplies for the Coalition's outposts in nearby space. Protect it to the last, and do not let the base fall into enemy hands!"
+	important_text = "DO NOT abandon the base. You can, however, authorise depot workers to perform deliveries outside the local quadrant (Z-level) to other space outposts (but not go yourself), and may freely explore the local quadrant (Z-level) alongside them."
+	outfit = /datum/outfit/syndicate_empty/depot/quartermaster
+
+/datum/outfit/syndicate_empty/depot/quartermaster
+	name = "Syndicate Depot Quartermaster"
+	id_trim = /datum/id_trim/chameleon/operative/nuke_leader //extra access, including opening EVA storage
+	uniform = /obj/item/clothing/under/syndicate/sniper
+	ears = /obj/item/radio/headset/syndicate/alt/leader
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+	back = /obj/item/storage/backpack/satchel/leather
+	head = /obj/item/clothing/head/hats/hos/beret/syndicate
+	l_pocket = /obj/item/melee/energy/sword/saber
+	r_pocket = /obj/item/flashlight/lantern/syndicate
+	mask = /obj/item/clothing/mask/chameleon //under ANY OTHER CIRCUMSTANCE i'd make it a gps one, but this place is also the safe evacuation zone for any surviving space outpost operatives after a self-destruct event
+	l_hand = /obj/item/gun/ballistic/automatic/pistol/aps
+
+//ruin areas
+
+/area/ruin/space/has_grav/syndicate_depot
+	name = "Suspicious Asteroid" //i swear to god
+
+/area/ruin/space/has_grav/syndicate_depot/control_room
+	name = "Syndicate Depot Control Room"
+
+/area/ruin/space/has_grav/syndicate_depot/security
+	name = "Syndicate Depot Security Office"
+
+/area/ruin/space/has_grav/syndicate_depot/cargo_bay
+	name = "Syndicate Depot Cargo Bay"
+
+/area/ruin/space/has_grav/syndicate_depot/crew_quarters
+	name = "Syndicate Depot Crew Quarters"
+
+/area/ruin/space/has_grav/syndicate_depot/infirmary
+	name = "Syndicate Depot Infirmary"
+
+/area/ruin/space/has_grav/syndicate_depot/engineering
+	name = "Syndicate Depot Engineering"
+
+/area/ruin/space/has_grav/syndicate_depot/eva_storage
+	name = "Syndicate Depot EVA Storage"
+
+/area/ruin/space/has_grav/syndicate_depot/vault
+	name = "Syndicate Depot Vault"
+
+/area/ruin/space/has_grav/syndicate_depot/hallway
+	name = "Syndicate Depot Main Hallway"
+
+/area/ruin/space/has_grav/syndicate_depot/manufacturing
+	name = "Syndicate Depot Manufacturing"
+
+/area/ruin/space/has_grav/syndicate_depot/hydroponics
+	name = "Syndicate Depot Hydroponics"
+
+
+//misc things; fluff, stun-capable turrets
+
+/obj/machinery/porta_turret/syndicate/depot
+	name = "depot turret"
+	desc = "A ballistic machine-gun auto-turret. This one has had one of its barrels replaced with a taser."
+	stun_projectile = /obj/projectile/energy/electrode
+	stun_projectile_sound = 'sound/weapons/taser.ogg'

tgstation.dme

@@ -8222,6 +8222,7 @@
 #include "monkestation\code\modules\surgery\organs\internal\stomach.dm"
 #include "monkestation\code\modules\surgery\organs\internal\tongue.dm"
 #include "monkestation\code\modules\syndicate_ghostroles\_base.dm"
+#include "monkestation\code\modules\syndicate_ghostroles\depot.dm"
 #include "monkestation\code\modules\syndicate_ghostroles\listeningpost.dm"
 #include "monkestation\code\modules\temperature_overhaul\exposure.dm"
 #include "monkestation\code\modules\temperature_overhaul\homeostasis_level.dm"