Ikarrus 4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm

2015-06-28 19:00:16 -06:00

..

closets

Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks

2015-06-28 19:00:16 -06:00

bins.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics

2015-06-23 12:54:26 -07:00

closets.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics

2015-06-14 15:42:15 -07:00

crates.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

largecrate.dm

Putting all on github now.

2015-05-01 00:33:21 +01:00