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

Raleigh-Class Mercenary Corvette #3458

Merged
merged 37 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fb2f6de
Create independent_mercs.dmm
Erikafox Sep 23, 2024
23fa183
Update independent_mercs.dmm
Erikafox Sep 24, 2024
11df3a9
Update independent_mercs.dmm
Erikafox Sep 25, 2024
d5da2aa
slammin
Erikafox Sep 25, 2024
9fe23c6
wa
Erikafox Sep 26, 2024
d1c918b
Update independent_mercs.dmm
Erikafox Sep 26, 2024
d61b97c
Update independent_mercs.dmm
Erikafox Sep 27, 2024
bb77c88
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Sep 27, 2024
5789277
Update independent_mercs.dmm
Erikafox Sep 28, 2024
779ceb2
Update independent_mercs.dmm
Erikafox Sep 28, 2024
ed23b23
Update independent_mercs.dmm
Erikafox Sep 29, 2024
1fce9d1
finishes ship. adds config. adds jobs.
Erikafox Sep 29, 2024
8fe24e4
lintfix
Erikafox Sep 29, 2024
e4af354
Update independent_raleigh.dmm
Erikafox Sep 29, 2024
0b82908
Update independent_raleigh.json
Erikafox Sep 29, 2024
839e407
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Sep 29, 2024
f5d901f
title change
Erikafox Sep 29, 2024
c6b22fc
Update independent_raleigh.dmm
Erikafox Sep 29, 2024
39b4803
file + title change again
Erikafox Sep 29, 2024
c633529
some notices
Erikafox Sep 29, 2024
308a95f
Update independent.dm
Erikafox Sep 29, 2024
c96a83b
review changes
Erikafox Oct 1, 2024
ef3987e
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Oct 1, 2024
bfeb6a7
cabinet
Erikafox Oct 1, 2024
61879b8
funding
Erikafox Oct 1, 2024
4514a96
pistolcase + goggles for officers
Erikafox Oct 1, 2024
7eb6668
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Oct 1, 2024
b324856
map fixes + rpg cabinet
Erikafox Oct 1, 2024
76fca44
namelist change
Erikafox Oct 1, 2024
6341cb6
Update independent_raleigh.dmm
Erikafox Oct 5, 2024
ff97672
review stuff
Erikafox Oct 6, 2024
a75ecf5
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Oct 12, 2024
ec7d903
Update independent_raleigh.dmm
Erikafox Oct 12, 2024
0483d73
Merge remote-tracking branch 'upstream/master' into mercs
Erikafox Oct 23, 2024
7d6eee0
Update independent_raleigh.dmm
Erikafox Oct 23, 2024
23ec428
Update independent_raleigh.dmm
Erikafox Oct 23, 2024
db4e213
Update independent_raleigh.dmm
Erikafox Oct 23, 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
45 changes: 45 additions & 0 deletions _maps/configs/independent_raleigh.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Raleigh-class Corvette",
"faction": "/datum/faction/independent",
"prefix": "ISV",
"namelists": [
"SPACE",
"BEASTS",
"NATURAL_AGGRESSIVE"
],
"map_short_name": "Raleigh-class",
"description": "The Raleigh-class is a Kasagi-Fischer Partnership design created in the late 390s for a then growing 'exploratory' market. While it's original designation was 'Safari Ship' or in some cases, 'Yacht'. Recently manufactured ones are proudly labelled as corvettes, and sold off to PDFs looking to stay fiscally sound, mercenaries, and the odd Rich, Bored, Solarian buyer. In the frontier, you're most likely to see a Raleigh serving as the command vessel for a small group of mercenaries.",
"tags": [
"Combat",
"RP Focus"
],
"map_path": "_maps/shuttles/independent/independent_raleigh.dmm",
"limit": 1,
"starting_funds": 1500,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/merc",
"officer": true,
"slots": 1
},
"Lieutenant": {
"outfit": "/datum/outfit/job/independent/hos/merc",
"officer": true,
"slots": 1
},
"Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 1
},
"Mercenary": {
"outfit": "/datum/outfit/job/independent/security/merc",
"slots": 3
},
"Recruit": {
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 1
}
},
"enabled": true
}
Loading
Loading