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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2014-02-26 09:34:38 -06:00

..

backpack.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

bags.dm

Add Cash Bag. Works like Plant Bag but for cash/coins

2013-11-23 17:22:01 -06:00

belt.dm

Fix to cloned gun issue - now your holster is located on your tactical armor.

2014-02-22 21:50:21 -06:00

bible.dm

Openable soda cans and beer bottles!

2013-12-31 17:52:12 -08:00

boxes.dm

Smallfix.

2014-02-22 06:56:12 +03:00

briefcase.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

fancy.dm

Tiny fix.

2014-02-22 06:56:51 +03:00

firstaid.dm

correct paint can names and plural status, corrected pill box names, corrected lockbox names.

2014-01-08 19:56:03 +00:00

lockbox.dm

correct paint can names and plural status, corrected pill box names, corrected lockbox names.

2014-01-08 19:56:03 +00:00

secure.dm

Extra check in secure case interaction for aliens.

2013-12-05 22:04:11 +10:30

storage.dm

mecha fixes

2013-11-02 12:26:34 -07:00

toolbox.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

uplink_kits.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

wallets.dm

Wallets and cards.

2013-10-21 05:10:33 +03:00