From db8ecd2e6ec773ba1fddc3f43733dfb5f02d1fa2 Mon Sep 17 00:00:00 2001 From: Ansari Date: Mon, 2 Oct 2017 18:11:04 +0800 Subject: [PATCH 1/2] Add two ammo_casing. Increase energy cost to 300. --- code/modules/projectiles/ammunition/energy.dm | 6 ++++++ code/modules/projectiles/guns/energy/laser.dm | 1 + code/modules/projectiles/guns/energy/stun.dm | 1 + 3 files changed, 8 insertions(+) diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index cdb0e063184..27337b827f5 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -11,6 +11,9 @@ projectile_type = /obj/item/projectile/beam/laser select_name = "kill" +/obj/item/ammo_casing/energy/laser/cyborg //to balance cyborg energy cost seperately + e_cost = 300 + /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/item/projectile/beam/laser e_cost = 83 @@ -126,6 +129,9 @@ e_cost = 50 fire_sound = 'sound/weapons/taser2.ogg' +/obj/item/ammo_casing/energy/disabler/cyborg //seperate balancing for cyborg, again + e_cost = 300 + /obj/item/ammo_casing/energy/plasma projectile_type = /obj/item/projectile/plasma select_name = "plasma burst" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 7a039ca29df..b26418b4c45 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -46,6 +46,7 @@ /obj/item/weapon/gun/energy/laser/cyborg can_charge = 0 desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?" + ammo_type = list(/obj/item/ammo_casing/energy/laser/cyborg) origin_tech = null /obj/item/weapon/gun/energy/laser/cyborg/newshot() diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 2113a2c1b81..b1cd137ee43 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -52,6 +52,7 @@ /obj/item/weapon/gun/energy/disabler/cyborg name = "cyborg disabler" desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating." + ammo_type = list(/obj/item/ammo_casing/energy/disabler/cyborg) can_charge = 0 /obj/item/weapon/gun/energy/disabler/cyborg/newshot() From 51dceab69c730adcc7d127fe15c9f5aa7b9e205c Mon Sep 17 00:00:00 2001 From: Ansari Date: Tue, 3 Oct 2017 16:39:04 +0800 Subject: [PATCH 2/2] Change the e-cost on both gun to 250 --- code/modules/projectiles/ammunition/energy.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 27337b827f5..da9a2cf16f2 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -12,7 +12,7 @@ select_name = "kill" /obj/item/ammo_casing/energy/laser/cyborg //to balance cyborg energy cost seperately - e_cost = 300 + e_cost = 250 /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/item/projectile/beam/laser @@ -130,7 +130,7 @@ fire_sound = 'sound/weapons/taser2.ogg' /obj/item/ammo_casing/energy/disabler/cyborg //seperate balancing for cyborg, again - e_cost = 300 + e_cost = 250 /obj/item/ammo_casing/energy/plasma projectile_type = /obj/item/projectile/plasma