 ZomgPonies
|
92fa72e559
|
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12
|
2013-08-17 23:36:27 +04:00 |
|
|
ZomgPonies
|
f77463495b
|
Server-specific settings
|
2013-08-17 23:35:55 +04:00 |
|
|
ZomgPonies
|
ebfa0a0fd2
|
Merge branch 'pr/2'
Conflicts:
baystation12.dme
config/example/dbconfig.txt
|
2013-08-17 15:22:49 -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 |
|
|
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 |
|
|
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 |
|