Commit Graph

10181 Commits

Author SHA1 Message Date
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
comma
1b9d6f67e2 Made mutation change virus ID. 2013-07-01 17:22:20 +04:00
comma
5d9a3f12a1 Fixed humans being lukewarmblooded. Now only severe temperature differences will affect internal body temperature, so it will revert back to normal after a bit. 2013-07-01 17:08:21 +04:00
comma
05142eac35 Fixed formatting issue.
Editing name and description works now.
2013-07-01 15:14:30 +04:00
Whitellama
99a317cf07 Removed debug outputs 2013-06-30 20:08:46 -07:00
Whitellama
6d8654eb7a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-06-30 20:02:36 -07:00
Chinsky
59f4717096 Merge pull request #3211 from misterbook/bleeding-edge-freeze
Pulling the teeth from bees, lowering halloss regen
2013-06-30 10:04:29 -07:00
Chinsky
04e4318304 Merge pull request #3206 from Zuhayr/feature
Cyborg cleanup, fix.
2013-06-30 10:01:16 -07:00
Zuhayr
19680cb2ba Compile fix. 2013-06-30 05:15:33 -07:00
Zuhayr
b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00
Zuhayr
bd864f6dc0 Fixes #3204 2013-06-29 21:12:41 -07:00
MisterBook
2661f8e8ea Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-29 23:06:39 -05:00
MisterBook
b9fb3538b1 Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.
Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.
2013-06-29 23:05:06 -05:00
Zuhayr
c10137a118 Fixes #3184 2013-06-29 19:08:41 -07:00
Zuhayr
6fc787ff73 Fixes #3201 2013-06-29 18:09:35 -07:00
Zuhayr
e87348dd8d Quickfix for #3194 2013-06-29 17:56:38 -07:00
Zuhayr
60eeccd2ed Fixes #3198 2013-06-29 17:27:46 -07:00
Zuhayr
3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Zuhayr
729b01f193 Merge pull request #3208 from zekesulastin/language-whitelist
Allow for selection of one secondary language based on alienwhitelist.txt
2013-06-29 14:45:51 -07:00
ZekeSulastin
a928f4d5ec New players spawn with selected secondary language
As with the setup, this checks in alienwhitelist.txt for entries of
the form ckey - Language_Species, with Soghun for Unathi.
2013-06-29 17:33:44 -04:00
ZekeSulastin
3c6c9ed304 Secondary language is saved in the char saves
Also increments the max save version; previous saves are rendered
compatible via sanity check assuming no secondary language.
2013-06-29 17:32:48 -04:00
ZekeSulastin
9a8b9bcc60 Added secondary language to char setup
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
2013-06-29 17:31:21 -04:00
jack-fractal
00db60fa95 This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).
This also removes redundant defines from cryobag class.
2013-06-29 16:49:48 -04:00
Chinsky
0e1829794e Started on editing capability for virus DB.
Some weird issues with it, like first <a> making stuff invisible.
Committing before Armageddon.
2013-06-29 19:08:31 +04:00
Zuhayr
9b9cf6dfe0 Merge pull request #3190 from Kilakk/bleeding-edge-freeze
Fixes #3188 - Mods can now see deadchat
2013-06-28 23:06:26 -07:00
Chinsky
8bd7d77916 Medical record viral DB now should list scanned virus2 stamms.
Fixed runtime in analyzer DB uploading.
Fixed derp in get_info() proc for viri
2013-06-28 23:57:16 +04:00
Chinsky
051edc2227 Started implementing of ViroDB.
-Analyzers now add info about viruses they scan to global list.
-Health analyzers will only find known viruses.
2013-06-28 15:43:58 +04:00
Zuhayr
1d28bb7cb3 Message tweaks. 2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3 Changelog. 2013-06-28 15:53:50 -07:00
Zuhayr
665bdd16ab Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-28 15:50:07 -07:00
Kilakk
6b5bd3ca8d Fixes #3188 - Mods can now see deadchat
Mods can now see deadchat regardless of whether they're ghosted or not.
Works with the deadchat toggle.
2013-06-27 23:45:17 -04:00
Whitellama
f9b01a09cc Removed debug outputs and fixed double-forging of ninja objectives 2013-06-27 18:52:00 -07:00
Zuhayr
58bf2d218c Bandages and ointment cannot be used through space suits. 2013-06-27 18:02:10 -07:00
Zuhayr
f5abc3e041 Syringes now have an increased delay when injecting through a hardsuit. 2013-06-27 17:59:37 -07:00
Segrain
4bcae3a06b Examine() update. 2013-06-28 03:33:06 +03:00
Chinsky
12a79e4ade Merge pull request #3181 from Zuhayr/master
Fixes solar control and SMES for borgs.
2013-06-27 16:12:17 -07:00
Zuhayr
6f207a3a14 Fixes #2424 2013-06-27 18:09:48 -07:00
Segrain
31e4487229 Fix for #2430. 2013-06-27 14:10:05 +03:00
Zuhayr
64dfca731b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 09:01:01 -07:00
Zuhayr
d89950487a Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter. 2013-06-27 08:47:15 -07:00
Zuhayr
304be1fe41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 07:27:38 -07:00
Zuhayr
5dbb0bcb87 Changelog. 2013-06-27 06:41:47 -07:00
Whitellama
ca74c8ab44 Raised required players of ninja gamemode (no longer 1, for debug) 2013-06-26 17:08:08 -07:00
Whitellama
90eaca1e53 WIP Ninja GM junk 2013-06-26 16:30:24 -07:00
Segrain
fa0e14652a Revive bugfix. 2013-06-27 02:20:19 +03:00
Zuhayr
6d46297757 Fixes #2947 2013-06-27 07:17:55 -07:00
Zuhayr
b41e92dc01 Fixes #2870 2013-06-27 07:01:42 -07:00
Zuhayr
8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Zuhayr
b270c6060d Fixes #3025 2013-06-27 06:22:01 -07:00
Zuhayr
333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00