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
Zuhayr
de2b8b8087
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-11 11:51:48 -07:00
Chinsky
8108dd6416
Merge pull request #2994 from Giacomand/AI_announcement_BEF
...
AI voice announcement system. Type in words to create vocal sentences.
2013-06-11 08:30:55 -07:00
Zuhayr
c8f2ee9326
Removed a debug string.
2013-06-11 01:35:30 -07:00
Zuhayr
045a90167c
Vox sprite fixes.
2013-06-11 01:32:07 -07:00
Zuhayr
96d9a41ea7
Pneumatic cannon sprites, gas loss code.
2013-06-11 00:57:15 -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
Zuhayr
0fb234d6a4
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-10 22:35:42 -07:00
Zuhayr
98d31e9191
Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)
2013-06-10 22:35:01 -07:00
jack-fractal
e3fd232741
- removing yellow and black gloves from the randomized tech storage object
...
- adding toolbelts
- rebuilding changes to map
2013-06-11 00:52:32 -04:00
jack-fractal
245713418f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-06-11 00:29:10 -04:00
Chinsky
c906628349
Merge pull request #3031 from Baystation12/master
...
Updating BEF with master
2013-06-10 19:45:24 -07: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
Kilakk
333163dc01
Reconfigured the job prefs panel to look nicer
...
Thanks Deccy for pointing out a one pixel difference
2013-06-10 21:45:50 -04:00
Kilakk
32b0ad2dfa
Adds "Xenobiologist" as its own separate job
2013-06-10 21:45:07 -04: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
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
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
jack-fractal
23498c269a
- adding random objects
...
- randomizing main tool storage starting objects
- randomizing secondary tool storage starting objects
2013-06-09 18:12:57 -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
NicholasDV
d5c085e22a
Changes to increase readability
...
Specifically formatting the messages a bit differently by putting
them onto multiple lines. They line up properly inside of dream
maker, making them /much/ more readable. This format would be preferable
for new additions into this file.
2013-06-09 03:00:47 -04:00
meyar
128326ad1f
Fixes Spec Op shuttle to old behavior (Pure port, no changes)
2013-06-09 01:03:09 -04:00
meyar
5e4b9ae917
Fixes autonomous ERT
2013-06-09 01:02:48 -04:00
Zuhayr
8b518f5639
Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental.
2013-06-08 19:20:02 -07:00
cib
8c6b8add20
Weights the likelihood of command positions by your age.
...
For most head positions, a good age is between 25 and 60, with ages towards the middle of that being even better. 25 because I figure for stuff like research, engineer etc. they'll want someone with fresh knowledge. Captain's best age starts at 35 though, due to that being an "old geezer job".
2013-06-09 01:13:13 +02:00
Kilakk
5ca6c970fb
Reticked and uncommented ERT
...
It's time
2013-06-08 18:52:41 -04:00
Kilakk
a5609c8150
Adds ability to change appearance for ERTs
...
* ERTs can change their own appearance
* Fixed an if statement I goof'd
2013-06-08 18:51:26 -04:00
Giacomand
8dc07fdb6d
* Added a volume constant that defaults to 75.
2013-06-08 05:13:56 +01:00
Chinsky
7b0c4c85e8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-08 07:59:57 +04:00
Chinsky
e40140be03
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-08 05:55:42 +04:00
Chinsky
0c6f518422
Merge pull request #2990 from jack-fractal/bleeding-edge-freeze
...
Android Clocks and Instant Messengers
2013-06-07 18:30:55 -07:00
Chinsky
4118d183c1
No fun allowed.
...
Fixes some hilarious stool glitches.
2013-06-08 05:27:32 +04:00