cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a smaller device cell for use in non-weapon devices

Browse Source
This commit is contained in:
Anewbe
2016-10-08 15:34:18 -05:00
parent 426659c1d2
commit 771d8b9e4b
9 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/projectiles/guns/energy.dm
View File

@@ -34,7 +34,10 @@
/obj/item/weapon/gun/energy/New()
..()
power_supply = new /obj/item/weapon/cell/device(src)
if(cell_type)
power_supply = new cell_type(src)
else
power_supply = new /obj/item/weapon/cell/device/weapon(src)
if(self_recharge)
processing_objects.Add(src)
update_icon()
@@ -168,7 +171,7 @@
/obj/item/weapon/gun/energy/proc/start_recharge()
if(power_supply == null)
power_supply = new /obj/item/weapon/cell/device(src)
power_supply = new /obj/item/weapon/cell/device/weapon(src)
self_recharge = 1
processing_objects.Add(src)
update_icon()

6
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -29,9 +29,11 @@
desc = "A modified version of the HI G40E, this one fires less concentrated energy bolts designed for target practice."
projectile_type = /obj/item/projectile/beam/practice
cell_type = /obj/item/weapon/cell/device
firemodes = list(
list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 240),
list(mode_name="suppressive", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 60),
list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 48),
list(mode_name="suppressive", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 12),
)
obj/item/weapon/gun/energy/retro