as334 f3e2c2d1f9 Add's feedback, changes plasma usage.

2014-12-07 21:35:52 -05:00

..

admin

Merge pull request #6142 from CorruptComputer/dropinacancel

2014-12-03 18:12:45 +01:00

assembly

Fixes not being able to hear the beeping of infrared beam, timer and proximity sensor in the dark.

2014-11-22 22:56:13 +01:00

awaymissions

Not idea why if(_dmm_preloader) fails to catch nulls...

2014-12-03 20:03:47 +01:00

client

Fixes assistant jobban bug

2014-11-27 16:51:15 -03:00

clothing

Acid protection for Biosuits, Ninja, and DeathSquad

2014-12-03 22:58:21 -06:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

events

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

2014-11-27 15:30:37 +03:00

flufftext

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

food&drinks

Merge pull request #6222 from phil235/SaltShakerFix

2014-12-06 23:57:29 +00:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #6199 from Ergovisavi/less_terrible_human_plants

2014-12-07 17:34:54 +01:00

library

Conflict resolve

2014-11-24 12:27:53 +03:00

mining

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

2014-11-27 15:30:37 +03:00

mob

Add's feedback, changes plasma usage.

2014-12-07 21:35:52 -05:00

nano

Giacom Fixes

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

paperwork

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

2014-11-23 17:46:14 +03:00

power

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

projectiles

Merge remote-tracking branch 'upstream/master' into wormholeProjector

2014-11-29 09:37:40 +02:00

reagents

Fixes chem reactions

2014-12-07 16:42:37 -05:00

recycling

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

research

Merge remote-tracking branch 'upstream/master' into wormholeProjector

2014-11-29 09:37:40 +02:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

surgery

Fixes implants not updating the implant secHUD

2014-11-27 12:56:17 -03:00

telesci

Merge pull request #6026 from phil235/BluespaceCrystalVanishFix

2014-12-04 09:32:02 -06:00