SkyMarshal 1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.

2012-02-08 12:13:03 -07:00

..

secure

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-02-08 12:13:03 -07:00

bombsuit.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

emergency.dm

Finished emlocker stuff

2012-01-04 02:15:38 +10:30

firecloset.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

gimmick.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

gmcloset.dm

Several fixes/additions. Will list in pull request.

2011-12-18 20:56:39 -07:00

janitor.dm

Added a new object, for storing premade outfits, that is in clothing closets.

2012-01-26 22:19:33 -07:00

kitchen.dm

Fixed issue 222.

2011-12-01 20:02:43 +00:00

l3closet.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

malfunction.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

nuclear.dm

Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs.

2012-01-27 22:55:16 -07:00

syndicate.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

thunderdome.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

walllocker.dm

Secure Airlock update!

2012-02-08 12:07:12 -07:00

wardrobe.dm

Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs.

2012-01-27 22:55:16 -07:00