Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

backpack.dm

fixes singulo bombing

2014-12-17 02:25:33 -08:00

bags.dm

Merge pull request #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

belt.dm

TearGas

2014-11-10 02:16:46 +08:00

book.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

boxes.dm

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

briefcase.dm

Fixing some message and sound.

2014-09-13 00:46:57 +02:00

fancy.dm

Fixes several description related issues with fancy storage

2014-11-30 22:03:25 +00:00

firstaid.dm

Merge pull request #5235 from phil235/CollapsibleRollerBed

2014-10-15 11:54:48 +01:00

lockbox.dm

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

secure.dm

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

storage.dm

Always reset the layer of things removed from storage

2014-12-19 09:42:06 -08:00

toolbox.dm

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

uplink_kits.dm

adds winter coats and changes labcoat toggling

2014-12-04 21:29:21 -08:00

wallets.dm

Renamed maglite to seclite.

2014-03-29 11:10:35 +00:00