Skip to content

Commit

Permalink
Refactors shuttles to be loaded in, rather than be on the station maps (
Browse files Browse the repository at this point in the history
tgstation#33766)

* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
  • Loading branch information
coiax authored and ninjanomnom committed Jan 25, 2018
1 parent 9a99ff4 commit 8e20aa3
Show file tree
Hide file tree
Showing 43 changed files with 12,189 additions and 7,182 deletions.
8 changes: 7 additions & 1 deletion _maps/boxstation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"map_name": "Box Station",
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm"
"map_file": "BoxStation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_meta",
"emergency": "emergency_box"
}
}
8 changes: 7 additions & 1 deletion _maps/deltastation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"map_name": "Delta Station",
"map_path": "map_files/Deltastation",
"map_file": "DeltaStation2.dmm"
"map_file": "DeltaStation2.dmm",
"shuttles": {
"emergency": "emergency_delta",
"ferry": "ferry_fancy",
"cargo": "cargo_delta",
"whiteship": "whiteship_delta"
}
}
Loading

0 comments on commit 8e20aa3

Please sign in to comment.