Artur f910a0fd32 Conflict fixes

2020-04-14 09:27:54 +03:00

..

ammunition

that was easy

2020-04-06 08:40:34 -04:00

boxes_magazines

that was easy

2020-04-06 08:40:34 -04:00

guns

fix everything

2020-04-11 15:32:09 +08:00

projectile

Conflict fixes

2020-04-14 09:27:54 +03:00

gun.dm

Minor action datum refactor and spellcasting fix.

2020-04-11 16:53:08 +02:00

pins.dm

…

projectile.dm

Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-20 22:59:17 -07:00