From 3a3f7e72189b7d51e915b69b228809ab3eeb3037 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Fri, 8 Jul 2016 15:08:37 -0500 Subject: [PATCH] Revert "Merge branch 'BACON!' of https://github.com/Chakirski/Paradise into BACON!" This reverts commit 5d0cf2b3f8ba34a8c64b0245b8341d87c922c999, reversing changes made to b7897435c3d4c6d7c14b1df60db0e09fa8064c5c. --- code/modules/mob/living/silicon/robot/component.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 95a3a9f8539..c6ae0f57ddf 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -9,7 +9,6 @@ var/electronics_damage = 0 var/energy_consumption = 0 var/max_damage = 30 - var/component_disabled = 0 var/mob/living/silicon/robot/owner // The actual device object that has to be installed for this. @@ -122,13 +121,7 @@ /mob/living/silicon/robot/proc/is_component_functioning(module_name) var/datum/robot_component/C = components[module_name] - return C && C.installed == 1 && C.toggled && C.is_powered() && !C.component_disabled - -/mob/living/silicon/robot/proc/disable_component(module_name, duration) - var/datum/robot_component/D = get_component(module_name) - D.component_disabled++ - spawn(duration) - D.component_disabled-- + return C && C.installed == 1 && C.toggled && C.is_powered() // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name)