Commit Graph

10537 Commits

Author SHA1 Message Date
Zuhayr
d0e15b3608 Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi. 2013-06-11 13:15:33 -07:00
Chinsky
fa2b46ce9c Merge pull request #3035 from CIB/feature
New configuration option: external resource download
2013-06-11 12:33:16 -07:00
Chinsky
3c56e6dacb Merge pull request #3043 from Baystation12/master
Fix for pods
2013-06-11 12:32:47 -07:00
Chinsky
e638540b4c Merge pull request #3041 from meyar/master
Emergency map fix: Security escape pod
2013-06-11 12:29:41 -07:00
cib
13b16bcd69 Added extra message when downloading external resources. 2013-06-11 21:28:59 +02:00
cib
4e0c68b88a Added a configuration option that allows putting the .rsc on external servers. 2013-06-11 21:28:59 +02: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
bd3879da2e Merge pull request #3040 from Baystation12/master
hurka durka master update
2013-06-11 12:25:56 -07:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master
Typo fixes
2013-06-11 12:21:16 -07:00
Zuhayr
c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -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
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
Chinsky
5d7b62f32d gave virus slight chance to change antibodies they could be cured with. 2013-06-09 18:31:11 +04:00
Chinsky
d25c9723e1 Two new syndromes, ideas stolen from TG's advanced diseases:
-Balding
-Stimulant - generates hyperzine.

Two more:
-Longevity : heals small amount of damage and some broken bones when activated. When healed deals same amount of damage.
-DNA degradation : deals tiny amount of clone damage

Also made retrovirus deal clone damage as well.
2013-06-09 18:28:41 +04:00
Chinsky
915c37f1b6 Two new syndromes:
-Retrovirus : scrambles DNA.
-Shutdown : limbs become unusable. Reversed when cured
-Fragile Bones :
2013-06-09 17:28:56 +04:00
Chinsky
5056e3a4fa Added fever to the virus progress. 2013-06-09 17:06:37 +04:00
Chinsky
300a73da71 Should make unusable limbs treated as such. 2013-06-09 16:51:07 +04:00
Chinsky
e74f52f86b OCD commit, makes capitalizations uniform 2013-06-09 16:39:03 +04:00