Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz ...

# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm

2017-03-08 10:45:16 +01:00

..

artistic_toolbox.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

backpack.dm

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

bags.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz

2017-03-08 10:45:16 +01:00

belt.dm

Change CE belt path to /full with tools

2017-03-07 18:16:30 +01:00

bible.dm

Refactors Money

2017-03-06 04:52:03 -05:00

boxes.dm

Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold

2017-03-05 19:53:20 +01:00

briefcase.dm

Implements Fire System

2016-07-29 13:24:09 -04:00

fancy.dm

Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold

2017-03-05 19:53:20 +01:00

firstaid.dm

Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold

2017-03-05 19:53:20 +01:00

internal.dm

Mass replace

2016-07-07 19:34:02 -07:00

lockbox.dm

Fix up a number of ID checks

2016-10-23 15:49:02 +02:00

secure.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz

2017-03-08 10:45:16 +01:00

storage.dm

Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold

2017-03-05 19:53:20 +01:00

toolbox.dm

Tool fixes

2017-03-06 20:46:24 +01:00

uplink_kits.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz

2017-03-08 10:45:16 +01:00

wallets.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz

2017-03-08 10:45:16 +01:00