Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze ...

Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-10-08 22:01:16 +01:00

..

antimatter

Expansion of every "icon = ''" path.

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

singularity

Recommitting PA sprites by Flash Kirby.

2013-09-01 21:10:39 +01:00

apc.dm

Commented out APC switching from Malf AI.

2013-08-25 02:35:05 -07:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

cell.dm

…

engine.dm

…

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

No more burning your hands off on 200C lightbulbs.

2013-03-15 00:53:50 +01:00

pacman2.dm

Expansion of every "icon = ''" path.

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

port_gen.dm

…

power.dm

…

smes.dm

Fixes #2424

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

solar.dm

Fixes #2424

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

switch.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

World loops 2: Electric Boogaloo.

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