Fox-McCloud 9ed89ef7cd Fixes Stack Merge Oddities

2017-03-24 04:44:04 -04: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

Fixes Stack Merge Oddities

2017-03-24 04:44:04 -04:00

weapons

Fixes Stack Merge Oddities

2017-03-24 04:44:04 -04:00

ashtray.dm

Mass replace

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

blueprints.dm

Merge branch 'master' into lavaland_megafauna

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

bodybag.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

candle.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

changestone.dm

Mass replace

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

contraband.dm

…

control_wand.dm

Better Destroys

2016-08-02 23:59:23 -04:00

crayons.dm

Implement usesound/toolspeed

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

dehy_carp.dm

…

documents.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

flag.dm

Fixes the flag sometimes not deleting right away.

2016-08-11 12:02:03 -07:00

latexballoon.dm

Better Destroys

2016-08-02 23:59:23 -04:00

misc.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

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

Mass replace

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

toys.dm

Implement usesound/toolspeed

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

trash.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00