Crazy Lemon 09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities ...

Fixes Stack Merge Oddities

2017-03-26 23:27:58 -07:00

..

devices

Merge pull request #6728 from FlattestGuitar/click

2017-03-11 21:26:23 -05: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

Merge pull request #6906 from Fox-McCloud/merge-oddities

2017-03-26 23:27:58 -07:00

weapons

Merge pull request #6906 from Fox-McCloud/merge-oddities

2017-03-26 23:27:58 -07: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

removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA

2017-03-10 22:46:02 +04:00

random_items.dm

…

shooting_range.dm

…

toys.dm

Implement usesound/toolspeed

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

trash.dm

…