PsiOmega 830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm

2015-09-13 10:44:06 +02:00

..

secure

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-13 10:44:06 +02:00

coffin.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

crittercrate.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

fireaxe.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-13 10:44:06 +02:00

fitness.dm

Gun cleanup and rewrite

2015-02-11 15:46:09 -05:00

gimmick.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

job_closets.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

l3closet.dm

Removes some qdel:s of lists.

2015-06-05 12:05:43 +02:00

malfunction.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

statue.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

syndicate.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

utility_closets.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

walllocker.dm

Closet file reorganisation

2015-01-16 12:04:59 +13:00

wardrobe.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00