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

..

backpack.dm

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

belt.dm

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

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

bible.dm

Implemented more getters/setters for damage system. 2

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

briefcase.dm

Energy projectiles work again.

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

crates.dm

Fixed issue 222.

2011-12-01 20:02:43 +00:00

firstaid.dm

- First aid kits now also have different sprites (sprites by Arcalane) (applies to fire first aid and tox first aid. The sprite is chosen at random. Empty first aid kits will always have the default sprite. First aid bots have the normal red-cross sprite)

2011-07-20 16:22:41 +00:00

kit.dm

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

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

lockbox.dm

Energy projectiles work again.

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

storage.dm

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

toolbox.dm

Fixed a compile error (compile before you commit damnit Superxpdude!).

2011-06-24 05:06:45 +00:00