Lo6a4evskiy 82f869c9a6 Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

..

admin

Merge pull request #4337 from Miauw62/say()

2014-08-31 10:59:04 -05:00

assembly

Testing

2014-08-31 14:25:32 +02:00

awaymissions

Testing

2014-08-31 14:25:32 +02:00

client

Merge pull request #4483 from ChuckTheSheep/direct-intent

2014-08-31 11:25:47 -05:00

clothing

Testing

2014-08-31 14:25:32 +02:00

detectivework

Testing

2014-08-31 14:25:32 +02:00

events

Testing

2014-08-31 14:25:32 +02:00

flufftext

Testing

2014-08-31 14:25:32 +02:00

food&drinks

Testing

2014-08-31 14:25:32 +02:00

hydroponics

Golems created by runes also get the same treatment

2014-08-31 17:51:39 -06:00

library

moremoarmoaaaaarabsolutes

2014-08-06 16:54:06 +02:00

mining

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

mob

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Testing

2014-08-31 14:25:32 +02:00

power

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

projectiles

Removed the *click* black text that all mobs get when a gun can't fire. The red *click* will still appear to the gun wielder.

2014-09-02 22:22:47 -03:00

reagents

Makes the all-in-one grinder have density 0

2014-09-02 20:44:38 -03:00

recycling

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

research

Testing

2014-08-31 14:25:32 +02:00

scripting

Resolves many, more saycode bugs. AI tracking is still broken.

2014-08-18 18:51:07 +02:00

security levels

Testing

2014-08-31 14:25:32 +02:00

shuttle

Testing

2014-08-31 14:25:32 +02:00

surgery

Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401

2014-07-07 13:42:31 -04:00

telesci

…