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

Remaps the Dwayne. #3006

Merged
merged 59 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
8f42158
Dwayne, yay
Sadhorizon May 19, 2024
0da9f67
oops
Sadhorizon May 19, 2024
2930f12
tweaks
Sadhorizon May 20, 2024
894c3b7
lookie who forgot area
Sadhorizon May 20, 2024
b0caa00
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon May 21, 2024
b68014b
mothable
Sadhorizon May 22, 2024
1d19186
less titanium
Sadhorizon May 22, 2024
9020872
this
Sadhorizon May 22, 2024
f308016
tweaks
Sadhorizon May 22, 2024
6cb65b7
tweaks
Sadhorizon May 23, 2024
ff93fce
eh, this wasn't needed
Sadhorizon May 28, 2024
7551cf6
slot number changes and related tweaks
Sadhorizon May 28, 2024
b5a026e
tweaks
Sadhorizon Jun 1, 2024
2f0c176
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 2, 2024
1cc5604
Bathroom tweaks
Sadhorizon Jun 2, 2024
80b7cc2
I hate git
Sadhorizon Jun 2, 2024
cf042a3
Technically an officer.
Sadhorizon Jun 4, 2024
470fa11
like a bunch of changes idfk
Sadhorizon Jun 4, 2024
811734a
more small tweaks
Sadhorizon Jun 5, 2024
4c2b850
Happy?
Sadhorizon Jun 6, 2024
718e338
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 9, 2024
33bf728
kills u
Sadhorizon Jun 9, 2024
e0df5f0
QM access
Sadhorizon Jun 9, 2024
31a6378
more tweaks
Sadhorizon Jun 9, 2024
565e866
less shit
Sadhorizon Jun 9, 2024
429f6ba
swaps these two
Sadhorizon Jun 9, 2024
31420c4
washing machine
Sadhorizon Jun 10, 2024
81c59ad
bridge
Sadhorizon Jun 10, 2024
7aadf97
No.
Sadhorizon Jun 10, 2024
c7ee314
cables
Sadhorizon Jun 11, 2024
2ff9faf
kills u
Sadhorizon Jun 14, 2024
5979b47
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 15, 2024
a2df312
minor stuff
Sadhorizon Jun 18, 2024
0f4e013
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 20, 2024
2072078
combustion thrusters and other unrelated stuff
Sadhorizon Jun 20, 2024
ce2bca8
NT decals
Sadhorizon Jun 21, 2024
e389729
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 24, 2024
4fe7d0f
conflict
Sadhorizon Jun 24, 2024
15f24cf
un-merges engi and foreman
Sadhorizon Jun 25, 2024
3753285
better solution
Sadhorizon Jun 25, 2024
3057e7c
kills the KA
Sadhorizon Jun 25, 2024
281af3e
accidental enter
Sadhorizon Jun 25, 2024
300e0ba
like a bunch of changes again
Sadhorizon Jun 30, 2024
058d9cd
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jun 30, 2024
4807252
kills object cash
Sadhorizon Jul 1, 2024
a7fc639
minor
Sadhorizon Jul 3, 2024
ca7b146
atmos hotfix
Sadhorizon Jul 5, 2024
b3b5684
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jul 5, 2024
0a9cfc4
Honestly just. Just this.
Sadhorizon Jul 8, 2024
a7c7c24
missed the cryopod
Sadhorizon Jul 8, 2024
5b77d2b
minor stuff
Sadhorizon Jul 8, 2024
06946e4
minor stuff
Sadhorizon Jul 10, 2024
608edf7
seperates this
Sadhorizon Jul 11, 2024
a949c72
civilian
Sadhorizon Jul 12, 2024
ff585f4
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Jul 16, 2024
ba12e65
conflict
Sadhorizon Jul 16, 2024
37e873c
Merge remote-tracking branch 'upstream/master' into dwayne_rework
Sadhorizon Aug 3, 2024
03abf6c
sigh
Sadhorizon Aug 3, 2024
7bbdd1d
belt
Sadhorizon Aug 3, 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
22 changes: 10 additions & 12 deletions _maps/configs/independent_dwayne.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
"prefix": "ISV",
"prefix": "SV",
"namelists": [
"GENERAL",
"SPACE",
Expand All @@ -10,11 +10,12 @@
],
"map_short_name": "Mk.II Dwayne-class ",
"map_path": "_maps/shuttles/independent/independent_dwayne.dmm",
"description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains. Recently-available aftermarket modifications have solved the Dwayne’s longstanding shuttle dock issues, allowing modern Dwaynes to finally serve their original design purpose, provided the captain is able to source a shuttle.",
"description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains.",
"tags": [
"Mining",
"Generalist"
"Cargo"
],
"starting_funds": 4000,
"limit": 1,
"job_slots": {
"Captain": {
Expand All @@ -24,23 +25,20 @@
},
"Foreman": {
"outfit": "/datum/outfit/job/independent/quartermaster/western",
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"slots": 1
},
"Ship's Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"officer": true,
"slots": 1
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/independent/miner/hazard",
"slots": 2
},
"Mechanic": {
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 1
},
"Deckhand": {
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 3
"slots": 1
}
},
"enabled": true
Expand Down
Loading
Loading