Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Syndicate Operative Base & ship #11078

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 68 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
580aff4
it begins
spockye Jun 9, 2024
0f4d14b
Drop Pod frontend
Tsar-Salat Jun 9, 2024
816a913
trying out different hangars
spockye Jun 10, 2024
05cc6f5
Update CentCom.dmm
spockye Jun 10, 2024
d951573
Update CentCom.dmm
spockye Jun 10, 2024
13064bd
finishes hangar
spockye Jun 10, 2024
870c2ad
finishes up both parts
spockye Jun 11, 2024
8bb6d4e
hangar without ship
spockye Jun 11, 2024
a0413ac
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 12, 2024
74194b4
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 14, 2024
13c5c4a
Update CentCom.dmm
spockye Jun 15, 2024
8a7cd29
adds a missing light
spockye Jun 15, 2024
b0d39f1
replaces all water with the AIR having version of water
spockye Jun 15, 2024
08299e9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 17, 2024
9c7fcfd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 17, 2024
3902bb1
responds to reviews
spockye Jun 17, 2024
97f0d94
updates more poster names
spockye Jun 17, 2024
4b37ccd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 24, 2024
4febabe
misc fixes
spockye Jun 25, 2024
3bf9493
moves the base to the right location
spockye Jun 25, 2024
57025a7
test open/close
Tsar-Salat Jun 27, 2024
a7e98f3
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 29, 2024
0e5a9b4
is this a good idea? i dont know. am i going to do it anyways? yes
spockye Jun 29, 2024
99df843
Revert "is this a good idea? i dont know. am i going to do it anyw…
spockye Jun 30, 2024
9f6cdbd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jun 30, 2024
894d5b8
death to elevators!!!
spockye Jul 1, 2024
7ef70f6
Update CentCom.dmm
spockye Jul 1, 2024
b6eb4b8
firelocks. decalchanges
spockye Jul 1, 2024
8a34e41
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jul 2, 2024
3783b36
small decal changes / four spawners instead of six
spockye Jul 2, 2024
69674d5
adds escape shuttle dock
spockye Jul 2, 2024
0b250ce
adds the new catwalk tiles to the advanced infiltrator
spockye Jul 2, 2024
27a23c9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jul 3, 2024
33545b6
stray decal
spockye Jul 3, 2024
f19a7aa
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jul 5, 2024
02780f5
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jul 9, 2024
fa5c7ab
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jul 21, 2024
3ffdf94
fixes some lattices in walls
spockye Jul 22, 2024
a17bc14
removes unused elevator junk
spockye Jul 22, 2024
a0d1aec
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat Aug 30, 2024
b026ce7
techfloor replacement
Tsar-Salat Aug 30, 2024
775af5e
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Sep 12, 2024
e5ff0de
seeing red
spockye Sep 12, 2024
05dcd20
misc fixes
spockye Sep 12, 2024
ca2d8c1
more small fixes
spockye Sep 12, 2024
960b072
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat Sep 25, 2024
494e95b
manual edits to remove bad var
Tsar-Salat Sep 25, 2024
ba10d4b
oops
Tsar-Salat Sep 25, 2024
e48d19a
droppod map & snowflake removal
Tsar-Salat Sep 25, 2024
aac234a
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Oct 3, 2024
e882c32
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Oct 3, 2024
85db415
gives in to peer preassure
spockye Oct 3, 2024
8bed001
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Oct 16, 2024
50ef486
misc updates / pixel errors
spockye Oct 16, 2024
12adffd
wth. snow??
spockye Oct 16, 2024
3e33ebc
snows it up part two
spockye Oct 16, 2024
66f7e93
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat Nov 8, 2024
1ffd70c
fix
Tsar-Salat Nov 8, 2024
dcdea58
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Nov 21, 2024
0e3d3a7
updates
spockye Nov 21, 2024
6578e6f
Update CentCom.dmm
spockye Nov 21, 2024
f76948a
Update CentCom.dmm
spockye Nov 21, 2024
af1a618
Update CentCom.dmm
spockye Nov 21, 2024
99d00eb
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Nov 22, 2024
f8fe5f4
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Dec 9, 2024
700c691
fixes conflict
spockye Dec 9, 2024
e0af74c
Update CentCom.dmm
spockye Dec 9, 2024
fd83fd9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye Jan 6, 2025
138d57a
lets see if this fixes it... edition 1
spockye Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46,726 changes: 22,472 additions & 24,254 deletions _maps/map_files/generic/CentCom.dmm

Large diffs are not rendered by default.

756 changes: 331 additions & 425 deletions _maps/shuttles/infiltrator/infiltrator_advanced.dmm

Large diffs are not rendered by default.

176 changes: 162 additions & 14 deletions code/__DEFINES/cargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#define STYLE_INVISIBLE 12
#define STYLE_GONDOLA 13
#define STYLE_SEETHROUGH 14
#define STYLE_DROPPOD 15

#define MAX_EMAG_ROCKETS 8
#define BEACON_COST 500
Expand Down Expand Up @@ -49,19 +50,166 @@
GLOBAL_LIST_EMPTY(supplypod_loading_bays)

GLOBAL_LIST_INIT(podstyles, list(\
list(POD_SHAPE_NORML, "pod", TRUE, "default", "yellow", RUBBLE_NORMAL, "supply pod", "A Nanotrasen supply drop pod."),\
list(POD_SHAPE_NORML, "advpod", TRUE, "bluespace", "blue", RUBBLE_NORMAL, "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\
list(POD_SHAPE_NORML, "advpod", TRUE, "centcom", "blue", RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\
list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\
list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\
list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\
list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\
list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\
list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\
list(POD_SHAPE_OTHER, "gondola", FALSE, FALSE, FALSE, RUBBLE_NONE, "gondola", "The silent walker. This one seems to be part of a delivery agency."),\
list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\
//Supply Pod
list(
POD_SHAPE_NORML,
"pod",
TRUE,
"default",
"yellow",
RUBBLE_NORMAL,
"supply pod",
"A Nanotrasen supply drop pod."
),\
//BS Supplypod
list(
POD_SHAPE_NORML,
"advpod",
TRUE,
"bluespace",
"blue",
RUBBLE_NORMAL,
"bluespace supply pod" ,
"A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."
),\
//CentCom Supplypod
list(
POD_SHAPE_NORML,
"advpod",
TRUE,
"centcom",
"blue",
RUBBLE_NORMAL,
"\improper CentCom supply pod",
"A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."
),\
list(
POD_SHAPE_NORML,
"darkpod",
TRUE,
"syndicate",
"red",
RUBBLE_NORMAL,
"blood-red supply pod",
"An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."
),\
list(
POD_SHAPE_NORML,
"darkpod",
TRUE,
"deathsquad",
"blue",
RUBBLE_NORMAL,
"\improper Deathsquad drop pod",
"A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."
),\
list(
POD_SHAPE_NORML,
"pod",
TRUE,
"cultist",
"red",
RUBBLE_NORMAL,
"bloody supply pod",
"A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."
),\
list(
POD_SHAPE_OTHER,
"missile",
FALSE,
FALSE,
FALSE,
RUBBLE_THIN,
"cruise missile",
"A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."
),\
list(
POD_SHAPE_OTHER,
"smissile",
FALSE,
FALSE,
FALSE,
RUBBLE_THIN,
"\improper Syndicate cruise missile",
"A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."
),\
list(
POD_SHAPE_OTHER,
"box",
TRUE,
FALSE,
FALSE,
RUBBLE_WIDE,
"\improper Aussec supply crate",
"An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."
),\
//STYLE_HONK 10
list(
POD_SHAPE_NORML,
"clownpod",
TRUE,
"clown",
"green",
RUBBLE_NORMAL,
"\improper HONK pod",
"A brightly-colored supply pod. It likely originated from the Clown Federation."
),\
//STYLE_FRUIT 11
list(
POD_SHAPE_OTHER,
"orange",
TRUE,
FALSE,
FALSE,
RUBBLE_NONE,
"\improper Orange",
"An angry orange."
),\
//STYLE_INVISIBLE 12
list(
POD_SHAPE_OTHER,
FALSE,
FALSE,
FALSE,
FALSE,
RUBBLE_NONE,
"\improper S.T.E.A.L.T.H. pod MKVII",
"A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"
),\
//STYLE_GONDOLA 13
list(
POD_SHAPE_OTHER,
"gondola",
FALSE,
FALSE,
FALSE,
RUBBLE_NONE,
"gondola",
"The silent walker. This one seems to be part of a delivery agency."
),\
//STYLE_SEETHROUGH 14
list(
POD_SHAPE_OTHER,
FALSE,
FALSE,
FALSE,
FALSE,
RUBBLE_NONE,
FALSE,
FALSE,
"rl_click",
"give_po"
),\
//STYLE_DROPPOD 15
list(
POD_SHAPE_NORML,
"syndicate_droppod",
TRUE,
//"syndicate", //TODO: Door
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to replace this string with the name of the syndicate dropped door, after you add it to the supply pod.dmj

"red", //TODO: Thruster Glow
RUBBLE_NORMAL,
"HELLE drop pod",
"An intimidating drop pod, covered in thick armored plating. It's probably best to stand back from this."
),\
))

11 changes: 11 additions & 0 deletions code/game/objects/effects/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -673,4 +673,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/poster)
desc = "A poster begging you to max your suit sensors. Otherwise, you may be harder to locate if you sustain damage."
icon_state = "poster50"

/obj/structure/sign/poster/contraband/syndicate
name = "Syndicate Emblem"
desc = "Almost anyone could recognize this as the logo of the Syndicate."
icon_state = "poster51"

/obj/structure/sign/poster/contraband/m90
// have fun seeing this poster in "spawn 'c20r'", admins...
name = "M-90"
desc = "A poster advertising the Scarborough Arms M-90"
icon_state = "poster53"

#undef PLACE_SPEED
11 changes: 10 additions & 1 deletion code/modules/cargo/supplypod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

/obj/structure/closet/supplypod/extractionpod
name = "Syndicate Extraction Pod"
desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas. <b>Targets must be manually stuffed inside the pod for proper delivery.</b>"
desc = "A specialised, blood-red styled pod for extracting high-value targets out of active mission areas. <b>Targets must be manually stuffed inside the pod for proper delivery.</b>"
specialised = TRUE
style = STYLE_SYNDICATE
bluespace = TRUE
Expand All @@ -100,6 +100,15 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
max_integrity = 20

/obj/structure/closet/supplypod/droppod
name = "'HELLE' Infiltration Drop Pod" //TODO: Add some cool name with a serial number in front I guess
desc = "A HELLE-class Drop Pod intended for operative insertion behind enemy lines. <b>Nuclear Operative ADDENDUM: After deployment, the Pod cannot be retrieved. Be certain of your designated target before launch.</b>"
specialised = TRUE
style = STYLE_DROPPOD
bluespace = FALSE // We want the pod to persist after landing. Unusable, but proof a nukie dropped.
delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
reversing = FALSE //Under no circumstances should it reverse

CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/closet/supplypod)

/obj/structure/closet/supplypod/Initialize(mapload, customStyle = FALSE)
Expand Down
Binary file modified icons/obj/contraband.dmi
Binary file not shown.
Binary file modified icons/obj/supplypods.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgui/packages/tgui/interfaces/CentcomPodLauncher.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ const STYLES = [
{ title: 'Invisible' },
{ title: 'Gondola' },
{ title: 'Seethrough' },
{ title: 'Drop Pod' },
];

const BAYS = [{ title: '1' }, { title: '2' }, { title: '3' }, { title: '4' }, { title: 'ERT' }];
Expand Down
Loading