Chinsky
c3f3aaaeed
Merge pull request #5473 from mwerezak/supply-console
...
Makes the cargo console force-launch command more obvious
2014-07-03 05:12:03 +04:00
Chinsky
a3cff314bd
Merge pull request #5466 from Hubblenaut/master
...
Fixes Sasha Mason-Kalinka's custom item
2014-07-03 05:10:49 +04:00
Chinsky
67c425fe2b
Merge pull request #5463 from mwerezak/emergency-shuttle
...
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
2014-07-03 05:10:35 +04:00
Chinsky
173d7f1828
Merge pull request #5458 from Zuhayr/mutiny
...
Mutiny tweaks.
2014-07-03 05:10:20 +04:00
unknown
3888a8b757
Makes the cargo console force launch command more obvious
2014-07-02 13:13:52 -04:00
Hubblenaut
d8f1b255a2
Fixes Sasha Mason-Kalinka's custom item
2014-07-02 10:16:15 +02:00
mwerezak
5a91dc8176
Fixes bad emergency shuttle can_force() check
2014-07-01 22:40:15 -04:00
mwerezak
e57419c725
Status displays now won't blank when undocking, too
2014-07-01 22:18:04 -04:00
mwerezak
2a4600c80c
Makes the escape shuttle NanoUI window bigger
2014-07-01 22:13:59 -04:00
mwerezak
8388ecb94a
Allows escape pods to be armed from inside the pod
2014-07-01 21:55:37 -04:00
mwerezak
1c7c48165b
Reduces docking timeout to 20 seconds
2014-07-01 21:55:13 -04:00
mwerezak
191b4763b6
Fixes status displays blanking out when escape shuttle is about to launch
2014-07-01 21:54:50 -04:00
Zuhayr
ff9682af79
Wtf how did this line even get deleted.
2014-07-02 07:28:51 +09:30
Zuhayr
8b65aa727b
Missed a linebreak.
2014-07-02 07:23:59 +09:30
Zuhayr
4f73f7a834
Cleans up some of the lore issues with Mutiny.
2014-07-02 07:22:33 +09:30
Zuhayr
65c0dc2e64
Changed Mutiny messages to use the existing Centcomm message format.
2014-07-02 07:14:35 +09:30
Zuhayr
9815eef21f
Oversight with table fix.
2014-07-02 07:00:40 +09:30
Zuhayr
b9c6b7b77d
Merge with master.
2014-07-02 06:59:11 +09:30
Chinsky
f93707ae1e
Merge pull request #5453 from mwerezak/embed-fix
...
Fixes #5446
2014-07-02 01:27:47 +04:00
Chinsky
88143fd960
Merge pull request #5439 from PsiOmegaDelta/AtmosAccess
...
Partially corrects #5438
2014-07-02 01:27:44 +04:00
Zuhayr
34f7ba30d5
Fixes guest terminals only allowing 29 minute passes.
2014-07-02 06:46:42 +09:30
Zuhayr
41488bf497
Compile fix.
2014-07-02 06:35:19 +09:30
PsiOmega
2e08b1ad4a
Fixes vents not properly resetting the pressure check correctly when the "default" value.
...
Copy-paste..
2014-07-01 23:04:08 +02:00
mwerezak
146d1f30d5
Readds check for sharp && !ismob(W.loc)
2014-07-01 16:47:56 -04:00
Zuhayr
04a6ea92db
Adds Eject ID verbs to record computers.
2014-07-02 06:17:54 +09:30
Zuhayr
aa4581e72f
Fixes #5434
2014-07-02 06:17:26 +09:30
mwerezak
6cfee05c8f
Fixes #5446
2014-07-01 16:39:57 -04:00
Zuhayr
a55b447100
Fixes #5450
2014-07-02 05:37:26 +09:30
Zuhayr
a6c9b1d81b
Fixes #5446
2014-07-02 05:35:56 +09:30
Zuhayr
b6806c0d22
Fixes #5443
2014-07-02 05:35:28 +09:30
Zuhayr
ff475635b7
Fixes #5448
2014-07-02 05:31:53 +09:30
PsiOmega
332cf214a2
Partially corrects #5438
...
Central atmospherics computer now expects atmos access, rather than CE access.
2014-07-01 20:48:31 +02:00
PsiOmega
b60b555ffa
Pipes, cameras, air alarms, emergency shutters, and new maintenance area added.
...
Adds a number of missing supply pipes around the station.
Adds cameras to the new Hydrophonics/Garden and Xenoflora areas.
Adds an air alarm to one of the Hydrophonics areas, just fore of the new Garden.
Adds emergency shutters to the exterior windows of the Xenoflora lab.
The maintenance section port of the engine recycled another maintenance area, causing APC 'duplication'. Created new area instance.
2014-07-01 08:24:54 +02:00
Zuhayr
7889ac25ab
Fixed embedding.
2014-07-01 10:12:58 +09:30
Mloc-Argent
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Zuhayr
1bc57b81a3
Merge pull request #5425 from Mloc/bs12-lightopt
...
shuttle + lighting fixes
2014-07-01 07:59:11 +09:30
Mloc-Argent
6fe27b57b1
lighting: fix + optimize colored lights
...
turfs now directly hold color lumcounts
overlay is averaged + rounded from that instead of strings
overall colored lumcount is now rounded properly
fixes having thousands of lighting subareas after a fire
fixes #5417
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-30 23:23:46 +01:00
Mloc-Argent
38c5b38017
helpers: fix move_contents_to() not moving air
...
fixes #5232
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-30 23:21:29 +01:00
Chinsky
5cfcb2d452
Merge pull request #5423 from Zuhayr/dev
...
Vox icon fixes.
2014-07-01 02:20:51 +04:00
Zuhayr
d30457b97c
Bandaid for overly fragile hardsuits.
2014-07-01 07:47:49 +09:30
Chinsky
8d81675509
Merge pull request #5420 from mwerezak/emergency-shuttle
...
Fixes #5418 - also a bunch of small shuttle fixes
2014-07-01 02:10:23 +04:00
mwerezak
c147eb9034
Improves the display of shuttle ETAs
2014-06-30 18:00:28 -04:00
Zuhayr
f1d83d3f94
Fixed some vox icons.
2014-07-01 07:29:30 +09:30
mwerezak
5a2e9ea298
Resets emergency shuttle authorization on arrival
2014-06-30 15:14:44 -04:00
mwerezak
9991b46ea6
long_jump() now uses an arrive_time var instead of sleeping the whole time.
...
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
2014-06-30 15:14:20 -04:00
mwerezak
952bba6a38
Fixes #5336
2014-06-30 14:43:45 -04:00
Chinsky
fccb71d3c6
Merge pull request #5416 from Zuhayr/dev
...
Dev-freeze fixes.
2014-06-30 21:29:58 +04:00
Zuhayr
dd43ba993a
Fixes #5415
2014-07-01 02:46:35 +09:30
Zuhayr
fcc679385c
Fixes #5387
2014-07-01 02:46:16 +09:30
Ccomp5950
51fe250745
Merge pull request #5411 from Zuhayr/dev
...
Fixes.
2014-06-30 10:47:13 -05:00
