Commit Graph

10559 Commits

Author SHA1 Message Date
Mloc
7ffb680cdd Merge pull request #3524 from SkyMarshal/airfixes
Fixes a derp with the insulation code.
2013-08-15 15:12:49 -07:00
SkyMarshal
9f540e2606 Fixes a derp with the insulation code. 2013-08-15 10:03:51 -07:00
Mloc-Argent
85d3d2787e Probable fix for deadchat randomly breaking.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-15 17:34:03 +01:00
Zuhayr
9e58d93fd6 Removing snowflake checks for Soghun. 2013-08-16 01:01:12 -07:00
Segrain
fa76668500 Colouring tempfix. 2013-08-15 10:29:29 +03:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
Zuhayr
c19d136996 Podman fix. 2013-08-14 19:58:39 -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
Zuhayr
1bdb1b6694 Merge pull request #3507 from Segrain/master
Internals for everyone.
2013-08-13 16:39:14 -07:00
Zuhayr
38ad57ea95 Merge pull request #3511 from DJSnapshot/master
Added brown vest or webbing for chief engineer's locker
2013-08-13 16:38:30 -07:00
DJSnapshot
cb20332de5 Added potential for chief engineer's locker to spawn with either a brown vest or webbing 2013-08-13 16:16:20 -07:00
Segrain
4e2ba5325a Internals box fix. 2013-08-13 21:06:38 +03: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
Segrain
ccb87c446a Vox beards. 2013-08-13 09:21: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
86c66ebcd4 Possible fix to weird podman behavior. 2013-08-13 14:51:39 -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
Mloc
3a85e7afb2 Merge pull request #3495 from Zuhayr/master
Vox carryover fixes.
2013-08-12 07:03:55 -07:00
Zuhayr
bed45dd864 Removes Vox flavour text carried over from chargen. 2013-08-13 00:03:14 -07:00
Zuhayr
4874d5691b Removes multicultural mrowling Vox from Heist. 2013-08-13 00:00:34 -07:00
Zuhayr
44aa77f7de Adds a delay to the RCD when building. 2013-08-12 22:51:27 -07: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
Mloc
82eb19df9a Merge pull request #3493 from Zuhayr/master
Click delay fixes (part 1)
2013-08-12 05:58:46 -07:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr
b3e184ad0a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-12 00:10:12 -07:00
Zuhayr
b65543e78c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-12 00:09:25 -07:00
Zuhayr
eec6c16de6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-12 00:09:17 -07: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