mwerezak
e80f42cad4
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-25 13:28:18 -04:00
mwerezak
ea1060ac33
Fixes shuttle consoles not checking access
...
Generalizes machine access.
2014-06-25 13:20:12 -04:00
mwerezak
d5c5d4b21f
Adds escape pod docking controller type
...
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.
Also fixes emergency shuttle arrival announcement having the wrong ETD.
2014-06-25 12:32:12 -04:00
Chinsky
335880062d
Merge pull request #5357 from Zuhayr/dev
...
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:05:32 +04:00
Chinsky
cc9cf46dbe
Merge pull request #5359 from Baystation12/master
...
master -> dev
2014-06-25 15:37:04 +04:00
Zuhayr
30bf9302d6
Update cat.dm
2014-06-25 19:57:15 +09:30
Zuhayr
808ca3aea4
Merge pull request #5355 from comma/holder
...
Moved scooping into a separate helper.
2014-06-25 19:55:24 +09:30
Zuhayr
9638349fe2
Update distribution.dm
2014-06-25 16:48:20 +09:30
Zuhayr
89a450c4f4
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:25:15 +09:30
Zuhayr
3ab7e510d5
Removed reference to :b in drone spawn text.
2014-06-25 14:34:28 +09:30
mwerezak
fccc16f8b8
Fix for long_jumps never leaving transition area
...
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
2014-06-25 00:21:27 -04:00
mwerezak
05ced4b89d
Fixes missing announcements, bad returned() check
...
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.
2014-06-25 00:18:56 -04:00
mwerezak
abcba2c725
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
2014-06-24 17:49:20 -04:00
Zuhayr
5c002d3701
Changed cryo message a bit.
2014-06-24 21:18:47 +09:30
Zuhayr
4e673d047e
Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-24 19:22:18 +09:30
Chinsky
481f3caec5
Moved scooping into a separate helper.
2014-06-24 13:46:15 +04:00
Chinsky
4da1a5302e
Merge pull request #5354 from Zuhayr/cattes
...
Made cats pickupable.
2014-06-24 13:12:01 +04:00
Chinsky
8c67326576
Merge pull request #5331 from UristMcKerman/pipeturbine
...
Pipe Turbine
2014-06-24 13:08:11 +04:00
Zuhayr
b67bb6470d
Made cats pick-up-able.
2014-06-24 14:41:08 +09:30
Zuhayr
24730cfd9f
Drones now have plasma cutters instead of emags.
2014-06-24 14:11:08 +09:30
Zuhayr
2262661549
Ravensdale thinks the gateway has lore problems, commenting it out of spawn.
2014-06-24 14:03:11 +09:30
Zuhayr
abc07e435c
Minor formatting fix.
2014-06-24 13:41:59 +09:30
mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
mwerezak
d892099ea3
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
ebacf05acf
Fixes escape shuttle not transitioning
2014-06-23 23:50:49 -04:00
Zuhayr
b63708577b
Merge pull request #5345 from comma/monkey_revenge
...
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 11:41:33 +09:30
Zuhayr
4cc0d6b6ee
Fixes #5339
2014-06-24 11:35:08 +09:30
mwerezak
e17b8bffab
Replaces the emergency shuttle control console
...
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c
Adds shuttle controller
...
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
Zuhayr
e27cdb3620
Fixes #5323
2014-06-24 11:24:19 +09:30
Zuhayr
ef277f1e6b
Added extra bit of info to drone spawn.
2014-06-24 11:24:11 +09:30
Zuhayr
14bf0f064c
Removed ability for drones to talk on Binary.
2014-06-24 11:23:59 +09:30
Chinsky
6393cb15d8
Merge pull request #5332 from mwerezak/wound-infections
...
Gives the suit coolers a proper process() proc
2014-06-24 05:32:47 +04:00
Chinsky
4cd4217488
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/organs/organ_external.dm
2014-06-24 04:22:28 +04:00
Chinsky
3ff6c41846
Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
...
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
2014-06-24 04:19:09 +04:00
Chinsky
ece48ae0c4
Moved same code into single organ helper to handle embedding.
2014-06-24 04:09:35 +04:00
Chinsky
b2b9907605
Lowers caused damage to make it destroy organs rarer.
2014-06-24 03:56:34 +04:00
Chinsky
e3930fa79e
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 03:42:23 +04:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Mloc
db248dbd84
Merge pull request #5335 from Loganbacca/trainfix
...
Cargo train update
2014-06-23 14:03:11 +01:00
Mloc
8ca382f362
Merge pull request #5338 from Loganbacca/devfix
...
Fixes incorrect cable coil colours
2014-06-23 14:02:46 +01:00
Zuhayr
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
Loganbacca
d1a729f5db
Fixes incorrect cable coil colours
2014-06-23 21:44:51 +12:00
Loganbacca
3aa3c4166c
Cargo train update
...
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine
2014-06-23 19:53:58 +12:00
mwerezak
e225661c2c
Fixes #5193
2014-06-23 02:53:09 -04:00
mwerezak
67d5d56a12
Gives the suit coolers a proper process() proc
2014-06-23 02:31:36 -04:00
mwerezak
81f0f868b4
Minor shuttle fixes and cleanup
...
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 01:55:43 -04:00
mwerezak
71351bd285
Some fixes
2014-06-22 20:40:08 -04:00
mwerezak
caece105dc
Adds escape pods to the controller
2014-06-22 18:19:07 -04:00
