Zuhayr
0cfaf8e70b
Minor string fix.
2013-07-05 22:15:40 -07:00
Zuhayr
60b9d0f8fc
Compile fix.
2013-07-05 22:09:27 -07:00
Zuhayr
a2249fb1dc
Fixes yank out verb string issues.
2013-07-05 22:01:09 -07:00
Zuhayr
b6699cbf9a
Adds ammo to vox spawning with a crossbow.
2013-07-05 21:57:51 -07:00
Zuhayr
5dc40474ec
Removes vox randomness in appearance.
2013-07-05 21:53:17 -07:00
cib
f10c08253f
Fixed two bugs with robot components.
...
1. They could be broken but still powered.
2. Melee damage didn't work at all.
2013-07-05 13:43:11 +02:00
Zuhayr
15de508b49
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-04 23:29:48 -07:00
Zuhayr
a8ea0a3fd4
Bot shield not working against melee fix.
2013-07-04 23:23:22 -07:00
Zuhayr
1e7dc9667e
Vox raider class distribution fix.
2013-07-04 23:22:55 -07:00
Zuhayr
dc3485ab2d
Indenting issue.
2013-07-04 20:37:10 -07:00
Zuhayr
0852a9f4b1
Partial fix for #3236
2013-07-04 20:34:37 -07:00
Zuhayr
0140738157
Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12
2013-07-04 20:26:55 -07:00
Zuhayr
681fcb2881
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-04 15:26:06 -07:00
Zuhayr
db650d3757
Config merge.
2013-07-04 14:39:46 -07:00
Ispil
4c1bb073ff
Fixes issue #2872 , partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.
2013-07-04 04:55:24 -07:00
cib
0eb1b2d12c
Implemented updatehealth() for robots
...
Fixes a bug of them never dying.
2013-07-04 09:46:47 +02:00
Zuhayr
b4695d3d74
Merge pull request #3232 from Ravensdale/master
...
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
Ravensdale
34cd183d22
blrg... didn't update my ai code before commiting, should be fixt
2013-07-03 21:54:39 -07:00
Ravensdale
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
Segrain
d14c2a515c
Quickfix.
2013-07-03 06:16:59 +03:00
Segrain
66265e2689
Recordskeeping update.
2013-07-03 05:55:18 +03:00
Mloc-Argent
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
Chinsky
2fda293873
Merge pull request #3223 from Zuhayr/feature
...
Combat cyborg module shields and mobility.
2013-07-01 09:07:48 -07:00
Zuhayr
cf4248b9c9
Combat cyborg module shields and mobility.
2013-07-02 01:39:22 -07:00
Zuhayr
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
Zuhayr
fe4629734e
Fixes #3210
2013-07-01 19:09:56 -07:00
Zuhayr
f30baff68f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-01 18:36:06 -07:00
Zuhayr
45da864798
Two more custom items.
2013-07-01 10:15:53 -07:00
Zuhayr
cfecf42ee4
More custom items.
2013-07-01 09:34:37 -07:00
Zuhayr
8b7fcaa11e
Several custom items.
2013-07-01 08:52:00 -07:00
Spamcat
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
Spamcat
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
Zuhayr
06df725be7
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-01 08:22:25 -07:00
Zuhayr
442818591b
Susan's custom items, committing on her behalf.
2013-07-01 07:32:42 -07:00
Whitellama
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
Chinsky
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
Chinsky
04e4318304
Merge pull request #3206 from Zuhayr/feature
...
Cyborg cleanup, fix.
2013-06-30 10:01:16 -07:00
Zuhayr
19680cb2ba
Compile fix.
2013-06-30 05:15:33 -07:00
Zuhayr
b33e91fbb1
Cleaned up a lot of the module selection code, added Combat module.
2013-06-29 22:14:43 -07:00
Zuhayr
bd864f6dc0
Fixes #3204
2013-06-29 21:12:41 -07:00
MisterBook
2661f8e8ea
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-29 23:06:39 -05:00
MisterBook
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
Zuhayr
c10137a118
Fixes #3184
2013-06-29 19:08:41 -07:00
Zuhayr
e87348dd8d
Quickfix for #3194
2013-06-29 17:56:38 -07:00
Zuhayr
60eeccd2ed
Fixes #3198
2013-06-29 17:27:46 -07:00
Zuhayr
3192323c19
Fixes #3200
2013-06-29 16:57:08 -07:00
ZekeSulastin
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
ZekeSulastin
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
ZekeSulastin
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
Zuhayr
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
