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
5cfcb2d452
Merge pull request #5423 from Zuhayr/dev
...
Vox icon fixes.
2014-07-01 02:20:51 +04:00
d30457b97c
Bandaid for overly fragile hardsuits.
2014-07-01 07:47:49 +09:30
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
c147eb9034
Improves the display of shuttle ETAs
2014-06-30 18:00:28 -04:00
f1d83d3f94
Fixed some vox icons.
2014-07-01 07:29:30 +09:30
5a2e9ea298
Resets emergency shuttle authorization on arrival
2014-06-30 15:14:44 -04:00
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
952bba6a38
Fixes #5336
2014-06-30 14:43:45 -04:00
dd43ba993a
Fixes #5415
2014-07-01 02:46:35 +09:30
fcc679385c
Fixes #5387
2014-07-01 02:46:16 +09:30
8c2c690ec7
Fixes #5296
2014-07-01 01:05:05 +09:30
bd5bc07064
Fixes #5090
2014-07-01 01:04:58 +09:30
ef5387fece
Fixes #5113
2014-07-01 01:04:50 +09:30
574d07f8d9
Fixes #5410 and possibly #5399
2014-07-01 01:04:29 +09:30
4367d37332
Somehow when I added spawnpoints I put them in the wrong place. Moved the file.
2014-07-01 01:04:19 +09:30
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
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
86553920bf
Merge pull request #5397 from Zuhayr/dev
...
Dev fixes.
2014-06-30 00:04:25 +09:30
f6760895ca
Merge pull request #5386 from Jarcolr/dev
...
Fixes #5223
2014-06-29 18:27:59 +09:30
abc54987b4
Fixes escape shuttle requiring authorization after countdown has finished
2014-06-28 23:34:31 -04:00
bd02a78f9c
Fixed dev bug with destructive analyzer and null matter lists.
2014-06-29 10:25:03 +09:30
48f02db5a0
Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.
2014-06-29 10:00:35 +09:30
3af608b629
Fixed a couple of oversights with cards.
2014-06-29 09:43:34 +09:30
112bfbc6c3
Removes taj whisker emote
2014-06-28 19:52:00 -04:00
cf1abf65d9
Added better checks to leap(), prevented leap spamming (hopefully).
2014-06-29 09:20:04 +09:30
4713c31546
Fixes shuttles getting stuck when cancelling launch
2014-06-28 19:40:39 -04:00
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
7189dc9d0d
Tweaks nonverbal emote frequency
2014-06-28 12:20:20 -04:00
03648c220e
Adds workaround for PHP whitelist
...
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
2014-06-28 12:19:57 -04:00
ac0bf7b853
Improves the implementation of non-verbal languages
...
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
2014-06-28 12:19:34 -04:00
b25f5d8aa6
In space, no one can hear you shriek
...
Or chimper for that matter. Also fixes deaf people hearing vox shriek.
2014-06-28 10:35:20 -04:00
2ed5cb2b1f
Fixes #5223
...
This fixes #5223 and the collectable chef hat. who used "chef" instead
of "chefhat".
2014-06-28 17:19:55 +03:00
42a3a27329
Merge pull request #5384 from Jarcolr/custom_item
...
Updates a custom item sprite and adds 2 approved custom items
2014-06-28 17:00:56 +04:00
be74be4c95
Fixes the jackboots
2014-06-28 14:11:58 +03:00
44d6bc199a
Merge pull request #5379 from PsiOmegaDelta/AIStun
...
AI now handles the sunned status like other creatures do in their life.dm file
2014-06-28 19:43:27 +09:30
5de1f11e8d
Updates a item sprite and adds 2 approved items
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
2014-06-28 11:33:49 +03:00
344c6bd622
Merge pull request #5377 from Ccomp5950/teacup-spawn-fix
...
Teacup icon clipping fix.
2014-06-28 05:08:16 +09:30
972bbac033
AI now handles EMP-stun like other creatures do in their life.dm file
...
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
2014-06-27 21:24:01 +02:00
6bd0743aa3
Merge pull request #5367 from Zuhayr/voxwhitelist
...
Adds Vox as a station race, adds vox clothing icons from /vg/.
2014-06-27 19:36:31 +04:00
274a7a844a
Merge pull request #5372 from mwerezak/emergency-shuttle
...
More shuttle updates
2014-06-27 18:36:37 +09:30
1ba345ca8c
Teacup icon clipping fix.
...
Might need to be done to coffee as well.
Thanks Serveris6 for the report: http://prntscr.com/3wyah5
2014-06-27 02:29:45 -05:00
363df869e2
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
deb1e1007c
Fixes ERT shuttle not announcing a cancelled...
...
...launch if the launch is cancelled after the countdown is completed.
2014-06-26 17:21:45 -04:00
ae16c5e673
Merge pull request #5368 from Zuhayr/dev
...
Uncommented gateway spawn point.
2014-06-27 01:13:28 +04:00
84023ff1a3
Updates secrets panel to use the new shuttle...
...
...datum correctly.
2014-06-26 14:48:49 -04:00
93c13a06d5
Fixes base shuttle console requiring engine access
2014-06-26 14:48:29 -04:00
363ef79301
Fixes shuttles getting stuck if the docking...
...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 13:58:56 -04:00
0a79a21e24
Fixed an oversight with RAD_ABSORB and collapsing.
2014-06-26 21:07:25 +09:30
12fad74047
As far as I can tell, viral infections were happening irrespec
...
tive of medical crew being present. Lowered chance for proc as well.
2014-06-26 20:59:30 +09:30
Mloc-Argent