LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

..

assembly.dm

…

bomb.dm

Fixes a bug in single tank bomb assembly (#32341)

2017-11-04 11:43:50 -05:00

doorcontrol.dm

…

flash.dm

Datum rev & related upgrades to base datum antag

2017-10-18 02:26:11 -05:00

health.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

helpers.dm

…

holder.dm

…

igniter.dm

…

infrared.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

mousetrap.dm

…

proximity.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

shock_kit.dm

…

signaler.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

timer.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

voice.dm

…