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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

antimatter

Ok now explosions shall work properly

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

singularity

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

apc.dm

makes APC call parent

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

cable.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03: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

Updated the MiniStation map with some minor tweaks.

2014-01-31 15:40:07 +00:00

gravitygenerator.dm

Ok now explosions shall work properly

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

lighting.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +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

Adds static power value on areas. These variables should replace machines on the process list, that are only there to consume power.

2014-08-06 06:57:52 -03:00

smes.dm

Forgot to remove connecting from a cable for SMES (prevents inputting/outputting in the same powernet)

2014-09-10 13:16:47 +02:00

solar.dm

Ok now explosions shall work properly

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

switch.dm

Some fixes and minor improvements to examining.

2014-06-13 09:01:52 -07:00

terminal.dm

Removed the now unused directwired variable

2014-07-02 23:58:12 +02:00

tracker.dm

Delegated the panels and trackers control to Solar Control Computers instead of the Sun controller.

2014-07-04 21:42:36 +02:00

turbine.dm

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

2014-10-15 18:23:40 +02:00