Commit Graph

7854 Commits

Author SHA1 Message Date
Mark Aherne
9276e9f707 This change to nanomanager optimizes the sending of nanoui assets to clients.
The flist (file list) proc was being used multiple times for each client user logon, this now only occurs once when the server starts.
Hopefully this fixes the nanoui assets issue which occurs during peak usage.
2014-07-03 22:55:54 +01:00
Zuhayr
ae9bd07bd8 Merge pull request #5400 from comma/robust-squash
Robust squash
2014-07-01 01:11:43 +09:30
Zuhayr
e0d1bb1923 Merge pull request #5398 from comma/overmap
Overmap
2014-06-30 20:11:22 +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
Chinsky
145bfe9770 Implemented suggestions from PR 2014-06-29 19:24:19 +04:00
Chinsky
a6c7093818 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
Conflicts: lots
2014-06-29 19:16:36 +04:00
Zuhayr
86553920bf Merge pull request #5397 from Zuhayr/dev
Dev fixes.
2014-06-30 00:04:25 +09:30
Higgin
2556d3f227 Stunbatons now run on charge.
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
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
Chinsky
e7684dd6e9 Adds overmap system and examples of it's usage.
Unticked, as it disables space edge transition.
2014-06-29 06:48:21 +04:00
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
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
7189dc9d0d Tweaks nonverbal emote frequency 2014-06-28 12:20:20 -04:00
mwerezak
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
mwerezak
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
mwerezak
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
Jarcolr
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
Chinsky
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
Jarcolr
be74be4c95 Fixes the jackboots 2014-06-28 14:11:58 +03:00
Zuhayr
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
Jarcolr
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
PsiOmega
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
Chinsky
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
Zuhayr
274a7a844a Merge pull request #5372 from mwerezak/emergency-shuttle
More shuttle updates
2014-06-27 18:36:37 +09:30
mwerezak
363df869e2 Improves the fix for shuttles being stuck if...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
mwerezak
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
Chinsky
ae16c5e673 Merge pull request #5368 from Zuhayr/dev
Uncommented gateway spawn point.
2014-06-27 01:13:28 +04:00
mwerezak
84023ff1a3 Updates secrets panel to use the new shuttle...
...datum correctly.
2014-06-26 14:48:49 -04:00
mwerezak
93c13a06d5 Fixes base shuttle console requiring engine access 2014-06-26 14:48:29 -04:00
mwerezak
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
Zuhayr
2ee8f78f75 More icon changes, updates item paths, moves vox cortical stack spawn to raider proc, makes vox whitelisted and spawnable with internals. 2014-06-26 08:47:58 +09:30
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
Zuhayr
6e0b261653 Uncommented gateway spawn point. 2014-06-25 22:52:55 +09:30
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