From f61225f3b314df6abb0308b219bfaab94fa204cf Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 7 Jul 2016 15:05:33 -0500 Subject: [PATCH 1/6] EMP-Binary --- code/modules/mob/living/silicon/robot/component.dm | 10 +++++++++- code/modules/mob/living/silicon/robot/robot.dm | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index c6ae0f57ddf..a2529c99ee0 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -9,6 +9,7 @@ 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. @@ -95,6 +96,7 @@ external_type = /obj/item/robot_parts/robot_component/binary_communication_device energy_consumption = 0 max_damage = 30 + component_disabled = 0 /datum/robot_component/camera name = "camera" @@ -121,7 +123,13 @@ /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() + return C && C.installed == 1 && C.toggled && C.is_powered() && !C.component_disabled + +/mob/living/silicon/robot/proc/disable_component(module_name, emp_duration) + var/datum/robot_component/D = get_component(module_name) + D.component_disabled = 1 + spawn (emp_duration) + D.component_disabled = 0 // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 81c781b51ff..20e30ffc5c0 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1470,3 +1470,10 @@ var/list/robot_verbs_default = list( status_flags &= ~CANPUSH notify_ai(2) + +/mob/living/silicon/robot/emp_act(severity) + ..() + if(1) + disable_component("comms", 360) + if(2) + disable_component("comms", 60) From 5e8c2599d161a9410e225ac2062b2fbc77876e0a Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 7 Jul 2016 21:44:15 -0500 Subject: [PATCH 2/6] What does the fox say? --- code/modules/mob/living/silicon/robot/component.dm | 5 ++--- code/modules/mob/living/silicon/robot/robot.dm | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index a2529c99ee0..e01775bedce 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -96,7 +96,6 @@ external_type = /obj/item/robot_parts/robot_component/binary_communication_device energy_consumption = 0 max_damage = 30 - component_disabled = 0 /datum/robot_component/camera name = "camera" @@ -125,10 +124,10 @@ 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, emp_duration) +/mob/living/silicon/robot/proc/disable_component(module_name, duration) var/datum/robot_component/D = get_component(module_name) D.component_disabled = 1 - spawn (emp_duration) + spawn(duration) D.component_disabled = 0 // Returns component by it's string name diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 20e30ffc5c0..07f6dff1609 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1473,7 +1473,8 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/emp_act(severity) ..() - if(1) - disable_component("comms", 360) - if(2) - disable_component("comms", 60) + switch(severity) + if(1) + disable_component("comms", 160) + if(2) + disable_component("comms", 60) From e789935c30dc42fb6fd752548b0a5747b32be8e9 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 7 Jul 2016 22:42:24 -0500 Subject: [PATCH 3/6] Update component.dm --- code/modules/mob/living/silicon/robot/component.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index e01775bedce..fb11390c448 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -128,7 +128,7 @@ var/datum/robot_component/D = get_component(module_name) D.component_disabled = 1 spawn(duration) - D.component_disabled = 0 + D.component_disabled = 0 // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name) From 2c259c4e22dde7b2dfaa5467784142bb9ce2fe49 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 7 Jul 2016 23:13:24 -0500 Subject: [PATCH 4/6] Update component.dm --- code/modules/mob/living/silicon/robot/component.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index fb11390c448..e01775bedce 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -128,7 +128,7 @@ var/datum/robot_component/D = get_component(module_name) D.component_disabled = 1 spawn(duration) - D.component_disabled = 0 + D.component_disabled = 0 // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name) From 7b61546f9894ffbae0a601c318f7a66d7b1c6042 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Fri, 8 Jul 2016 01:16:51 -0500 Subject: [PATCH 5/6] Tabtest-tabtab-testtab --- code/modules/mob/living/silicon/robot/component.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index e01775bedce..cbf2e34a020 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -125,10 +125,10 @@ 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 = 1 - spawn(duration) - D.component_disabled = 0 + var/datum/robot_component/D = get_component(module_name) + D.component_disabled = 1 + spawn(duration) + D.component_disabled = 0 // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name) From edda2a8cfcc4e1def6b20fc2b6832d1c52e58585 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Fri, 8 Jul 2016 13:37:29 -0500 Subject: [PATCH 6/6] operator_changes --- code/modules/mob/living/silicon/robot/component.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index cbf2e34a020..95a3a9f8539 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -126,9 +126,9 @@ /mob/living/silicon/robot/proc/disable_component(module_name, duration) var/datum/robot_component/D = get_component(module_name) - D.component_disabled = 1 + D.component_disabled++ spawn(duration) - D.component_disabled = 0 + D.component_disabled-- // Returns component by it's string name /mob/living/silicon/robot/proc/get_component(var/component_name)