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

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

singularity

Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.)

2011-11-30 15:02:01 +00:00

apc.dm

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

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

cable.dm

Stunglove overhaul: part one.

2011-10-29 02:15:50 +00:00

cell.dm

Stunglove overhaul: part one.

2011-10-29 02:15:50 +00:00

engine.dm

Blob upgrade and reskin. Apparently it's nigh invincible, but playtesting will sort out if it's too much powerful.

2010-09-30 20:28:45 +00:00

generator_type2.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

generator.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

lighting.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

port_gen.dm

Added Tobba's cleanbot patrolling and portable generator updates.

2011-10-18 19:45:09 +00:00

power.dm

New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba.

2011-11-20 10:24:17 +02:00

sd_DynamicAreaLighting.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

smes.dm

SMES units have a higher initial and maximum charge now.

2011-11-24 23:24:38 -08:00

solar.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

terminal.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

tracker.dm

Completely reverted r1897 due to loss of interest in updating solars. Better to have the old set back than a half-finished set after all. (Only kept the space suit select equipment thing.)

2011-07-21 17:10:01 +00:00

turbine.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00