Chinsky
6e09f90a24
Merge pull request #3127 from SkyMarshal/master
...
Maploader improved: Now loads faster by skipping space tiles and properly parses lists from the mapfile.
2013-06-22 07:21:58 -07:00
Chinsky
7e19adb045
Merge pull request #3129 from Zuhayr/master
...
Various fixes.
2013-06-22 07:15:58 -07:00
Zuhayr
f77d208d04
Fixes #3131
2013-06-22 22:19:52 -07:00
Zuhayr
146462cbc6
Fixes #2740
2013-06-22 21:55:22 -07:00
Zuhayr
513a9d7ee8
Fixes #3052
2013-06-22 20:22:19 -07:00
Zuhayr
be16c8eff3
Fixes #2957
2013-06-22 20:07:21 -07:00
Zuhayr
f59faa04a0
Fixes #3125
2013-06-22 17:50:18 -07:00
Segrain
618da8a7c4
Alcohol bugfixes.
2013-06-22 07:33:33 +03:00
SkyMarshal
9591c3773e
Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
...
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -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
afece7e56e
Fixes #3118
2013-06-21 15:07:31 -07:00
Zuhayr
d0267a07d2
Fixes #3106
2013-06-21 06:43:24 -07:00
Spamcat
654a83be9d
Quickfix for INFINIMEAT.
2013-06-20 18:13:18 +04:00
SkyMarshal
73bf813127
Sanity checking for zone disconnection. I am dumb some days.
2013-06-19 12:47:19 -07:00
Zuhayr
e41c47c52b
Fixes #3082 .
2013-06-19 00:21:15 -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
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
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
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
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
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
SkyMarshal
1739ff6fec
God, I am not awake.
2013-06-10 19:40:39 -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
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
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
Zuhayr
85b945cfbf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-10 14:42:46 -07:00
NicholasDV
0b20496f7d
Adds Uranium Capability to Circuit Imprinters
...
Well, looking over the RUST circuits... They required uranium
which we didn't even have implemented in the code to work with
circuit imprinters. I considered simply changing them to use
a different resource, but it honestly makes more sense to improve
the current code to have it more versatile-- To this end, I've made
circuit imprinters capable of using uranium.
As a further note...
closes #2757
2013-06-10 00:12:28 -04:00
NicholasDV
af234f7f1d
Removes a few typos from channel names
...
The literal only two instance of gazette in the code.
This should fix it entirely.
fixes #3006
2013-06-09 18:04:27 -04:00
MisterBook
b51bc5e322
Response Team still isn't ticked on. Dunno if it's ready. Re-re-uncommented.
2013-06-09 14:26:34 -05:00
MisterBook
a7b5bee81b
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-09 14:11:28 -05:00
MisterBook
b835ab4bd2
Fix of breacher chasis to keep anyone but Ughanti from wearing it.
...
Fix of gun suicide - lethal is lethal, nonlethal just hurts like a mother.
Despamming electrode resistance.
2013-06-09 14:10:11 -05:00
Chinsky
b50216cec6
Fixes #3017
...
Looks like will have to put speshul check back...
2013-06-09 19:54:43 +04:00
Chinsky
eaf6b64277
Compile fix.
2013-06-09 19:53:08 +04:00
NicholasDV
f304df5b05
Added the ability to give traitors all objectives.
...
Specifically, admins were unable to give players, traitors,
that is, the objective to brig/maim someone. This gives them
the ability view the traitor panel.
2013-06-09 04:47:10 -04:00
NicholasDV
adde619a06
Fixes an issue in grammar!
...
Specifically, the way that it was coded made it so that the word
the would appear twice. There... really wasn't a way to fix that
in a way that would effect a lot more things, that I could find.
As a result, I simply reworded it so that it can work with or without
the word, 'the'.
closes #2771
2013-06-09 03:40:27 -04:00
Chinsky
7076db3caf
Merge pull request #3011 from Kilakk/bleeding-edge-freeze
...
ERTs can change their appearance upon spawn-in
2013-06-09 00:30:53 -07:00
Segrain
673f3ddb37
Fix for ordering hidden supplypacks.
2013-06-09 10:25:27 +03:00
NicholasDV
f2a16fc3cd
This just fixes a small typo in build mode.
...
Specifically, the throw and select buttons were 'switched'
in some instructions. This quickly fixes that!
closes #3001
2013-06-09 03:16:51 -04:00
