davipatury 2a9bcde361 Fix conflicts.

2017-03-09 12:01:50 -03:00

..

devices

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

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

mountable_frames

Implement usesound/toolspeed

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

robot

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

stacks

Implement usesound/toolspeed

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

weapons

Fix conflicts.

2017-03-09 12:01:50 -03:00

ashtray.dm

…

blueprints.dm

Merge branch 'master' into lavaland_megafauna

2017-02-02 20:17:31 +01:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

control_wand.dm

…

crayons.dm

Implement usesound/toolspeed

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

dehy_carp.dm

…

documents.dm

…

flag.dm

…

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

Implement usesound/toolspeed

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

trash.dm

…