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.

Sign up for GitHub

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

ERT Subshuttles #2449

Merged
merged 8 commits into from
Feb 11, 2024
Merged

ERT Subshuttles #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5fb233
ert shuttles
meemofcourse Nov 4, 2023
82ec93a
oops
meemofcourse Nov 4, 2023
6b77391
Merge branch 'master' into ert-shuttles
meemofcourse Dec 13, 2023
e2add2c
Merge remote-tracking branch 'upstream/master' into ert-shuttles
meemofcourse Jan 26, 2024
b70a027
ough
meemofcourse Jan 26, 2024
bd3665a
Update syndicate_runner.dmm
meemofcourse Jan 26, 2024
61da09d
Merge branch 'master' into ert-shuttles
meemofcourse Feb 4, 2024
96bc291
oxy
meemofcourse Feb 10, 2024
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
21 changes: 20 additions & 1 deletion _maps/shuttles/subshuttles/Subshuttle Catalog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"

Name = "blackpill"
Size = "1x3"
Purpose = "Supposedly an manned torpedo. What is this. Subtest?"
Purpose = "Supposedly a manned torpedo. What is this. Subtest?"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"

Name = "Superpill"
Expand All @@ -43,4 +43,23 @@ Size = "13x7"
Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers."
File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm"

Name = "Crux Dropship"
Size = "12x7"
Purpose = "A very common general-purpose transport Minutemen vessel."
File Path = "_maps\shuttles\subshuttles\minutemen_crux.dmm"

Name = "Ancon Intern Ship"
Size = "15x11"
Purpose = "A CentCom internship ship, which is essentially a small office with thrusters."
File Path = "_maps\shuttles\subshuttles\nanotrasen_ancon.dmm"

Name = "Anvil Dropship"
Size = "15x11"
Purpose = "A general-purpose, Inteq-made dropship."
File Path = "_maps\shuttles\subshuttles\inteq_anvil.dmm"

Name = "Runner Ambulance"
Size = "15x11"
Purpose = "An ambulance procured by Cybersun for use with smaller Trauma Teams."
File Path = "_maps\shuttles\subshuttles\syndicate_runner.dmm"

Loading
Loading