Skip to content

Commit

Permalink
I Go And Fuck Up Yet Another Listening Post, Anderson Edition (#2371)
Browse files Browse the repository at this point in the history
* gegeggege

* he

* heh

* Update listeningstation.dmm

* forgor

* share your bathroom with the tiders

* h

* ha

* who designed this shit

* faga

* oorah sir yes sir oorah

* yuyh

* oops

* herh

* aahter

* hahaha

* work you bastard

* herthas

* this exists?

* haha

* Update listeningstation.dmm

* autolathe edition

* gla postal service

* if you build it

* hahaha

* yh

* gah

* h

* heh

* heh

* h

* oops

* h

* I assure you, this commit is only dedicated to improving the code's readability

* more flavour

* that dunna work

* trolololololololol

* mmmmmmmmmmbeepbeeepbeeepbepbepepepbepbpe

* Admin PM from-Kondafairydragon: not that... but HOW THE FUCK DID A LAVALAND SYNDICATE END UP IN SPACE. rather

* k

* what if we take this, and push it somewhere else?

* ahah

* yep

* no need for seperate policy methinks

* hhhhhhhhhh

* ghu

* nlyat

* gghhr

* fun? nyet

* Update backpack.dm

* Update backpack.dm

* Update space_roles.dm

* Update space_roles.dm

* pet device

* rollerbed replacement

* agh

* Update space_roles.dm

* Update mob_corpses.dm

* grah

* agh

* posters and pixelshifts

* agh

* agh

* gah

* ai priveleges REVOKED!!!

* agh

* ga

* Update listeningstation.dmm

* Update listeningstation.dmm

* agh

* ah

* agh

* agh

* Update listeningstation.dmm

* agh

* should(?) undo

* ITS A FUCKIN BOX INNIT

* Update listeningstation.dm

* AAAGH
  • Loading branch information
Addust authored Sep 13, 2024
1 parent 4587399 commit 0a7f357
Show file tree
Hide file tree
Showing 12 changed files with 2,975 additions and 1,263 deletions.
4,058 changes: 2,829 additions & 1,229 deletions _maps/RandomRuins/SpaceRuins/listeningstation.dmm

Large diffs are not rendered by default.

20 changes: 17 additions & 3 deletions _maps/shuttles/ruin_syndicate_dropship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/obj/structure/fans/tiny,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/ruin/caravan/syndicate3)
"bt" = (
Expand Down Expand Up @@ -127,6 +128,7 @@
"kc" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"kk" = (
Expand Down Expand Up @@ -169,6 +171,7 @@
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"ox" = (
Expand All @@ -188,6 +191,7 @@
req_access = list("syndicate");
specialfunctions = 4
},
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"rQ" = (
Expand Down Expand Up @@ -232,6 +236,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/obj/structure/fans/tiny,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/ruin/caravan/syndicate3)
"zP" = (
Expand Down Expand Up @@ -349,6 +354,7 @@
req_access = list("syndicate");
specialfunctions = 4
},
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"KN" = (
Expand All @@ -368,6 +374,7 @@
/area/shuttle/ruin/caravan/syndicate3)
"Mc" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"Nn" = (
Expand Down Expand Up @@ -410,6 +417,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"RT" = (
Expand Down Expand Up @@ -478,6 +486,12 @@
/area/shuttle/ruin/caravan/syndicate3)
"Vp" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"Zh" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"ZF" = (
Expand Down Expand Up @@ -538,7 +552,7 @@ uI
uI
Vh
Ib
iN
Zh
kc
Nn
uI
Expand All @@ -547,7 +561,7 @@ uI
uI
kR
mq
iN
Zh
rQ
JK
uI
Expand All @@ -565,7 +579,7 @@ UI
bh
oW
nA
iN
Zh
Vp
JT
wS
Expand Down
7 changes: 2 additions & 5 deletions code/game/area/areas/ruins/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -546,10 +546,7 @@
name = "\improper Abandoned Ship"


//SYNDICATE LISTENING POST STATION

/area/ruin/space/has_grav/listeningstation
name = "\improper Listening Post"
//some sorta ancient shuttle idk

/area/ruin/space/has_grav/powered/ancient_shuttle
name = "\improper Ancient Shuttle"
Expand All @@ -560,7 +557,7 @@

/area/ruin/space/has_grav/hellfactoryoffice
name = "\improper Hell Factory Office"
area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | NOTELEPORT
area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | NOTELEPORT //who decided blobs should be allowed, i don't know, but it's funny

//Ruin of Spinward Smoothies

Expand Down
11 changes: 7 additions & 4 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,14 @@

..()

/obj/item/storage/backpack/satchel/flat/listening_post_secret_stash
desc = "God, the stench from this thing is potent."

/obj/item/storage/backpack/satchel/flat/listening_post_secret_stash/PopulateContents()
new /obj/item/clothing/head/helmet/space/eva(src)
new /obj/item/clothing/suit/space/eva(src)
new /obj/item/tank/internals/oxygen/empty(src)
new /obj/item/tank/internals/oxygen/empty(src)
new /obj/item/seeds/cannabis(src)
new /obj/item/food/grown/cannabis(src)
new /obj/item/storage/box/donkpockets/donkpockethonk(src)
new /obj/item/choice_beacon/pet(src)

..()

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/spawner/lavaland_syndicate.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/datum/job/lavaland_syndicate
title = ROLE_LAVALAND_SYNDICATE
policy_index = ROLE_LAVALAND_SYNDICATE

12 changes: 6 additions & 6 deletions code/modules/mapfluff/ruins/spaceruin_code/caravanambush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
req_access = list(ACCESS_SYNDICATE)
circuit = /obj/item/circuitboard/computer/caravan/syndicate1
shuttleId = "caravansyndicate1"
possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush;caravansyndicate1_listeningpost"
possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush;syndicate_listening_post" //monkestation edit: new listening post

/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1
name = "Syndicate Fighter Navigation Computer"
Expand All @@ -116,7 +116,7 @@
shuttleId = "caravansyndicate1"
lock_override = NONE
shuttlePortId = "caravansyndicate1_custom"
jump_to_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
jump_to_ports = list("caravansyndicate1_ambush" = 1, "syndicate_listening_post" = 1) //monkestation edit: new listening post
view_range = 0
x_offset = 2
y_offset = 0
Expand All @@ -130,7 +130,7 @@
light_color = COLOR_SOFT_RED
circuit = /obj/item/circuitboard/computer/caravan/syndicate2
shuttleId = "caravansyndicate2"
possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush;caravansyndicate1_listeningpost"
possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush;syndicate_listening_post" //monkestation edit: new listening post

/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate2
name = "Syndicate Fighter Navigation Computer"
Expand All @@ -140,7 +140,7 @@
shuttleId = "caravansyndicate2"
lock_override = NONE
shuttlePortId = "caravansyndicate2_custom"
jump_to_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
jump_to_ports = list("caravansyndicate2_ambush" = 1, "syndicate_listening_post" = 1) //monkestation edit: new listening post
view_range = 0
x_offset = 0
y_offset = 2
Expand All @@ -154,7 +154,7 @@
light_color = COLOR_SOFT_RED
circuit = /obj/item/circuitboard/computer/caravan/syndicate3
shuttleId = "caravansyndicate3"
possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush;caravansyndicate3_listeningpost"
possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush;syndicate_listening_post" //monkestation edit: new listening post

/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3
name = "Syndicate Drop Ship Navigation Computer"
Expand All @@ -164,7 +164,7 @@
shuttleId = "caravansyndicate3"
lock_override = NONE
shuttlePortId = "caravansyndicate3_custom"
jump_to_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1)
jump_to_ports = list("caravansyndicate3_ambush" = 1, "syndicate_listening_post" = 1) //monkestation edit: new listening post
view_range = 2.5
x_offset = -1
y_offset = -3
27 changes: 24 additions & 3 deletions code/modules/mapfluff/ruins/spaceruin_code/listeningstation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,19 @@
<br>
<br> It's not like anyone but me reads these, why else should I talk about my base upkeep? Today: the "lobby".
"}
//monkestation edit: goliath
/obj/item/paper/fluff/ruins/listeningstation/reports/june/goliath
name = "hastily-written report"
default_raw_text = {"Heard some strange noises in the lobby, leaving this in case something happens.
<br> Some sorta loud banging behind one of the walls. I'm going to go take a look.
<br> Got my gun just in case, hopefully it isn't anything I need to use it for.
"}
//monkey business end

// "Anderson" starts writing here
/obj/item/paper/fluff/ruins/listeningstation/reports/july
name = "july report"
default_raw_text = {"Hey, old guy got a transfer, and I was next in line. I'll show them how we do it over at the Gorlex Marauders! Let's monitor some stuff. This will be fun.
default_raw_text = {"Hey, old guy went missing, and I was next in line. I'll show them how we do it over at the Gorlex Marauders! Let's monitor some stuff. This will be fun.
<br> It seems "old guy" did some upkeep around the base, and I will admit: it's nice. The lobby is shoddy for some reason. Not sure why that is.
<br> I read some of the older reports, and it seems like interesting stuff. No idea where June is. Ah well, maybe he got out in May?
<br> Odd sleeper, the frost covered it up. They were telling me about this on the way here, that it's meant to be a replacement to ensure "seamless" operation of this base. Okay?
Expand All @@ -60,7 +68,7 @@
/obj/item/paper/fluff/ruins/listeningstation/reports/september
name = "september report"
default_raw_text = {"i'm... not doing good. i'm doing so bad. the sleeper is still there. my friend died in a sleeper malfunction. it overheated.
<br> i don't want to unplug it, i don't want to wake them up. i don't go in the bedroom anymore, i have a small cot in the lobby area. i'm lonely.
<br> i don't want to unplug it, i don't want to wake them up. i don't go near the backup anymore. i'm lonely.
<br> blowing myself up is out of the question. it'll kill them too. i've killed many people in my life, but i think ending another that way
<br> will probably send me to hell. if hell is anything like this, i'd rather try and salvage as much as i can before i pass. death awaits us all.
<br>
Expand Down Expand Up @@ -115,4 +123,17 @@
<br>You may view intelligence reports from your predecessors in the filing cabinet in your office.
"}


// MONKESTATION EDIT: monkestation new listening post. im not making a seperate file for modularising some goddamn fluff on the other side of a file. this is why git exists
/obj/item/paper/fluff/ruins/listeningstation/engineer
name = "message from syndicate engineering"
default_raw_text = {"This outpost's pretty messy compared to other models, so here's the basic rundown of every room and whatnot:
<br>As is to be expected, you've probably already found your way around the lounge area: it's where you'll spend most of your day, given the frequent dark periods on Nanotrasen stations.
<br>You also have a self-destruct issued for emergencies - probably don't wanna touch that.
<br>There's also your office, equipped with everything needed to communicate with agents and decieve (or just annoy) Nanotrasen crew - given this is being faxed, you're probably here.
<br>Service areas should be behind the yellow airlock - that's the laundry, engineering area, and life support: the relay is also through here.
<br>Entrance's opposite - it's reconfigured by different post crews for different uses: some use it as a lobby, some use it for cargo handling, others just cut it up for parts and leave it in shoddy condition.
<br>Infirmary's below - it's got a proper sleeper modified to allow you to use it without external assistance, as well as some supplies.
<br>There's also a pile of garden equipment in the excavation near medical - have fun with that.
<br>
<br>Enjoy your assignment."}
// end monkey business
12 changes: 12 additions & 0 deletions code/modules/mob_spawn/corpses/mob_corpses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@
id = null
id_trim = null

//monkestation edit begin
/obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear/listeningpost
outfit = /datum/outfit/syndicatecommandocorpse/lessenedgear/listeningpost

/datum/outfit/syndicatecommandocorpse/lessenedgear/listeningpost
name = "Forgotten Comms Agent Corpse"
back = /obj/item/storage/backpack
uniform = /obj/item/clothing/under/syndicate/sniper //corpse drip
neck = /obj/item/clothing/neck/large_scarf/syndie
head = /obj/item/clothing/head/soft/black
//monke business ends

/obj/effect/mob_spawn/corpse/human/syndicatestormtrooper
name = "Syndicate Stormtrooper"
hairstyle = "Bald"
Expand Down
13 changes: 0 additions & 13 deletions code/modules/mob_spawn/ghost_roles/space_roles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,6 @@
shoes = /obj/item/clothing/shoes/laceup
l_pocket = /obj/item/stack/medical/bruise_pack

///asteroid comms agent

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space
you_are_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13."
flavour_text = "Monitor enemy activity as best you can, and try to keep a low profile. 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."

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/Initialize(mapload)
. = ..()
if(prob(85)) //only has a 15% chance of existing, otherwise it'll just be a NPC syndie.
new /mob/living/basic/trooper/syndicate/ranged(get_turf(src))
return INITIALIZE_HINT_QDEL

///battlecruiser stuff

/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser
Expand Down
25 changes: 25 additions & 0 deletions monkestation/code/area/areas/ruins.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//SYNDICATE LISTENING POST STATION

/area/ruin/space/has_grav/listeningstation
name = "\improper Listening Post"

/area/ruin/space/has_grav/listeningstation/dorms
name = "Listening Post Dormitories"

/area/ruin/space/has_grav/listeningstation/lobby
name = "Listening Post Lobby"

/area/ruin/space/has_grav/listeningstation/lounge
name = "Listening Post Lounge"

/area/ruin/space/has_grav/listeningstation/support
name = "Listening Post Support Facilities"

/area/ruin/space/has_grav/listeningstation/asteroid
name = "Suspicious Asteroid"

/area/ruin/space/has_grav/listeningstation/comms
name = "Listening Post Communications"

/area/ruin/space/has_grav/listeningstation/medical
name = "Listening Post Infirmary"
50 changes: 50 additions & 0 deletions monkestation/code/modules/syndicate_ghostroles/listeningpost.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

//role

///asteroid comms agent

//job datum

/datum/job/lavaland_syndicate/space //prevent admin confusion (getting bwoinked while squatting on a space ruin)
title = ROLE_SPACE_SYNDICATE

//spawner itself

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space
you_are_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13."
flavour_text = "Monitor enemy activity as best you can, and try to keep a low profile. 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 leave the base. You are not a field agent, and are not permitted to do their job for them."
spawner_job_path = /datum/job/lavaland_syndicate/space



/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson //the last agent according to lore, spawns rarely, has some flavour text, should start blinded
name = "sleeper"
desc = "A standard medicinal sleeper used to treat small and major injuries alike. It appears to be locked up, and you can see a gas mask through the fogged-up windows..."
icon_state = "sleeper"
you_are_text = "You are a Syndicate reconnaisance agent who went blind in an accident..."
flavour_text = "Your painkillers are running low, your memories are getting foggy, and all you can remember is the codename 'Anderson'. You were about to hurl yourself out into space, but you heard the intercom announce that the backup was getting unfrozen... maybe you'll see again?"
important_text = "DO NOT leave the base, you're inevitably doomed without it!"
outfit = /datum/outfit/lavaland_syndicate/comms/anderson

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/Initialize(mapload)
. = ..()
if(prob(85)) //only has a 15% chance of existing, otherwise it'll just be a regular (self-control) sleeper
return INITIALIZE_HINT_QDEL //the destroy() code already handles sleeper spawning

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/Destroy()
var/obj/machinery/sleeper/self_control/anderson = new(drop_location()) //one guy cmon
anderson.setDir(dir)
return ..()

/datum/outfit/lavaland_syndicate/comms/anderson
name = "'Anderson' Comms Agent"
r_hand = /obj/item/storage/pill_bottle //empty pillbottle
l_hand = /obj/item/knife/combat/survival //no esword, but still a knife
head = /obj/item/clothing/head/soft/black

/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/special(mob/living/new_spawn)
. = ..()
new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
new_spawn.adjustOrganLoss(ORGAN_SLOT_EYES, 100) //AAAARGH MY EYES
new_spawn.adjustOrganLoss(ORGAN_SLOT_LIVER, 35) //not completely out, but it's not having a good day
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5796,6 +5796,7 @@
#include "monkestation\code\__HELPERS\turfs.dm"
#include "monkestation\code\_onclick\hud\alert.dm"
#include "monkestation\code\area\areas\direction_names.dm"
#include "monkestation\code\area\areas\ruins.dm"
#include "monkestation\code\area\areas\station.dm"
#include "monkestation\code\controllers\subsystem\economy.dm"
#include "monkestation\code\controllers\subsystem\glowshroom.dm"
Expand Down Expand Up @@ -7874,6 +7875,7 @@
#include "monkestation\code\modules\surgery\organs\internal\lungs.dm"
#include "monkestation\code\modules\surgery\organs\internal\stomach.dm"
#include "monkestation\code\modules\surgery\organs\internal\tongue.dm"
#include "monkestation\code\modules\syndicate_ghostroles\listeningpost.dm"
#include "monkestation\code\modules\trading\box_rolling.dm"
#include "monkestation\code\modules\trading\lootbox_buying.dm"
#include "monkestation\code\modules\trading\lootbox_clothing.dm"
Expand Down

0 comments on commit 0a7f357

Please sign in to comment.