DZD 4bcdb94a99 Merge with upstream/master ...

Fixes conflicts

2015-02-18 13:41:32 -05:00

..

assembly.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

bomb.dm

Merge with upstream/master

2015-02-12 16:43:01 -05:00

helpers.dm

…

holder.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

igniter.dm

HurrDurr

2014-05-30 22:29:11 -04:00

infrared.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

mousetrap.dm

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

proximity.dm

…

shock_kit.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

signaler.dm

Updated m_amt and g_amt to match their design

2015-02-17 18:52:31 +01:00

timer.dm

…

voice.dm

…