 Mloc
|
7ffb680cdd
|
Merge pull request #3524 from SkyMarshal/airfixes
Fixes a derp with the insulation code.
|
2013-08-15 15:12:49 -07:00 |
|
|
Mloc
|
c7f92ebc6d
|
Merge pull request #3525 from Segrain/master
Postmerge mapfixes.
|
2013-08-15 15:12:31 -07:00 |
|
|
Segrain
|
3722bf97df
|
Postmerge mapfixes again.
|
2013-08-15 21:03:14 +03:00 |
|
|
SkyMarshal
|
9f540e2606
|
Fixes a derp with the insulation code.
|
2013-08-15 10:03:51 -07:00 |
|
|
Mloc
|
98ae51e928
|
Merge pull request #3522 from Zuhayr/master
Removing snowflake checks for Soghun.
|
2013-08-15 08:02:20 -07:00 |
|
|
Zuhayr
|
9e58d93fd6
|
Removing snowflake checks for Soghun.
|
2013-08-16 01:01:12 -07:00 |
|
|
Zuhayr
|
d508fd84c2
|
Merge pull request #3520 from Segrain/master
Smallfix.
|
2013-08-15 02:40:57 -07:00 |
|
|
Segrain
|
fa76668500
|
Colouring tempfix.
|
2013-08-15 10:29:29 +03:00 |
|
|
Zuhayr
|
401130fc54
|
Merge pull request #3519 from Mloc/mapclean
Mapclean
|
2013-08-14 20:37:54 -07:00 |
|
|
Mloc
|
58c557267f
|
updated maptools batch files for new map name
Signed-off-by: Mloc <colmohici@gmail.com>
|
2013-08-15 01:25:11 +01:00 |
|
|
Mloc
|
0de45f5499
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2013-08-15 01:11:53 +01:00 |
|
|
Mloc
|
b8729127b2
|
Merge pull request #3518 from DJSnapshot/master
Fixed Navy warden dark variation clothes disappearing when resting.
|
2013-08-14 17:11:25 -07:00 |
|
|
DJSnapshot
|
f90755695b
|
Fixed Navy warden dark variation clothes disappearing when resting.
|
2013-08-14 17:05:50 -07:00 |
|
|
Mloc
|
d3a44d9855
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2013-08-15 01:04:45 +01:00 |
|
|
Mloc
|
ff1f90dd38
|
Cleanup of maps folder.
Removed every excess map, leaving only tgstation2.dmm, formerly tgstation.2.1.0.0.1.dmm.
Signed-off-by: Mloc <colmohici@gmail.com>
|
2013-08-15 01:02:16 +01:00 |
|
|
Jim "Apples"
|
7292433169
|
Merge pull request #3515 from Zuhayr/master
Engineering merge.
|
2013-08-14 03:04:25 -07: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 |
|
|
Jim "Apples"
|
b019a9709c
|
Merge pull request #3514 from Zuhayr/master
Podman fix.
|
2013-08-14 03:00:03 -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 |
|
|
Zuhayr
|
de8b581d00
|
Merge pull request #3508 from LethalGhost/patch-1
fix incorrect mask display.
|
2013-08-13 16:38:07 -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 |
|
|
Asanadas
|
ec15274ddb
|
Merge pull request #3504 from meyar/master
And I said, let there be prison radio ERP. And some prison fixes too.
|
2013-08-13 08:34:47 -07:00 |
|
|
meyar
|
f8f5dd39bd
|
Fixes the button-less Permbrig flasher, adds the missing intercom to interrogation. Fixes an atmos closet with pipe problems next to security.
|
2013-08-13 11:28:42 -04:00 |
|
|
Zuhayr
|
bbfe26bde8
|
Merge pull request #3503 from Mloc/master
Fully reverts clickdelay change.
|
2013-08-13 05:20:35 -07:00 |
|
|
Mloc
|
a12e3b2407
|
Merge pull request #3501 from Segrain/master
Fixes.
|
2013-08-13 05:10:18 -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 |
|