Merge pull request #8080 from Ghommie/Ghommie-cit8

Buffing sec borg guns.
This commit is contained in:
deathride58
2019-03-04 06:10:26 -05:00
committed by GitHub
3 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -192,7 +192,7 @@
/obj/item/stock_parts/cell/secborg
name = "security borg rechargeable D battery"
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
maxcharge = 1750 //35/17/8 disabler/laser/taser shots.
materials = list(MAT_GLASS=40)
/obj/item/stock_parts/cell/secborg/empty/Initialize()
@@ -50,7 +50,8 @@
can_charge = FALSE
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
selfcharge = EGUN_SELFCHARGE_BORG
charge_delay = 6
cell_type = /obj/item/stock_parts/cell/secborg
charge_delay = 3
/obj/item/gun/energy/laser/cyborg/emp_act()
return
+4 -2
View File
@@ -29,7 +29,8 @@
can_flashlight = FALSE
can_charge = FALSE
selfcharge = EGUN_SELFCHARGE_BORG
charge_delay = 10
cell_type = /obj/item/stock_parts/cell/secborg
charge_delay = 5
/obj/item/gun/energy/e_gun/advtaser/cyborg/mean
desc = "An integrated hybrid taser that draws directly from a cyborg's power cell."
@@ -49,7 +50,8 @@
desc = "An integrated disabler that draws from a cyborg's power cell. This one contains a limiter to prevent the cyborg's power cell from overheating."
can_charge = FALSE
selfcharge = EGUN_SELFCHARGE_BORG
charge_delay = 10
cell_type = /obj/item/stock_parts/cell/secborg
charge_delay = 5
/obj/item/gun/energy/disabler/cyborg/mean
desc = "An integrated disabler that draws from a cyborg's power cell."