Hornygranny 98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor ...

Conflicts:
	code/game/mecha/mech_fabricator.dm

2014-12-11 13:53:37 -08: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

Merge pull request #6263 from paprka/gunsthegunnening

2014-12-11 10:46:34 +03: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

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

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

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

mining

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-11 13:53:37 -08:00

nano

…

paperwork

Ok now explosions shall work properly

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

power

makes APC call parent

2014-12-09 18:53:29 -08:00

projectiles

trims some unnecessary code

2014-12-10 22:56:52 -08:00

reagents

Merge pull request #6257 from as334/Slimes

2014-12-09 06:44:12 +03:00

recycling

Ok now explosions shall work properly

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

research

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-11 13:53:37 -08: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

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

surgery

Fixes implants not updating the implant secHUD

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

telesci

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00