Skip to content

Commit

Permalink
Syndicate Depot and Various Unrelated Map Fixes that Pooba Asked For (M…
Browse files Browse the repository at this point in the history
…onkestation#4561)

* hahahaha

fixes Monkestation#4172, makes the whole ass depot

* fixes Monkestation#3446

THIS IS SUPPOSED TO BE FEATURE PR NOT BUGFIX PR BUT YOUR FUCKING FREEZE

* FUCK YOU FUCK YOU

* hammond you blithering idiot.mp3

* What the fuck (dont mapping conflict me or ill kill your family)

* Cock

* fixes pooba's shit

* huehuehuehue

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* c

* gahahahahah

* you lousy motherfucker. get your dork-ass down to the [LISTENING POST] and get that twenty tons of plasteel out of my sight

* for shame

* hh

* Update syndicate_depot.dmm

* Update deepstorage.dmm

* a

* an admin asked me to do the turrets from the last commit

* dumbass

* g

* Update listeningstation.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* hj

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm

* This is stupid

* Update syndicate_depot.dmm

* trolling

* Update syndicate_depot.dmm

* TACOS

* Update syndicate_depot.dmm

* hah

* Update syndicate_depot.dmm

* Update syndicate_depot.dmm
  • Loading branch information
Addust authored and Gw0sty committed Jan 9, 2025
1 parent 244ef8e commit 8141b99
Show file tree
Hide file tree
Showing 11 changed files with 7,942 additions and 397 deletions.
706 changes: 371 additions & 335 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm

Large diffs are not rendered by default.

188 changes: 137 additions & 51 deletions _maps/RandomRuins/SpaceRuins/listeningstation.dmm

Large diffs are not rendered by default.

7,250 changes: 7,250 additions & 0 deletions _maps/RandomRuins/SpaceRuins/syndicate_depot.dmm

Large diffs are not rendered by default.

66 changes: 60 additions & 6 deletions _maps/map_files/Blueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16133,6 +16133,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
Expand Down Expand Up @@ -21534,6 +21541,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" = (
Expand Down Expand Up @@ -30163,6 +30172,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" = (
Expand Down Expand Up @@ -34360,6 +34371,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" = (
Expand Down Expand Up @@ -36613,6 +36626,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" = (
Expand Down Expand Up @@ -61396,6 +61411,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" = (
Expand Down Expand Up @@ -66957,6 +66974,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,
Expand Down Expand Up @@ -68831,6 +68853,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" = (
Expand Down Expand Up @@ -69680,6 +69703,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
Expand Down Expand Up @@ -79223,6 +79250,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" = (
Expand Down Expand Up @@ -83439,6 +83469,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" = (
Expand Down Expand Up @@ -89833,6 +89866,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" = (
Expand Down Expand Up @@ -95269,6 +95304,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" = (
Expand Down Expand Up @@ -107530,6 +107568,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;
Expand Down Expand Up @@ -121508,6 +121559,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" = (
Expand Down Expand Up @@ -123292,6 +123345,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" = (
Expand Down Expand Up @@ -149411,7 +149465,7 @@ kTo
exp
dNC
ofE
qlU
nCw
hcO
qlU
nds
Expand Down Expand Up @@ -150440,7 +150494,7 @@ exp
ofE
grm
wim
wim
dbk
tLu
nds
pFN
Expand Down Expand Up @@ -150699,13 +150753,13 @@ oqU
xPO
nud
nud
xuI
uPY
xxh
gFt
pFN
pFN
mYY
mYY
gFt
pFN
mYY
egy
tzO
nds
Expand Down
5 changes: 3 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -67201,12 +67201,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{
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7944,7 +7944,6 @@
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/disposalpipe/trunk,
/obj/structure/disposalpipe/trunk{
dir = 4
},
Expand Down
6 changes: 6 additions & 0 deletions code/datums/ruins/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
7 changes: 5 additions & 2 deletions code/modules/mob_spawn/ghost_roles/space_roles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
4 changes: 4 additions & 0 deletions code/modules/recycling/disposal/outlet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

Expand Down
105 changes: 105 additions & 0 deletions monkestation/code/modules/syndicate_ghostroles/depot.dm
Original file line number Diff line number Diff line change
@@ -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'
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8254,6 +8254,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"
Expand Down

0 comments on commit 8141b99

Please sign in to comment.