Jordan Brown 463945ec76 Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun ...

Fix runtimes when energy guns are deleted

2018-06-25 14:12:31 -05:00

..

ballistic

Merge branch 'master' into upstream-merge-37529

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

energy

Standardizes and cleans up some admin messages & logging

2018-05-31 22:41:31 -05:00

magic

Merge branch 'master' into upstream-merge-37529

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

misc

Fixes and adds blast cannons to traitor science uplink items (#38093)

2018-06-21 18:38:46 -05:00

ballistic.dm

Uppercases slot defines.

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

energy.dm

Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun

2018-06-25 14:12:31 -05:00

magic.dm

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

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