1e7dc9667e
Vox raider class distribution fix.
2013-07-04 23:22:55 -07:00
dc3485ab2d
Indenting issue.
2013-07-04 20:37:10 -07:00
0852a9f4b1
Partial fix for #3236
2013-07-04 20:34:37 -07:00
0140738157
Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12
2013-07-04 20:26:55 -07:00
681fcb2881
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-04 15:26:06 -07:00
db650d3757
Config merge.
2013-07-04 14:39:46 -07:00
0eb1b2d12c
Implemented updatehealth() for robots
...
Fixes a bug of them never dying.
2013-07-04 09:46:47 +02:00
b4695d3d74
Merge pull request #3232 from Ravensdale/master
...
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
34cd183d22
blrg... didn't update my ai code before commiting, should be fixt
2013-07-03 21:54:39 -07:00
9aedfa8b23
Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.
...
Feature: Introduces and adjusts code for cyborg and AI custom sprites
Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
2013-07-03 21:24:25 -07:00
d14c2a515c
Quickfix.
2013-07-03 06:16:59 +03:00
66265e2689
Recordskeeping update.
2013-07-03 05:55:18 +03:00
cf4bd39f6e
Updated the linkage between the NanoTrasen IRC bot and the server.
...
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-02 23:41:40 +01:00
2fda293873
Merge pull request #3223 from Zuhayr/feature
...
Combat cyborg module shields and mobility.
2013-07-01 09:07:48 -07:00
cf4248b9c9
Combat cyborg module shields and mobility.
2013-07-02 01:39:22 -07:00
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
fe4629734e
Fixes #3210
2013-07-01 19:09:56 -07:00
f30baff68f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-01 18:36:06 -07:00
45da864798
Two more custom items.
2013-07-01 10:15:53 -07:00
cfecf42ee4
More custom items.
2013-07-01 09:34:37 -07:00
8b7fcaa11e
Several custom items.
2013-07-01 08:52:00 -07:00
11e27c5999
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
...
Conflicts:
code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
06df725be7
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-01 08:22:25 -07:00
442818591b
Susan's custom items, committing on her behalf.
2013-07-01 07:32:42 -07:00
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -07:00
59f4717096
Merge pull request #3211 from misterbook/bleeding-edge-freeze
...
Pulling the teeth from bees, lowering halloss regen
2013-06-30 10:04:29 -07:00
04e4318304
Merge pull request #3206 from Zuhayr/feature
...
Cyborg cleanup, fix.
2013-06-30 10:01:16 -07:00
19680cb2ba
Compile fix.
2013-06-30 05:15:33 -07:00
b33e91fbb1
Cleaned up a lot of the module selection code, added Combat module.
2013-06-29 22:14:43 -07:00
bd864f6dc0
Fixes #3204
2013-06-29 21:12:41 -07:00
2661f8e8ea
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-29 23:06:39 -05:00
b9fb3538b1
Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.
...
Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.
2013-06-29 23:05:06 -05:00
c10137a118
Fixes #3184
2013-06-29 19:08:41 -07:00
e87348dd8d
Quickfix for #3194
2013-06-29 17:56:38 -07:00
60eeccd2ed
Fixes #3198
2013-06-29 17:27:46 -07:00
3192323c19
Fixes #3200
2013-06-29 16:57:08 -07:00
a928f4d5ec
New players spawn with selected secondary language
...
As with the setup, this checks in alienwhitelist.txt for entries of
the form ckey - Language_Species, with Soghun for Unathi.
2013-06-29 17:33:44 -04:00
3c6c9ed304
Secondary language is saved in the char saves
...
Also increments the max save version; previous saves are rendered
compatible via sanity check assuming no secondary language.
2013-06-29 17:32:48 -04:00
9a8b9bcc60
Added secondary language to char setup
...
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
2013-06-29 17:31:21 -04:00
9b9cf6dfe0
Merge pull request #3190 from Kilakk/bleeding-edge-freeze
...
Fixes #3188 - Mods can now see deadchat
2013-06-28 23:06:26 -07:00
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
c7bbc3c9b3
Changelog.
2013-06-28 15:53:50 -07:00
6b5bd3ca8d
Fixes #3188 - Mods can now see deadchat
...
Mods can now see deadchat regardless of whether they're ghosted or not.
Works with the deadchat toggle.
2013-06-27 23:45:17 -04:00
f5abc3e041
Syringes now have an increased delay when injecting through a hardsuit.
2013-06-27 17:59:37 -07:00
6f207a3a14
Fixes #2424
2013-06-27 18:09:48 -07:00
64dfca731b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 09:01:01 -07:00
d89950487a
Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.
2013-06-27 08:47:15 -07:00
304be1fe41
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 07:27:38 -07:00
5dbb0bcb87
Changelog.
2013-06-27 06:41:47 -07:00
Zuhayr