cyborg laser fix (#16399)

This commit is contained in:
SteelSlayer
2021-07-20 08:18:28 +00:00
committed by GitHub
parent c5e593b2bf
commit dab535ef16
3 changed files with 14 additions and 10 deletions
@@ -416,7 +416,11 @@
/obj/item/clothing/mask/gas/sechailer/cyborg
)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
special_rechargables = list(/obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg)
special_rechargables = list(
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/disabler/cyborg,
/obj/item/gun/energy/laser/cyborg
)
/obj/item/robot_module/security/update_cells(unlink_cell = FALSE)
var/obj/item/melee/baton/B = locate(/obj/item/melee/baton/loaded) in modules
+9
View File
@@ -203,3 +203,12 @@
var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
if(R.cell.use(shot.e_cost)) //Take power from the borg...
cell.give(shot.e_cost) //... to recharge the shot
/obj/item/gun/energy/cyborg_recharge(coeff, emagged)
if(cell.charge < cell.maxcharge)
var/obj/item/ammo_casing/energy/E = ammo_type[select]
cell.give(E.e_cost * coeff)
on_recharge()
update_icon()
else
charge_tick = 0
@@ -55,12 +55,3 @@
/obj/item/gun/energy/disabler/cyborg/newshot()
..()
robocharge()
/obj/item/gun/energy/disabler/cyborg/cyborg_recharge(coeff, emagged)
if(cell.charge < cell.maxcharge)
var/obj/item/ammo_casing/energy/E = ammo_type[select]
cell.give(E.e_cost * coeff)
on_recharge()
update_icon()
else
charge_tick = 0