Miniature af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git ...

Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm

2011-12-07 07:53:20 +10:30

..

antimatter

…

singularity

…

apc.dm

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-07 07:53:20 +10:30

cable.dm

…

cell.dm

…

engine.dm

…

generator_type2.dm

…

generator.dm

…

lighting.dm

…

port_gen.dm

…

power.dm

…

sd_DynamicAreaLighting.dm

…

smes.dm

…

solar.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

…