Hornygranny 9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 ...

Conflicts:
	code/game/turfs/simulated/floor.dm

2014-10-30 17:26:25 -07:00

..

antimatter

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

singularity

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

2014-10-30 17:26:25 -07:00

apc.dm

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

cable.dm

big commit, handcuff overhaul

2014-10-08 13:19:54 -07:00

cell.dm

Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research

2014-08-23 02:02:46 +02:00

engine.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

generator.dm

Updated the MiniStation map with some minor tweaks.

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

gravitygenerator.dm

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

lighting.dm

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

port_gen.dm

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

2014-08-29 04:21:15 -07: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

Fixing typos.

2014-09-15 19:50:34 +02: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