phil235 e74de9b357 Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix ...

# Conflicts:
#	code/modules/mob/living/carbon/carbon_defense.dm

2016-10-16 12:19:48 +02:00

..

backpack.dm

Fixes supermatter shard being destroyed by fire.

2016-10-15 01:14:04 +02:00

bags.dm

Xenobiology QoL (#20910)

2016-10-13 12:50:07 +13:00

belt.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

book.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

boxes.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

briefcase.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

fancy.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

firstaid.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

internal.dm

Adds armor support for ties (#19748)

2016-08-10 20:22:10 +12:00

lockbox.dm

Revert "Fixes issues with packagewrap, trashbag, handlabeler, "

2016-09-01 12:18:24 -04:00

secure.dm

Fixes secure safe having two attackby. (#20911)

2016-10-12 08:58:41 +13:00

storage.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix

2016-10-16 12:19:48 +02:00

toolbox.dm

Increases toolbox force by 20% (#19592)

2016-07-31 11:37:37 -05:00

uplink_kits.dm

Syndicate Ninja (#20520)

2016-09-20 21:47:24 +12:00

wallets.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00