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

Conflicts:
	code/modules/hydroponics/hydroponics.dm

2014-12-08 13:48:22 -03:00

..

admin

adds winter coats and changes labcoat toggling

2014-12-04 21:29:21 -08: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

adds winter coats and changes labcoat toggling

2014-12-04 21:29:21 -08:00

client

Fixes assistant jobban bug

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

clothing

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

2014-12-08 13:48:22 -03:00

crafting

…

detectivework

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

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

events

Ok now explosions shall work properly

2014-12-05 23:21:48 +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 branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome

2014-12-08 13:48:22 -03:00

library

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

mining

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

mob

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

2014-12-08 13:48:22 -03:00

nano

…

paperwork

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

power

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

projectiles

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

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

reagents

Merge pull request #6175 from Razharas/ExActFix

2014-12-08 08:03:35 +01:00

recycling

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

research

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

scripting

…

security levels

…

shuttle

…

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