CitadelStationBot eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012) ...

* Fix inconsistent energy gun suicide (#38252)

* Fix inconsistent energy gun suicide

2018-06-05 11:18:27 -07:00

..

ballistic

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

energy

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

magic

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

misc

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

ballistic.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

energy.dm

[MIRROR] Fix inconsistent energy gun suicide (#7012)

2018-06-05 11:18:27 -07:00

magic.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00