LetterJay 38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783

2017-05-13 23:42:19 -05:00

..

buffs.dm

Merge pull request #696 from Citadel-Station-13/upstream-merge-25458

2017-05-07 23:19:35 -07:00

debuffs.dm

Belligerent now prevents you from running even between chants

2017-05-01 12:49:28 -05:00

debuffs.dm.rej

Mania Motors now do minor damage and continue to affect targets after they leave its range

2017-05-04 00:16:08 -05:00

gas.dm

Belligerent now prevents you from running even between chants

2017-05-01 12:49:28 -05:00

status_effect.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783

2017-05-13 23:42:19 -05:00