Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

antimatter

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

singularity

Fixed rad collector toxin drain bug

2014-01-20 16:16:02 +13:00

apc.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-20 19:16:23 -06:00

cable_heavyduty.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-05 22:21:26 +10:00

cable_logic.dm

- Added ground code for logic elements. Currently supports sensors, indicators, negators, two input and gates, or gates, xor gates, xnor (equivalence) gates and a relay, with one control input that works by logic laws and another input and output that work by powernet laws.

2012-10-12 22:46:24 +00:00

cable.dm

Fixed cable colors

2014-02-13 17:05:07 +13:00

cell.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

engine.dm

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +00:00

generator_type2.dm

removed debug output for type 2 TEGs

2013-03-05 17:06:43 +10:00

generator.dm

made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k

2013-05-19 18:50:15 +10:00

gravitygenerator.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

lighting.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

pacman2.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

port_gen.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

power.dm

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

smes.dm

SMES fix, AI's can now use them.

2014-01-19 21:26:15 -06:00

solar.dm

Fixes #2424

2013-06-27 18:09:48 -07:00

switch.dm

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10: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

-Changed the powernet nodes list to be a dictionary list (associative list, hashtable, etc..)

2012-12-29 07:24:42 +00:00

turbine.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00