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

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

backpack.dm

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

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

bags.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

belt.dm

Clean up check for item being equipped

2014-04-13 13:36:48 -04: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

Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed.

2014-03-30 21:41:13 +08:00

fancy.dm

Tiny fix.

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

firstaid.dm

Updates

2014-02-22 19:26:42 +11: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

Merge pull request #4723 from Jarcolr/diction

2014-04-09 21:48:19 +04:00

toolbox.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

uplink_kits.dm

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

wallets.dm

Wallets and cards.

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