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

Adds the Inkwell-class Supply Freighter #2385

Merged
merged 42 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
557732b
blocked out
Imaginos16 Aug 14, 2023
a477ea7
more adjustments
Imaginos16 Aug 15, 2023
9248fec
PROGRESS
Imaginos16 Aug 17, 2023
b11f651
a
Imaginos16 Aug 22, 2023
b6c31bc
Merge branch 'master' into inkwell
Imaginos16 Sep 22, 2023
6f410c7
e
Imaginos16 Sep 22, 2023
75867d5
hell is real
Imaginos16 Sep 23, 2023
cfbc6ae
I CAN SEE THE LIGHT
Imaginos16 Sep 24, 2023
f61cd71
ALMOST THERE AAAAAUGH
Imaginos16 Sep 25, 2023
34d8f93
Merge branch 'master' into inkwell
Imaginos16 Sep 25, 2023
ea1c548
insanity
Imaginos16 Sep 25, 2023
d300613
so close man
Imaginos16 Sep 25, 2023
634ecdb
now to wait for me to get those two stupid PRs merged
Imaginos16 Sep 25, 2023
8efaf96
swag messiah
Imaginos16 Sep 26, 2023
a42335a
augh
Imaginos16 Sep 26, 2023
b70fdc7
Merge branch 'master' into inkwell
Imaginos16 Sep 26, 2023
60fa3eb
Merge branch 'master' into inkwell
Imaginos16 Sep 28, 2023
04acb4f
is this it
Imaginos16 Sep 28, 2023
38d9db1
ughghgh
Imaginos16 Sep 29, 2023
3fab332
this is it
Imaginos16 Sep 29, 2023
eff1ff7
THIS IS IT
Imaginos16 Sep 29, 2023
1beb8b9
Merge branch 'master' into inkwell
Imaginos16 Sep 30, 2023
dea6af7
I hate hidden scrubbers
Imaginos16 Sep 30, 2023
8a3b2ed
e
Imaginos16 Oct 9, 2023
0ebc23c
nice
Imaginos16 Oct 11, 2023
5ad9c3c
hell yeah
Imaginos16 Oct 12, 2023
7e7d087
LETS GO TM TIME
Imaginos16 Oct 12, 2023
c6fbf34
a
Imaginos16 Oct 13, 2023
9dcd801
Merge branch 'master' into inkwell
Imaginos16 Oct 13, 2023
81e41f4
Merge branch 'master' into inkwell
spockye Oct 17, 2023
d0b02cf
Merge branch 'master' into inkwell
Imaginos16 Oct 28, 2023
082d80f
lmoa
Imaginos16 Oct 28, 2023
39fbe40
uh
Imaginos16 Oct 28, 2023
7d4129d
a
Imaginos16 Oct 29, 2023
2f3ea23
eeeee
Imaginos16 Oct 29, 2023
882cc7a
hell
Imaginos16 Oct 30, 2023
50a935e
I despise pathways, I will bautista bomb you je
Imaginos16 Nov 1, 2023
e3ec55d
HELL
Imaginos16 Nov 1, 2023
6c9bdd7
e
Imaginos16 Nov 9, 2023
db68b4d
help
Imaginos16 Nov 9, 2023
67d060d
HELL
Imaginos16 Nov 9, 2023
8a4304f
aaaaaaaaaaa
Imaginos16 Nov 9, 2023
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
49 changes: 49 additions & 0 deletions _maps/configs/solgov_inkwell.json
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": "Inkwell-class Supply Freighter",
"prefix": "SGSV",
"namelists": [
"SOLGOV",
"SPACE",
"BRITISH_NAVY",
"NATURAL"
],
"map_short_name": "Inkwell-class",
"map_path": "_maps/shuttles/shiptest/solgov_inkwell.dmm",
"description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Solarian parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.",
"tags": ["RP Focus", "Combat", "Cargo", "Mining"],
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/solgov/captain",
"officer": true,
"slots": 1
},
"Logistics Deck Officer": {
"outfit": "/datum/outfit/job/solgov/quartermaster",
"officer": true,
"slots": 1
},
"Sonnensöldner": {
"outfit": "/datum/outfit/job/solgov/sonnensoldner",
"slots": 3
},
"Ship Engineer": {
"outfit": "/datum/outfit/job/solgov/engineer",
"slots": 2
},
"Field Engineer": {
"outfit": "/datum/outfit/job/solgov/miner",
"slots": 3
},
"Bureaucrat": {
"outfit": "/datum/outfit/job/solgov/bureaucrat",
"slots": 2
},
"Scribe": {
"outfit": "/datum/outfit/job/solgov/assistant",
"slots" : 6
}
},
"enabled": true
}
Loading