Zuhayr
dba4eb5eb2
Merge branch 'airfixes' of https://www.github.com/SkyMarshal/Baystation12
2013-07-05 16:14:38 -07: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
SkyMarshal
efd3d83e78
Reverts my firechanges, also air alarms now have a temperature regulation capacity.
2013-07-04 20:55:59 -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
2c6e0e2bcc
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-07-04 20:32:24 -07:00
Zuhayr
0140738157
Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12
2013-07-04 20:26:55 -07:00
SkyMarshal
87f576fb64
ZAS and alarm fixes.
2013-07-04 20:22:19 -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
a90fd2b4bb
Merge pull request #3233 from Ispil/Bleeding-Edge-Freeze
...
Removes the ability to create anything HONK-related in the mech fabricat...
2013-07-04 00:36:51 -07:00
Ispil
8c6c03c9d6
Removes the ability to create anything HONK-related in the mech fabricator. Also removes the ability to add bananium, due to it thus being pointless to add due to the one thing it can build being removed. Note that everything is commented out, not deleted.
2013-07-04 00:28:40 -07: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
Zuhayr
969cb820a0
Merge pull request #3229 from Segrain/bleeding-edge-freeze
...
Records access for cyborgs.
2013-07-03 01:52:44 -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
Ispil
88791eec5c
Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code.
2013-07-02 19:14:10 -07:00
Ispil
3e945674b0
Actually rectifies issue #3182 , by making the activity list be based on the physical status (p_stat) in the records instead of an automated activity checker.
2013-07-02 16:14:06 -07: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
e3696a13e9
Redundancy fix.
2013-07-01 19:51:03 -07:00
Zuhayr
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
Zuhayr
a332bd86d2
Fixes #3209
2013-07-01 19:10:26 -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
Spamcat
d0236394ef
Client, mind, big difference...
2013-07-01 20:02:42 +04:00
Zuhayr
8b7fcaa11e
Several custom items.
2013-07-01 08:52:00 -07:00
Spamcat
c79d58159b
whoops
2013-07-01 19:50:06 +04: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
99a317cf07
Removed debug outputs
2013-06-30 20:08:46 -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
