Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

energy

Fixing conflicts

2020-10-05 18:10:53 -07:00

launcher

September 2020 Upstream Merge

2020-09-25 23:07:08 -07:00

magic

Merge pull request #7561 from Mechoid/ProjectileUpkeep

2020-08-31 18:23:39 -04:00

magnetic

Convert /material to /datum/material

2020-09-27 16:16:44 -07:00

projectile

Fixing conflicts

2020-10-05 18:10:53 -07:00

automatic_fire.dm

…

energy.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

launcher.dm

…

magic.dm

Merge pull request #7561 from Mechoid/ProjectileUpkeep

2020-08-31 18:23:39 -04:00

modular_guns.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

projectile.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

vox.dm

Rewrite examine() to pass a list around

2020-04-29 16:42:50 -04:00