Spamcat
3a1ea41ff2
Moar machinery.
2013-07-05 04:39:57 +04:00
Spamcat
24eddd6eaa
Now 100% more machinery!
2013-07-05 04:12:41 +04:00
Spamcat
6e61fe3914
Initial pulse code. WIP
2013-07-05 03:11:50 +04: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
Chinsky
a8e50ee15a
Merge pull request #3238 from Zuhayr/feature
...
Fixes from master/bef for staging.
2013-07-04 09:52:24 -07:00
Mloc-Argent
08393161c0
Merge branch 'master' into BEF-staging
...
Conflicts:
config/config.txt
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-04 13:08:28 +01:00
Zuhayr
144af0edad
Merge pull request #3237 from Ispil/master
...
Fixes issue #2872 , partially. Carp are now smashed by shuttles if they d...
2013-07-04 05:01:13 -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
Zuhayr
a2aa2e25fa
Merge pull request #3235 from CIB/bleeding-edge-freeze
...
Implemented updatehealth() for robots
2013-07-04 02:53:54 -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
Mloc
907d47e8aa
Made ircbot_message.py use a password.
2013-07-03 15:45:24 +01:00
Mloc-Argent
c4bc5ca06e
you saw /nothing/.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-03 12:04:37 +01:00
Zuhayr
969cb820a0
Merge pull request #3229 from Segrain/bleeding-edge-freeze
...
Records access for cyborgs.
2013-07-03 01:52:44 -07:00
Chinsky
46e31d5c21
Merge pull request #3227 from Mloc/ahelp
...
Updated the linkage between the NanoTrasen IRC bot and the server.
2013-07-03 00:18:14 -07:00
Chinsky
9a175c7733
Merge pull request #3228 from Ispil/Bleeding-Edge-Freeze
...
Actually rectifies issue #3182 , by making the activity list be based on ...
2013-07-03 00:17:58 -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
Zuhayr
5b8dadf05e
Merge pull request #3226 from Baystation12/bleeding-edge-freeze
...
Bleeding edge freeze
2013-07-02 08:24:51 -07: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
3a12ed856e
I hate the dme sometimes.
2013-07-01 19:31:41 -07:00
Zuhayr
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
Zuhayr
c94686d5aa
Ninja compile fix.
2013-07-01 19:21:09 -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
Chinsky
967e7e632c
Merge pull request #3224 from Spamcat/loops
...
No more world loops
2013-07-01 09:04:10 -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
comma
50f94ddd93
Merge branch 'bleeding-edge-freeze' into viro
2013-07-01 17:33:24 +04:00
comma
da884f4ddc
Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro
2013-07-01 17:23:09 +04:00
comma
1b9d6f67e2
Made mutation change virus ID.
2013-07-01 17:22:20 +04:00
comma
5d9a3f12a1
Fixed humans being lukewarmblooded. Now only severe temperature differences will affect internal body temperature, so it will revert back to normal after a bit.
2013-07-01 17:08:21 +04:00
