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

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm

2015-01-04 01:52:14 +00:00

..

assembly.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

bomb.dm

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

helpers.dm

…

holder.dm

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

igniter.dm

…

infrared.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

mousetrap.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

proximity.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

shock_kit.dm

Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack.

2014-10-14 21:44:56 -03:00

signaler.dm

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

timer.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

voice.dm

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