Commit Graph

6769 Commits

Author SHA1 Message Date
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
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
Zuhayr
8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
Kilakk
5ca6c970fb Reticked and uncommented ERT
It's time
2013-06-08 18:52:41 -04:00
Chinsky
5703b8089d -Forgot to commit one file for previous iteration.
-Fixed derp with analyser.

Refactoring virus2, Part II - Viruses.
-Removed obsolete curing/resistance methods.
-Split base.dm into disease2.dm, effect.dm, helpers.dm.
2013-06-08 18:44:57 +04:00
Chinsky
1820a227a1 Virus2 Refactoring, Part I - Machinery.
-Removed functions already defined in parent classes.
-Replaced checks in Topic() with parent class ones.
-Removed two unused files (there are duplicates in unused folder anyway)
-Removed commented out lines, mostly pre-antibody curing code.
-Shuffled code around for better readability (like antibody list)
-Moved various devices and items defines to separate file.
2013-06-08 17:36:12 +04:00
Chinsky
405dff19b8 Moved virus2 out of WIP folder.
It's been finished years ago...
Also removed Disease2 folder which is just older versions of same files.
2013-06-08 13:00:37 +04:00
Chinsky
59834d2ed9 Added new reagent container - vial.
basically 15u beaker.
2013-06-08 12:39:03 +04:00
Chinsky
3f39d92e8a Added new admin verb: Man Up and its global version.
In action:
https://dl.dropboxusercontent.com/u/70048025/SS13/manup.png
https://dl.dropboxusercontent.com/u/70048025/SS13/manup_g.png
2013-06-08 09:51:47 +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
MisterBook
99e2afb6bc Response team is unticked? Dunno if it's ready or not, but will not commit while that verb is live. 2013-06-07 12:45:02 -05:00
MisterBook
b168f684bf Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-07 12:32:52 -05:00
MisterBook
e05a20ad6f Putting VOX back in. 2013-06-07 12:31:38 -05:00
Chinsky
76d1ddaa26 Merge pull request #2963 from Ravensdale/master
Robot bug fix, synthetic custom sprites update and a rune text tweak
2013-06-07 04:45:00 -07:00
Giacomand
fa39b4e520 New AI voice announcement system which allows the AI to create sentences by combining snippets of words. 2013-06-07 06:29:21 +01:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-06-06 21:32:08 -04:00
MisterBook
05083f4f48 Creating parent class for swimsuits. 2013-06-06 20:24:25 -05:00
MisterBook
8e401489e7 Making sure I don't break anyone else calling apply_effects. 2013-06-06 19:50:32 -05:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms
adding messenger functions to cyborgs and refactoring the AI's IM system
2013-06-06 20:46:46 -04:00
Kilakk
d1faeac8d8 Adds emergency response team verb
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
2013-06-06 17:04:49 -04:00
MisterBook
eab6f4fc44 Taser fix v.3.2
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Chinsky
7023ed0a52 Added webbings and vests.
Attach to jumpsuit. Use Look in storage verb (Object tab) to open. Click on storage boxes to add items.
2013-06-05 21:17:22 +04:00
Chinsky
65880df974 Clicking on storage boxes now properly puts stuff in storage.
Stole fix from TG.
2013-06-05 19:43:01 +04:00
Zuhayr
06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30