Merge pull request #4952 from Fox-McCloud/borg-power

Borg Power Use Refactor
This commit is contained in:
TheDZD
2016-07-10 14:23:37 -04:00
committed by GitHub
11 changed files with 73 additions and 107 deletions
+5 -3
View File
@@ -247,10 +247,12 @@
/obj/item/attack_ai(mob/user as mob)
if(istype(src.loc, /obj/item/weapon/robot_module))
//If the item is part of a cyborg module, equip it
if(!isrobot(user)) return
if(!isrobot(user))
return
var/mob/living/silicon/robot/R = user
R.activate_module(src)
R.hud_used.update_robot_modules_display()
if(!R.low_power_mode) //can't equip modules with an empty cell.
R.activate_module(src)
R.hud_used.update_robot_modules_display()
// Due to storage type consolidation this should get used more now.
// I have cleaned it up a little, but it could probably use more. -Sayu
@@ -631,13 +631,6 @@ var/global/list/default_medbay_channels = list(
..()
set_frequency(DTH_FREQ)
/obj/item/device/radio/borg/talk_into()
. = ..()
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
var/datum/robot_component/C = R.components["radio"]
R.use_power(C.energy_consumption)
/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
// ..()
user.set_machine(src)