SkyMarshal 5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm

2011-12-29 10:08:58 -07:00

..

mapload

Stun batons will no longer randomly stun people when they bump/are bumped by a guy holding one.

2011-09-22 04:27:33 +00:00

Mini

Fixed several things.

2011-12-27 13:44:52 -07:00

organs

Added a getBruteLoss() proc to mob.dm and then replaced all calls of bruteloss with it. Except for the ones commented out.

2011-11-10 14:45:25 +00:00

SkyMarshal

Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested.

2011-12-29 15:15:51 -08:00

Tastyfish

pAI chatbot pal for when ghost aren't pAI'ing;

2011-12-29 08:38:40 -05:00

virus2

Removed sleep symptom from lesser diseases, made the cure research machine display the antibodies of the given sample of blood.

2011-12-29 01:59:43 -08:00

Wrongnumber

Fixes and stuff.

2011-12-28 14:27:52 -07:00

AI_Visibility.dm

Fixed camera chunks still being shown when an AI dies in freelook mode

2011-12-19 21:03:47 +10:30

buildmode.dm

Organs:

2011-10-08 10:38:01 +00:00

detective_work.dm

Fixes and stuff.

2011-12-28 14:27:52 -07:00

explosion_particles.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

jobs.dm

Few runtime fixes.

2011-09-29 05:20:33 +00:00