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

..

antimatter

SubSystem rewrite

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

singularity

SubSystem rewrite

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

supermatter

Fixes supermatter division by zero runtime

2014-12-29 21:48:21 -03:00

apc.dm

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

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

cable.dm

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

2014-12-26 18:35:12 -08:00

cell.dm

Ok now explosions shall work properly

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

engine.dm

Ok now explosions shall work properly

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

generator.dm

…

gravitygenerator.dm

Fixes #6615

2014-12-27 18:32:45 +00:00

lighting.dm

Merge pull request #6584 from phil235/HoloSwordFix

2015-01-01 16:39:16 -03:00

port_gen.dm

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

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

power.dm

SubSystem rewrite

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

smes.dm

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

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

solar.dm

SubSystem rewrite

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

switch.dm

…

terminal.dm

You can now deconstruct terminals provided the APC or SMES is prepared for this (eg, open panels, exposed wires etc.)

2014-12-31 23:35:07 +00:00

tracker.dm

Tidying a little

2014-12-16 13:16:19 +01:00

turbine.dm

…