nemvar a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692) ...

* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives

2019-10-06 13:37:24 -04:00

..

bullets

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

energy

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

magic

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

reusable

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

special

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

beams.dm

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

bullets.dm

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

magic.dm

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00