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
Ccomp5950
eb395f8d08
Merge pull request #5409 from comma/dev-freeze
...
Fixed #5374
2014-06-30 10:47:04 -05:00
Zuhayr
8c2c690ec7
Fixes #5296
2014-07-01 01:05:05 +09:30
Zuhayr
bd5bc07064
Fixes #5090
2014-07-01 01:04:58 +09:30
Zuhayr
ef5387fece
Fixes #5113
2014-07-01 01:04:50 +09:30
Zuhayr
9803b30be0
Fixes #5188
2014-07-01 01:04:40 +09:30
Zuhayr
574d07f8d9
Fixes #5410 and possibly #5399
2014-07-01 01:04:29 +09:30
Zuhayr
4367d37332
Somehow when I added spawnpoints I put them in the wrong place. Moved the file.
2014-07-01 01:04:19 +09:30
Zuhayr
1f93cff0a6
Fixed lathes eating multitools and wirecutters when open.
2014-07-01 01:04:06 +09:30
Zuhayr
b50d42d80c
Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.
2014-07-01 01:03:50 +09:30
Chinsky
b018e9e150
Fixed #5374
...
Also added cancellation buttons here and there.
Prevented an exploit, resulting in ability to issue same passes with different ID, even if it doesn't have those accesses.
2014-06-30 16:11:42 +04:00
PsiOmega
d7047091c5
Creates proper area instance of the engineering washroom.
2014-06-30 13:22:16 +02:00
PsiOmega
a3f13fd3bb
Creates proper area instance of Cyborg Station, AI zone.
2014-06-30 13:16:56 +02:00
PsiOmega
d6ee97a640
Xenoflora and Xenoflora storage are now proper area instances.
2014-06-30 13:08:33 +02:00
Zuhayr
09efaff38f
Merge pull request #5407 from PsiOmegaDelta/Impurity
...
Creates an instance of the Hydrophonics garden area.
2014-06-30 20:10:52 +09:30
PsiOmega
3d60faac79
Creates an instance of the Hydrophonics garden area.
...
Creates proper instance of the Hydrophonics garden area to avoid issues, mainly with power/APCs.
Adjusts areas to ensure that alarms in the Hydrophonics garden do not lower emergency shutters outside in the primary hallway.
2014-06-30 09:12:43 +02:00
Zuhayr
30385c2237
Fixes an access issue with the ID computer.
2014-06-30 08:48:51 +09:30
Chinsky
2d6e48c2e7
Merge pull request #5389 from mwerezak/sign-lang
...
Improves non-verbal furry languages, fixes vox shriek playing for deaf people and in space
2014-06-29 23:05:16 +04:00
Zuhayr
86553920bf
Merge pull request #5397 from Zuhayr/dev
...
Dev fixes.
2014-06-30 00:04:25 +09:30
Chinsky
b84f55863d
Merge pull request #5385 from Zuhayr/derelict
...
Listening post and Xenoflora remap.
2014-06-29 14:21:39 +04:00
Zuhayr
69d99cbced
Merge pull request #5378 from PsiOmegaDelta/AlarmsAndVents
...
Adds support to better handle air alarms in sensitive areas and vents with custom settings
2014-06-29 18:33:16 +09:30
Zuhayr
f6760895ca
Merge pull request #5386 from Jarcolr/dev
...
Fixes #5223
2014-06-29 18:27:59 +09:30
mwerezak
abc54987b4
Fixes escape shuttle requiring authorization after countdown has finished
2014-06-28 23:34:31 -04:00
mwerezak
b8fb66380b
Fixes escape shuttle not being callable from the communications console
2014-06-28 23:26:58 -04:00
Zuhayr
922e425a33
Fixed moving between tables freely.
2014-06-29 10:46:31 +09:30
Zuhayr
bd02a78f9c
Fixed dev bug with destructive analyzer and null matter lists.
2014-06-29 10:25:03 +09:30
Zuhayr
48f02db5a0
Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.
2014-06-29 10:00:35 +09:30
Zuhayr
3af608b629
Fixed a couple of oversights with cards.
2014-06-29 09:43:34 +09:30
Zuhayr
c7e9e1aa2a
Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
2014-06-29 09:40:37 +09:30
mwerezak
112bfbc6c3
Removes taj whisker emote
2014-06-28 19:52:00 -04:00
Zuhayr
cf1abf65d9
Added better checks to leap(), prevented leap spamming (hopefully).
2014-06-29 09:20:04 +09:30
mwerezak
4713c31546
Fixes shuttles getting stuck when cancelling launch
2014-06-28 19:40:39 -04:00
mwerezak
1cc840dccc
Adds the ability to force launch escape pods
...
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
mwerezak
c8bddfb219
Fixes shuttle announcing arrival in 7 minutes.
2014-06-28 18:47:42 -04:00
mwerezak
909e8a4e95
Fixes #4688
...
Or attempts to at least.
2014-06-28 17:42:27 -04:00
Mloc-Argent