From 253563e21184e65ed2004dca9437cdbd3185125c Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 3 Mar 2015 16:00:07 -0500 Subject: [PATCH] Energy Tweaks --- code/game/objects/items/weapons/stunbaton.dm | 25 +++++-------------- .../mob/living/silicon/robot/robot_modules.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 4 +-- .../projectiles/guns/energy/special.dm | 6 ++--- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index cb991abd057..8b6cf3aa2b5 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -121,8 +121,8 @@ user.do_attack_animation(L) baton_stun(L, user) else - L.visible_message("[L] has been prodded with [src] by [user]. Luckily it was off.", \ - "You've been prodded with [src] by [user]. Luckily it was off") + L.visible_message("[user] has prodded [L] with [src]. Luckily it was off.", \ + "[user] has prodded you with [src]. Luckily it was off") return else ..() @@ -138,8 +138,8 @@ L.Weaken(stunforce) L.apply_effect(STUTTER, stunforce) - L.visible_message("[L] has been stunned with [src] by [user]!", \ - "You've been stunned with [src] by [user]!") + L.visible_message("[user] has stunned [L] with [src]!", \ + "[user] has stunned you with [src]!") playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) if(isrobot(loc)) @@ -163,22 +163,9 @@ ..() //secborg stun baton module -/obj/item/weapon/melee/baton/robot - hitcost = 500 +/obj/item/weapon/melee/baton/loaded/robot + hitcost = 1000 -/obj/item/weapon/melee/baton/robot/New() - ..() - return - -/obj/item/weapon/melee/baton/robot/attack_self(mob/user) - //try to find our power cell - var/mob/living/silicon/robot/R = loc - if (istype(R)) - bcell = R.cell - return ..() - -/obj/item/weapon/melee/baton/robot/attackby(obj/item/weapon/W, mob/user, params) - return /obj/item/weapon/melee/baton/loaded/ntcane name = "fancy cane" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 580322a9517..3ef82b89f72 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -201,7 +201,7 @@ src.modules += new /obj/item/device/flashlight/seclite(src) src.modules += new /obj/item/device/flash/cyborg(src) src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/robot(src) + src.modules += new /obj/item/weapon/melee/baton/loaded/robot(src) src.modules += new /obj/item/weapon/gun/energy/disabler/cyborg(src) src.modules += new /obj/item/taperoll/police(src) src.modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 3e6679a189e..650369e7190 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -63,8 +63,8 @@ obj/item/weapon/gun/energy/laser/retro return 1 if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc - if(R && R.cell && R.cell.charge >= 500) - R.cell.use(500) + if(R && R.cell && R.cell.charge >= 83) + R.cell.use(83) in_chamber = new/obj/item/projectile/beam(src) return 1 return 0 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 84db4fa444f..f82359d028f 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -325,7 +325,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc if(R && R.cell) - if(R.cell.use(charge_cost)) //Take power from the borg... + if(R.cell.use(charge_cost/10)) //Take power from the borg... power_supply.give(charge_cost) //... to recharge the shot update_icon() @@ -342,7 +342,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. fire_sound = 'sound/weapons/Gunshot_smg.ogg' cell_type = "/obj/item/weapon/stock_parts/cell/secborg" projectile_type = "/obj/item/projectile/bullet/midbullet3" - charge_cost = 300 //Yeah, let's NOT give them a 300 round clip that recharges, 20 is more reasonable and will actually hurt the borg's battery for overuse. + charge_cost = 200 //Yeah, let's NOT give them a 300 round clip that recharges, 20 is more reasonable and will actually hurt the borg's battery for overuse. var/charge_tick = 0 var/recharge_time = 5 @@ -369,6 +369,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc if(R && R.cell) - if(R.cell.use(charge_cost)) //Take power from the borg... + if(R.cell.use(charge_cost/10)) //Take power from the borg... power_supply.give(charge_cost) //...to recharge the shot return 1 \ No newline at end of file