Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

secure

Closet fixes

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

coffin.dm

…

crittercrate.dm

…

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

…

syndicate.dm

Gave nuke agents magboots.

2013-05-28 21:34:26 -07:00

utility_closets.dm

Closet fixes

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

wardrobe.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-20 19:16:23 -06:00