Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364

[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
This commit is contained in:
deathride58
2018-04-27 09:21:07 +00:00
committed by GitHub
2 changed files with 4 additions and 7 deletions
@@ -40,6 +40,8 @@
var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable)
if(!AM)
return FALSE
if(istype(AM, /obj/item/gun/energy))
return FALSE
if(!assembly)
return FALSE // Pointless to do everything else if there's no battery to draw from.
var/obj/item/stock_parts/cell/cell = AM.get_cell()