Commit Graph
13026 Commits
Author SHA1 Message Date
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
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
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
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 12a79e4ade Merge pull request #3181 from Zuhayr/master
Fixes solar control and SMES for borgs.
2013-06-27 16:12:17 -07:00
Zuhayr 6f207a3a14 Fixes #2424 2013-06-27 18:09:48 -07:00
Zuhayr 5d912b70b2 Merge pull request #3183 from Segrain/master
ID cards bugfix.
2013-06-27 04:03:58 -07:00
Segrain 31e4487229 Fix for #2430. 2013-06-27 14:10:05 +03:00
Zuhayr 292929caa1 Merge pull request #3176 from Segrain/master
Rejuvenate bugfix.
2013-06-26 15:48:02 -07:00
Segrain fa0e14652a Revive bugfix. 2013-06-27 02:20:19 +03:00
Chinsky 31990dd0a7 Merge pull request #3173 from Zuhayr/master
Fixes meteor storm secret, fixes wall recharger sprites.
2013-06-26 14:24:54 -07:00
Zuhayr 6d46297757 Fixes #2947 2013-06-27 07:17:55 -07:00
Zuhayr b41e92dc01 Fixes #2870 2013-06-27 07:01:42 -07:00
Zuhayr 8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Zuhayr b270c6060d Fixes #3025 2013-06-27 06:22:01 -07:00
Zuhayr 6d76698116 Organ regeneration nerf. 2013-06-27 02:33:57 -07:00
Zuhayr 333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00
Chinsky f1e3621ec6 Merge pull request #3171 from Zuhayr/master
Bleeding minimum-cutting-damage tweak, runtime fixes.
2013-06-26 13:29:43 -07:00
Zuhayr 5068fe33b9 Merge pull request #3169 from Segrain/master
Autopsy bugfix.
2013-06-26 05:59:50 -07:00
Segrain d5620f9bb0 Changelog update. 2013-06-26 16:18:08 +03:00
Segrain a944cda68e Autopsy fix. 2013-06-26 16:12:32 +03:00
Segrain 91ab249681 Helper update. 2013-06-26 16:11:10 +03:00
Zuhayr 31f80350a7 Merge pull request #3159 from Zuhayr/master
AIize() runtime fix.
2013-06-24 21:07:28 -07:00
Zuhayr 479d7a058f Fixes #3154 2013-06-25 14:07:54 -07:00
Zuhayr 59119fea07 Fixes #3146 2013-06-24 22:09:03 -07:00
Zuhayr 2265e8e0b9 Fixes #2815 2013-06-24 21:55:21 -07:00
Zuhayr b3ba567099 Fixes #3145 2013-06-24 21:31:38 -07:00
Mloc 92f087c199 Merge pull request #3155 from Zuhayr/master
Bug fixes.
2013-06-24 15:01:35 -07:00
Zuhayr ecd7a09f2b Merge pull request #3150 from SkyMarshal/master
ZAS fixes, implements multi-tile doors (That work perfectly!)
2013-06-23 22:23:44 -07:00
SkyMarshal 702fea234a Forgot the files, doh! 2013-06-23 19:53:59 -07:00
SkyMarshal 6d2b9882e4 ZAS fixes, implements multi-tile doors (That work perfectly!)
That multi-tile firedoor needs love.  Lots of love. (It is missing a lot of icon states)
2013-06-23 19:49:42 -07:00
Chinsky 4341fcb207 Merge pull request #3136 from meyar/master
Security missing blast doors
2013-06-22 22:58:18 -07:00
meyar df30716233 Fixes missing blastdoors in security 2013-06-23 01:06:10 -04:00
Zuhayr cfcc3dc689 Merge pull request #3134 from caelaislinn/master
Xenoarchaeology tweaks
2013-06-22 21:58:55 -07:00
Cael Aislinn c8fd18a637 changelog update
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:28:15 +10:00
Cael Aislinn de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:27:48 +10:00
Cael Aislinn 73cf13745d depth scanner should now properly show the responsive material of a find
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:41 +10:00
Cael Aislinn 6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:16 +10:00
Chinsky 6e09f90a24 Merge pull request #3127 from SkyMarshal/master
Maploader improved: Now loads faster by skipping space tiles and properly parses lists from the mapfile.
2013-06-22 07:21:58 -07:00
Chinsky 7e19adb045 Merge pull request #3129 from Zuhayr/master
Various fixes.
2013-06-22 07:15:58 -07:00
Zuhayr f77d208d04 Fixes #3131 2013-06-22 22:19:52 -07:00
Zuhayr 146462cbc6 Fixes #2740 2013-06-22 21:55:22 -07:00
Zuhayr 513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00
Zuhayr be16c8eff3 Fixes #2957 2013-06-22 20:07:21 -07:00
Zuhayr f59faa04a0 Fixes #3125 2013-06-22 17:50:18 -07:00
Zuhayr 82fd456c56 Merge pull request #3128 from Segrain/master
Chemistry: alcohol bugfix.
2013-06-22 05:20:07 -07:00
Segrain 618da8a7c4 Alcohol bugfixes. 2013-06-22 07:33:33 +03:00
SkyMarshal 9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -07:00
Chinsky 32ca15fdb4 Merge pull request #3121 from Zuhayr/master
Alien resin wall fix.
2013-06-21 03:41:16 -07:00