Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

secure

Removes medical belts from lockers

2014-06-18 22:35:56 +02:00

coffin.dm

More file structuring.

2012-09-05 22:44:48 +00:00

crittercrate.dm

More file structuring.

2012-09-05 22:44:48 +00:00

fireaxe.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

fitness.dm

* Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck.

2013-10-05 08:25:03 -07:00

gimmick.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

job_closets.dm

Closet fixes

2014-02-20 17:54:27 +13:00

l3closet.dm

Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!

2013-07-09 07:02:17 -07:00

malfunction.dm

More file structuring.

2012-09-05 22:44:48 +00:00

syndicate.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

utility_closets.dm

Closet fixes

2014-02-20 17:54:27 +13:00

wardrobe.dm

The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things.

2014-06-25 18:32:48 +02:00