Tastyfish f922994c71 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	code/modules/recycling/sortingmachinery.dm

2012-01-11 00:26:42 -05:00

..

admin

Merge remote-tracking branch 'upstream/master'

2012-01-08 20:06:03 -05:00

assembly

Signalers will now work with the PDA Signalers.

2011-11-21 07:25:48 +00:00

chemical

Merge pull request #260 from SkyMarshal/master

2012-01-10 20:38:14 -08:00

clothing

Fixes and stuff.

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

critters

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00

food

Merge remote-tracking branch 'upstream/master'

2011-12-25 00:55:20 -05:00

mining

bones and dismemberment

2012-01-08 20:05:54 -05:00

mob

More medical changes.

2012-01-10 09:16:11 -08:00

power

merge

2012-01-04 23:01:22 -05:00

projectiles

TG update: Fixed an issue with the captain's laser.

2011-12-24 00:50:52 +02:00

recycling

Merge remote-tracking branch 'upstream/master'

2012-01-11 00:26:42 -05:00

research

Fixed bug involving toolboxes and the Destructive Analyzer

2012-01-08 11:37:57 -07:00

security levels

Emergency teams took a bit too long to be sent.

2012-01-07 02:03:13 -08:00