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

Scarab-class Heavy Mining Ship #3380

Merged
merged 51 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
fee06c0
so it begins
Sadhorizon Sep 16, 2024
c7069d9
oopsie
Sadhorizon Sep 16, 2024
aae6277
cobra
Sadhorizon Sep 16, 2024
81d13a0
this one catwalk
Sadhorizon Sep 16, 2024
82e1fe3
dumb linters...
Sadhorizon Sep 16, 2024
eeb4f29
name + linters
Sadhorizon Sep 17, 2024
156a996
bathroom decals
Sadhorizon Sep 17, 2024
73c3d43
holopad
Sadhorizon Sep 17, 2024
7cd04a8
linters times three
Sadhorizon Sep 17, 2024
60ce9a1
swaps floors
Sadhorizon Sep 17, 2024
e5ae9b4
idk some stuff
Sadhorizon Sep 17, 2024
c35700f
floors
Sadhorizon Sep 18, 2024
30a9e41
scraps the western aesthetic
Sadhorizon Sep 19, 2024
df4079b
also this
Sadhorizon Sep 19, 2024
dc7a1fd
hallway
Sadhorizon Sep 19, 2024
1e4a3ec
nah
Sadhorizon Sep 19, 2024
286b911
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Sep 20, 2024
5c0e459
goggles
Sadhorizon Sep 20, 2024
ba8371a
desc
Sadhorizon Sep 20, 2024
9324083
monmey
Sadhorizon Sep 22, 2024
1a0f0b2
couple tweaks
Sadhorizon Sep 22, 2024
b9ce095
hellfire
Sadhorizon Sep 22, 2024
4e34dfa
more engi stuff
Sadhorizon Sep 22, 2024
567f72f
nah
Sadhorizon Sep 24, 2024
a1d9bf9
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Sep 25, 2024
6da5e3a
linters
Sadhorizon Sep 25, 2024
64e7051
ok
Sadhorizon Sep 25, 2024
c21aa13
IDs
Sadhorizon Sep 25, 2024
d08e5b5
nah
Sadhorizon Sep 26, 2024
26be9ff
removes wood siding
Sadhorizon Sep 28, 2024
e04227c
knives + less ammo
Sadhorizon Sep 29, 2024
e593ee0
de-carpets the bridge
Sadhorizon Sep 29, 2024
0459ba8
newscasters
Sadhorizon Oct 2, 2024
00930f3
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 2, 2024
96d6a94
more lights
Sadhorizon Oct 2, 2024
24efc53
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 4, 2024
adb4967
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 5, 2024
466d5a4
review and misc stuff
Sadhorizon Oct 5, 2024
d84f135
oops
Sadhorizon Oct 5, 2024
5b9cc33
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 14, 2024
d574699
updatepaths
Sadhorizon Oct 14, 2024
2979513
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 16, 2024
04a382a
reviews
Sadhorizon Oct 17, 2024
3107afa
grinders
Sadhorizon Oct 20, 2024
313c009
clavas
Sadhorizon Oct 21, 2024
18cefc7
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 23, 2024
5e2049d
OOPS
Sadhorizon Oct 23, 2024
59ecb5b
flares
Sadhorizon Oct 24, 2024
cf4b628
Merge remote-tracking branch 'upstream/master' into scarab-class
Sadhorizon Oct 25, 2024
f1d1e02
updatepaths
Sadhorizon Oct 25, 2024
9d7ea85
rest of the paths
Sadhorizon Oct 25, 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
47 changes: 47 additions & 0 deletions _maps/configs/independent_scarab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Scarab-class Heavy Mining Ship",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
"SPACE",
"NATURAL",
"NATURAL_AGGRESSIVE"
],
"map_short_name": "Scarab-class",
"map_path": "_maps/shuttles/independent/independent_scarab.dmm",
"description": "The Scarab-class is a recently-introduced heavy drilling ship built by Hardline Salvage and Mining. Inspired by Hardline's earlier work on the Talos-class refits, the Scarab comes with heavy drilling equipment and facilities for a number of technicians and hired guards instead of the hand-mining equipment typically found on smaller ships. Extra space for storage or potential remodeling lends the Scarab a degree of flexibility few of its peers can afford.",
"tags": [
"Mining",
"Engineering",
"Combat"
],
"starting_funds": 2500,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/independent/quartermaster",
"officer": true,
"slots": 1
},
"Technician": {
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 2
},
"Security Detail": {
"outfit": "/datum/outfit/job/independent/security/disarmed",
"slots": 2
},
"Deckhand": {
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 2
}
},
"enabled": true
}
Loading
Loading