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

..

admin

security levels commit oddities fixed.

2011-12-04 10:25:03 +00:00

assembly

Signalers will now work with the PDA Signalers.

2011-11-21 07:25:48 +00:00

chemical

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

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

clothing

-Adding pepper spray for security officers.

2011-12-04 22:42:18 +00:00

critters

Implemented more getters/setters for damage system. 2

2011-11-26 13:33:18 +00:00

food

Replacing monkie with monkey...

2011-11-28 19:39:22 +00:00

mining

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

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

mob

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

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

power

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

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

projectiles

Gyrojet bolts now explode on contact with mobs and walls.

2011-12-06 04:50:42 +00:00

recycling

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

2011-12-03 19:28:10 +10:30

research

Nanotrasen laws, nobody likes you asimov

2011-11-30 19:23:37 -05:00

security levels

- Added the ability to communications computers to switch between the blue and green security levels. I wanna make a super special way to get to the red level, which involves the turning of multiple keys (id cards) in multiple areas :)

2011-12-04 20:32:30 +00:00