Zuhayr
1c65f32828
Compile fix.
2013-06-12 20:37:45 -07:00
Zuhayr
b9be0158c7
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-12 20:31:52 -07:00
Zuhayr
fa79834e1b
Merge resolution.
2013-06-12 20:31:29 -07:00
Zuhayr
48aa2bb8f9
Internal damage from yanking out things, damage from moving with shrapnel and things inside your body.
2013-06-12 14:17:05 -07:00
Zuhayr
6bd685bcb2
Compilation fix for ERT code.
2013-06-12 12:30:28 -07:00
Zuhayr
7cd54ac387
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-12 11:41:08 -07:00
Chinsky
8c23dc60f7
Merge pull request #3046 from meyar/bleeding-edge-freeze
...
Emergency Response Team Mega Update! Weee
2013-06-12 03:21:42 -07:00
Zuhayr
19748b1217
Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class.
2013-06-12 03:20:23 -07:00
Segrain
81852bea51
Fix-O-Vein steps bugfix.
2013-06-12 14:00:48 +03:00
Zuhayr
b859a494e6
Minor surgery fix.
2013-06-12 01:57:01 -07:00
Zuhayr
7db6cd4108
Added shrapnel from projectile wounds and altered scanner readout.
2013-06-12 01:45:07 -07:00
Zuhayr
0a220db976
Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs.
2013-06-12 00:28:12 -07:00
Kilakk
bde37882ce
Fixed a small spelling error in job prefs
2013-06-11 21:36:40 -04:00
meyar
811fae38fd
Missed a line
2013-06-11 16:58:48 -04:00
meyar
7256c9d39f
Changes 'Emergency Rescue Team' to its proper 'Emergency Rescue Team'
2013-06-11 16:52:36 -04:00
Kilakk
6c8423aed0
Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze
2013-06-11 16:25:42 -04:00
Chinsky
fa2b46ce9c
Merge pull request #3035 from CIB/feature
...
New configuration option: external resource download
2013-06-11 12:33:16 -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
Chinsky
bd3879da2e
Merge pull request #3040 from Baystation12/master
...
hurka durka master update
2013-06-11 12:25:56 -07:00
Zuhayr
c57f2bb137
Polished off some pneumatic cannon bugs. All done.
2013-06-11 12:19:20 -07:00
Furlucis
360bde9f83
Fixed some typos. (feotal, "/red ...")
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-06-11 15:01:48 -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
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
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
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
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
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
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
Chinsky
28c15adaa3
Fixed runtime in blood transfer.
...
Fixed cure machine producing virus blood wrong.
Changes to existing syndromes:
-Cough : now has chance to infect people around mob.
-Telepathy : now should properly give powers to the mob.
New syndromes:
-Topographical Cretinism : confusing directions, much like drunk effect.
-Blackout : short-time blindness
2013-06-09 16:30:22 +04:00
Chinsky
be8ca60280
Changed how 'greater' effects are picked, now it's var-based, not type-based.
...
That'll let 'greater' and 'lesser' viruses pick low-stage symptoms from same pool without duplicating them.
Also sorted effect datums by stage in effect.dm.
2013-06-09 14:27:41 +04:00
Chinsky
7a8a822a92
Made it possible for mob to be infected with several viruses at once.
2013-06-09 13:31:16 +04:00
