Chinsky
4262e6b6bc
Merge pull request #3547 from Zuhayr/master
...
Borer prompt, dionaea fix
2013-08-19 01:27:11 -07:00
Zuhayr
809c17710d
Borer prompt will now actually work without runtimes.
2013-08-19 15:46:40 -07:00
Zuhayr
320a009e2d
Made Dionaea whitelisted.
2013-08-19 12:38:48 -07:00
Zuhayr
e05976e1b9
Confirmation prompt for borers.
2013-08-19 11:53:03 -07:00
Kilakk
abe170e006
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
baystation12.dme
2013-08-19 00:27:28 -04:00
Kilakk
83bc47a47e
Temporary fix for #3543 , gave bees an icon_dead state
...
* Also, possibly stopped bees from moving around while deceased (in this case, while not having stat CONSCIOUS)
* Bees don't have an actual death icon, just a placeholder bees1 for now
2013-08-18 23:47:11 -04:00
Kilakk
8d2910da37
Bees are simple_animals, not machines. Bluh.
2013-08-18 22:52:39 -04:00
ZomgPonies
ebfa0a0fd2
Merge branch 'pr/2'
...
Conflicts:
baystation12.dme
config/example/dbconfig.txt
2013-08-17 15:22:49 -04:00
Mloc-Argent
404c12f61e
Much more probable fix for deadchat breaking on clientless ghosts.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-17 14:18:01 +01:00
Segrain
2ea03c0925
Fix for #3535 .
2013-08-17 00:26:27 +03:00
Zuhayr
2bc8212d2a
Fix for subtypes of X mob not being able to understand each other.
2013-08-16 19:00:08 -07:00
Zuhayr
24a09bc9df
Possible fix for deadchat runtime.
2013-08-16 01:45:50 -07:00
Zuhayr
9e58d93fd6
Removing snowflake checks for Soghun.
2013-08-16 01:01:12 -07:00
Chinsky
b8dc7cc939
Merge pull request #3505 from Zuhayr/master
...
Language cleanup/mouse speech fix.
2013-08-13 16:48:45 -07:00
Zuhayr
f6a562e8ed
Couple of typos.
2013-08-14 09:47:52 -07:00
Zuhayr
45a26fcad9
Removed a debug string.
2013-08-14 02:19:36 -07:00
Zuhayr
64c5beaf8c
Forgot to change back some testing keys for languages, whoops.
2013-08-14 02:16:11 -07:00
Zuhayr
9ec5c72d96
Cleaned up language handling, fixed mouse speech understanding.
2013-08-14 02:13:06 -07:00
Zuhayr
e10a433800
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:18 -07:00
Zuhayr
623a2978b7
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:09 -07:00
ZomgPonies
aa588eebaf
General code chances
2013-08-14 01:40:07 +04:00
ZomgPonies
2adc744e65
Merge pull request #1 from Baystation12/master
...
More patches from BS12:master
2013-08-13 13:39:15 -07:00
Lethal Ghost
68e9e5d924
Very very old bug.
...
From Russia with love
2013-08-13 23:31:55 +06:00
Zuhayr
bbfe26bde8
Merge pull request #3503 from Mloc/master
...
Fully reverts clickdelay change.
2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
Segrain
3ba5c3e450
Compile fix.
2013-08-13 13:47:22 +03:00
Segrain
2de41230c9
Merge remote-tracking branch 'upstream/master'
2013-08-13 13:41:24 +03:00
Segrain
6122d50ce0
Reverting to as advertised.
2013-08-13 09:25:28 +03:00
Chinsky
52397321b2
Merge pull request #3502 from Zuhayr/master
...
Compile fix.
2013-08-12 22:36:51 -07:00
Zuhayr
b820ce2fe6
Compile fix.
2013-08-13 15:36:05 -07:00
Zuhayr
b10fe26a9e
Typo fix.
2013-08-13 15:18:45 -07:00
Zuhayr
98510b3b01
Added the ability for worms to secrete useful chemicals.
2013-08-13 15:06:11 -07:00
Zuhayr
4f3f3d6eff
Added vent crawl, hiding and table passing to brain slugs.
2013-08-13 14:55:29 -07:00
Zuhayr
b131d22717
Fixes Check Antagonists for Heist mode.
2013-08-13 14:26:39 -07:00
Zuhayr
254cef453a
Added a preferences switch for diona.
2013-08-13 14:16:07 -07:00
Chinsky
bcb1ced44a
Merge pull request #3500 from Zuhayr/master
...
Borer, plantman and Heist fixes.
2013-08-12 22:19:14 -07:00
Erthilo
1228ba8a25
Allows autoinjectors to be refilled.
2013-08-12 21:17:16 +01:00
Zuhayr
5476ae192d
Attempting to reduce incidence of clickspam against mobs.
2013-08-12 22:44:57 -07:00
Zuhayr
82a4dedf5d
Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD.
2013-08-12 21:17:38 -07:00
Zuhayr
b3e184ad0a
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-12 00:10:12 -07:00
Zuhayr
eec6c16de6
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-12 00:09:17 -07:00
ZomgPonies
c1272238e7
Revert "Revert "Moving files around to make code changes more modular from base BS12""
...
This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.
2013-08-12 02:04:07 -04:00
ZomgPonies
916256b400
Revert "Moving files around to make code changes more modular from base BS12"
...
This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.
2013-08-12 02:04:07 -04:00
ZomgPonies
17d0a2232b
Moving files around to make code changes more modular from base BS12
2013-08-12 02:04:07 -04:00
ZomgPonies
e3213894bd
Items missing from map re-added.
2013-08-12 02:04:06 -04:00
ZomgPonies
d752da826e
Karma System, 1st iteration
2013-08-12 02:04:05 -04:00
Zuhayr
e748fdeb0c
Merge pull request #3488 from Baystation12/dev-freeze
...
Dev freeze
2013-08-11 22:00:01 -07:00
Zuhayr
bcad5a787d
Fixed listing of unrelated creatures when infesting.
2013-08-12 14:46:03 -07:00
Zuhayr
5ecee57a2c
Fixed failure to remove borer verbs on successful resist.
2013-08-12 14:45:42 -07:00
Zuhayr
b23c685221
Borer surgery fix.
2013-08-12 13:44:51 -07:00
