Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-08-08 16:51:53 -05:00

..

ballistic

Merge pull request #8942 from jakeramsay007/WardenShotgun

2019-08-03 00:48:59 -07:00

energy

Update special.dm

2019-07-29 07:53:41 -04:00

magic

Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"

2019-07-31 18:56:00 +02:00

misc

Merge pull request #8715 from Sishen1542/toxinmanbad

2019-06-23 06:57:09 -07:00

ballistic.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

2019-07-31 19:24:39 -05:00

energy.dm

Adds new and immersive sound for combat

2019-03-05 15:03:08 -06:00

magic.dm

module things, jfc

2018-09-11 07:51:01 -05:00