2 Commits

Author	SHA1	Message	Date
Jordie0608	538d4ad303	Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite ... Conflicts: _maps/map_files/MiniStation/MiniStation.dmm code/game/objects/structures/crates_lockers/closets/fireaxe.dm	2015-06-20 18:37:39 +10:00
Jordie0608	c364d1558a	fireaxe cabinet recode	2015-04-16 17:40:15 +10:00