Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

antimatter

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

singularity

Many changes

2014-02-04 22:49:38 -08:00

apc.dm

Many changes

2014-02-04 22:49:38 -08:00

cable.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

cell.dm

A bunch of bug fixes

2014-01-11 18:37:31 +00:00

engine.dm

Removed a bunch of copy pasted code regarding moving pulled atmos by clicking on turfs or conveyors. Now this is handled by a mob proc, Move_Pulled()

2013-06-21 17:55:32 -03:00

generator.dm

Updated the MiniStation map with some minor tweaks.

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

gravitygenerator.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

lighting.dm

Many changes

2014-02-04 22:49:38 -08:00

port_gen.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

power.dm

making propagate_network non recursive

2013-11-08 00:09:30 +00:00

smes.dm

Added SMESes and some turbine fix

2014-01-30 22:21:43 +04:00

solar.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

switch.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

terminal.dm

- Added a sprite "7" to the sd lighting file as it was used, even if it didn't exist.

2012-07-31 05:24:37 +00:00

tracker.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

turbine.dm

Added SMESes and some turbine fix

2014-01-30 22:21:43 +04:00