-
-
Notifications
You must be signed in to change notification settings - Fork 491
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
Atlas-class Light Armored Crusier #3246
Open
meemofcourse
wants to merge
30
commits into
shiptest-ss13:master
Choose a base branch
from
meemofcourse:clipper-boat
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+5,840
−20
Open
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
f66413b
so cool
meemofcourse 692a3d6
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse 5f058eb
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse d8b8efd
Update minutemen_atlas.dmm
meemofcourse a4b14d6
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse 2e74449
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse 1108db8
i must eat goblins
meemofcourse dad71a2
kill goblins
meemofcourse 311e054
competent maptainer
meemofcourse 2df99d1
I want to kill the Prime Minister of the Zohil Explorat
meemofcourse ed4ecee
ougjjjjhhh
meemofcourse f40b696
checks
meemofcourse 73731c3
im sorry meem i need to control who plays it during the uptime at lea…
rye-rice c8d13e1
REVERT WHEN DONE: path changes for clip guns, canwebedit work miracles?
rye-rice affae15
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse 69b68cb
sarge db
meemofcourse 4afda85
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse f6db2ef
I FUCKING HATE CAKE
meemofcourse ad1d4ba
Merge branch 'shiptest-ss13:master' into clipper-boat
meemofcourse ce11472
Merge branch 'master' into clipper-boat
meemofcourse d8f49e2
brig
meemofcourse 989ddd3
Merge branch 'master' into clipper-boat
meemofcourse ac86bee
Update minutemen_atlas.dmm
meemofcourse deae346
Merge branch 'clipper-boat' of https://github.com/meemofcourse/Shipte…
meemofcourse 5753f0e
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse 9da7fea
jeorg review
meemofcourse 9e0df46
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse f9e8754
RYE STOP REPATHING THINGS
meemofcourse 63cb8aa
Merge remote-tracking branch 'upstream/master' into clipper-boat
meemofcourse def75e4
checks
meemofcourse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
{ | ||
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
"map_name": "Atlas-class Light Armored Crusier", | ||
"prefix": "CMSV", | ||
"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"], | ||
"description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.", | ||
"tags": [ | ||
"Combat", | ||
"Generalist" | ||
], | ||
"map_short_name": "Atlas-class", | ||
"starting_funds": 1000, | ||
"map_path": "_maps/shuttles/minutemen/minutemen_atlas.dmm", | ||
"limit": 1, | ||
"job_slots": { | ||
"Captain": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/captain", | ||
"officer": true, | ||
"slots": 1 | ||
}, | ||
"First Officer": { | ||
"outfit": "/datum/outfit/job/clip/first_officer", | ||
"officer": true, | ||
"slots": 1 | ||
}, | ||
"Sergeant": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/grunt/lead", | ||
"officer": true, | ||
"slots": 1 | ||
}, | ||
"Corpsman": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/doctor", | ||
"slots": 1 | ||
}, | ||
"Engineer": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/engineer", | ||
"slots": 1 | ||
}, | ||
"Minuteman": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/grunt", | ||
"slots": 4 | ||
}, | ||
"Deckhand": { | ||
"outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve", | ||
"slots": 1 | ||
} | ||
}, | ||
"enabled": false | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add
"faction": "/datum/faction/clip",
somewhere, or it's gonna show as indie on the spawning menu.