Ian Turk 1b7ca8c0e5 Resolved merge conflicts

2017-08-16 08:33:24 -06:00

..

coil.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

energy_ball.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-15 16:01:35 -06:00

generator.dm

Grilles no longer generate a ball

2017-02-04 22:35:16 -02:00