phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

backpack.dm

Merge pull request #17245 from nullbear/c4-path

2016-05-01 16:41:07 +10:00

bags.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

belt.dm

Merge pull request #17060 from KorPhaeron/belt

2016-05-03 13:10:23 -05:00

book.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

boxes.dm

ree copypaste

2016-05-03 20:09:27 -05:00

briefcase.dm

Update briefcase.dm

2015-12-30 17:50:00 -02:00

fancy.dm

Cigarette packs will brand their cigarettes.

2016-04-03 10:42:53 +01:00

firstaid.dm

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

internal.dm

New traitor item: storage implant

2015-08-04 18:28:38 +03:00

lockbox.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

secure.dm

I refactored how a mob resisting out of a closet that is itself inside something is done.

2016-03-03 20:20:34 +01:00

storage.dm

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

toolbox.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

uplink_kits.dm

Merge pull request #17245 from nullbear/c4-path

2016-05-01 16:41:07 +10:00

wallets.dm

...

2016-04-09 12:33:32 -04:00