Zuhayr
|
f59faa04a0
|
Fixes #3125
|
2013-06-22 17:50:18 -07:00 |
|
Chinsky
|
32ca15fdb4
|
Merge pull request #3121 from Zuhayr/master
Alien resin wall fix.
|
2013-06-21 03:41:16 -07:00 |
|
Zuhayr
|
476c8f2fcd
|
Fix for destroying alien walls with your bare hands.
|
2013-06-21 19:03:12 -07:00 |
|
Zuhayr
|
1b5b035630
|
Fixes #2421
|
2013-06-21 15:38:44 -07:00 |
|
Zuhayr
|
d1e80194e3
|
Fixes #2921
|
2013-06-21 15:22:04 -07:00 |
|
Zuhayr
|
afece7e56e
|
Fixes #3118
|
2013-06-21 15:07:31 -07:00 |
|
Zuhayr
|
d0267a07d2
|
Fixes #3106
|
2013-06-21 06:43:24 -07:00 |
|
Chinsky
|
2cf633b34f
|
Merge pull request #3113 from Zuhayr/master
Firesuit icon fix.
|
2013-06-20 23:54:00 -07:00 |
|
Jim "Apples"
|
3b36a02bf0
|
Merge pull request #3111 from Spamcat/master
MEATFIX
|
2013-06-20 07:15:37 -07:00 |
|
Spamcat
|
654a83be9d
|
Quickfix for INFINIMEAT.
|
2013-06-20 18:13:18 +04:00 |
|
Jim "Apples"
|
b57e0904ec
|
Merge pull request #3105 from SkyMarshal/airfixes
Sanity checking for zone disconnection. I am dumb some days.
|
2013-06-19 14:24:20 -07:00 |
|
SkyMarshal
|
73bf813127
|
Sanity checking for zone disconnection. I am dumb some days.
|
2013-06-19 12:47:19 -07:00 |
|
Chinsky
|
ed83f59476
|
Merge pull request #3096 from Zuhayr/master
Solar charging fix.
|
2013-06-18 07:20:48 -07:00 |
|
Zuhayr
|
e41c47c52b
|
Fixes #3082.
|
2013-06-19 00:21:15 -07:00 |
|
Mloc
|
7c5613a08e
|
Merge pull request #3089 from SkyMarshal/airfixes
Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station.
|
2013-06-17 16:03:38 -07:00 |
|
SkyMarshal
|
453c0c741c
|
Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station.
Fixes #3074
Fixes #3069
Fixes #2909
|
2013-06-17 15:56:57 -07:00 |
|
Chinsky
|
a246caad63
|
Fixes unticked file.
No idea why some files get randomly unticked.
|
2013-06-14 14:17:12 +04:00 |
|
Chinsky
|
5993ce4be5
|
Merge pull request #3068 from SkyMarshal/airfixes
Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)
|
2013-06-14 02:59:29 -07:00 |
|
SkyMarshal
|
1f886448b6
|
Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)
Fixes #3059
|
2013-06-13 18:20:42 -07:00 |
|
Chinsky
|
2fb638253d
|
Merge pull request #3055 from Mordeth221/patch-1
Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine
|
2013-06-12 17:27:39 -07:00 |
|
Mordeth221
|
91bd0d453b
|
Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine
Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.
|
2013-06-12 21:55:07 +02:00 |
|
Chinsky
|
200fa8c696
|
Merge pull request #3049 from Segrain/master
Surgery fix for FixOVein steps.
|
2013-06-12 03:20:15 -07:00 |
|
Segrain
|
864ce11d8a
|
And misclick fix.
|
2013-06-12 14:05:41 +03:00 |
|
Segrain
|
81852bea51
|
Fix-O-Vein steps bugfix.
|
2013-06-12 14:00:48 +03:00 |
|
Chinsky
|
e638540b4c
|
Merge pull request #3041 from meyar/master
Emergency map fix: Security escape pod
|
2013-06-11 12:29:41 -07:00 |
|
meyar
|
f03f8c9b66
|
Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c
|
2013-06-11 15:25:59 -04:00 |
|
Chinsky
|
09d0bb7f8e
|
Merge pull request #3039 from Furlucis/master
Typo fixes
|
2013-06-11 12:21:16 -07:00 |
|
Chinsky
|
362aa26a1e
|
Merge pull request #3038 from Spamcat/master
Antilag 2: electric boogaloo
|
2013-06-11 12:20:38 -07:00 |
|
meyar
|
010122b189
|
Emergency fix for security escape pod
|
2013-06-11 15:13:26 -04:00 |
|
Spamcat
|
076f4c9d9a
|
Figured I should finally commit it, since exams are over now~
Radios start off by default. Should decrease the amount of tcomm lag.
|
2013-06-11 23:09:44 +04:00 |
|
Furlucis
|
360bde9f83
|
Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
|
2013-06-11 15:01:48 -04:00 |
|
meyar
|
38feb46839
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2013-06-11 15:00:22 -04:00 |
|
Chinsky
|
ceafae3381
|
Merge pull request #3034 from Furlucis/master
Jungle Runtime fix
|
2013-06-11 08:26:43 -07:00 |
|
Furlucis
|
a60dcf473b
|
Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though.
Signed-off-by: Furlucis <Logman115@gmail.com>
|
2013-06-11 03:18:03 -04:00 |
|
Chinsky
|
bb95425628
|
Merge pull request #3030 from SkyMarshal/airfixes
Fixes a derp in the sanity checking.
|
2013-06-10 19:45:37 -07:00 |
|
Chinsky
|
fb4582e282
|
Merge pull request #3029 from fauxki/master
Master Map Fixes
|
2013-06-10 19:44:56 -07:00 |
|
fauxtada
|
d65759a98b
|
Master Map Fixes
- Opps, fixed bar doors.
- And the floating glass at the swimming hole.
|
2013-06-10 19:40:53 -07:00 |
|
SkyMarshal
|
1739ff6fec
|
God, I am not awake.
|
2013-06-10 19:40:39 -07:00 |
|
Chinsky
|
fda687ec00
|
Merge pull request #3027 from SkyMarshal/airfixes
Fixes for ZAS issues.
|
2013-06-10 19:02:06 -07:00 |
|
SkyMarshal
|
df73aabf83
|
Fixes for ZAS issues.
Fixes #2996
Fixes #3023
|
2013-06-10 18:49:41 -07:00 |
|
Chinsky
|
6dc2d9d2dc
|
Merge pull request #3015 from comma/master
Fix
|
2013-06-10 11:50:50 -07:00 |
|
Chinsky
|
4403e0728e
|
Merge pull request #3000 from Baystation12/BEF-staging
Bef staging
|
2013-06-10 02:54:22 -07:00 |
|
Chinsky
|
54b835f0d7
|
Merge pull request #3022 from Baystation12/bleeding-edge-freeze
Bleeding edge freeze
|
2013-06-10 02:53:51 -07:00 |
|
Chinsky
|
a252ca3943
|
Merge pull request #3019 from misterbook/bleeding-edge-freeze
Bleeding edge freeze
|
2013-06-10 02:51:19 -07:00 |
|
Chinsky
|
0f9b53ef09
|
Merge pull request #3016 from NicholasDV/tweaksAndFixes
Tweaks and fixes
|
2013-06-10 02:39:40 -07:00 |
|
Chinsky
|
6068e5ef14
|
Merge pull request #3021 from Zuhayr/master
Added psychic items to wizard's tower, added focus to spellbook.
|
2013-06-10 02:38:31 -07:00 |
|
Zuhayr
|
cbb36ce24f
|
Added ability for tanks to be held on vox suits.
|
2013-06-10 18:08:25 -07:00 |
|
Zuhayr
|
630db203f9
|
Oxygen toxicity fix. Whoops.
|
2013-06-10 17:50:15 -07:00 |
|
Zuhayr
|
bc2db268cc
|
Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.
|
2013-06-10 17:16:54 -07:00 |
|
Zuhayr
|
38b44b2441
|
Items for wizard den, mental focus added to spellbook.
|
2013-06-10 14:56:47 -07:00 |
|