Commit Graph

10529 Commits

Author SHA1 Message Date
Erthilo
de6eb16e1a Fixes being able to have alien species hair on humans or other species. 2013-08-20 10:37:05 +01:00
Segrain
18b26c57b7 Inertia fix. 2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21 Fix for #3549. 2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc Merge pull request #3547 from Zuhayr/master
Borer prompt, dionaea fix
2013-08-19 01:27:11 -07:00
Zuhayr
67f3f5a3c4 Podmen prompt/spawn should work now. 2013-08-19 15:58:08 -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
6d8bb8dfe6 Hopefully a fix for Dionaea weirdness regarding pods. 2013-08-19 11:53:24 -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
Zuhayr
02b5cdaca3 Merge pull request #3541 from Mloc/dsayfix
Much more probable fix for deadchat breaking on clientless ghosts.
2013-08-17 06:18:25 -07: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
Mloc
6ea99aff32 Disabled airlock heat transfer after community vote.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-17 01:03:13 +01:00
Mloc-Argent
ebc19424e0 Fix for minute traces of toxins in the air causing firestorms.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-17 00:19:28 +01:00
Segrain
2ea03c0925 Fix for #3535. 2013-08-17 00:26:27 +03:00
Zuhayr
9c58348879 Holodeck exploit fix. 2013-08-17 04:41:28 -07: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
8df4c42c63 Merge pull request #3523 from Mloc/dsayfix
Probable fix for deadchat randomly breaking.
2013-08-15 17:27:11 -07:00
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