Skip to content

Commit

Permalink
bugfix: EMP no longer discharge borgs weaponry (ss220-space#3864)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladisvell authored and SuhEugene committed Nov 24, 2023
1 parent b5c4f0a commit e0a07a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/game/objects/items/robot/robot_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
icon_state = "emittercannon"
var/charge_cost = 750

/obj/item/gun/energy/emittercannon/emp_act(severity)
return

/obj/item/borg/overdrive
name = "Overdrive"
icon = 'icons/obj/decals.dmi'
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/energy/stun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@
/obj/item/gun/energy/disabler/cyborg/newshot()
..()
robocharge()

/obj/item/gun/energy/disabler/cyborg/emp_act(severity)
return

0 comments on commit e0a07a6

Please sign in to comment.