From 034adc9069f31a306bf71668539b1b4ad3a77cc1 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Wed, 7 Feb 2018 01:14:31 -0600 Subject: [PATCH 1/4] Show borg position in status panel --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e3df2023664..e6b85a60112 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -533,6 +533,9 @@ var/list/robot_verbs_default = list( else stat(null, text("No Cell Inserted!")) +/mob/living/silicon/robot/proc/show_position() + var/turf/pos = get_turf(src) + stat(null, text("Position: ([pos.x], [pos.y], [pos.z])")) // update the status screen display /mob/living/silicon/robot/Stat() @@ -540,6 +543,7 @@ var/list/robot_verbs_default = list( statpanel("Status") if(client.statpanel == "Status") show_cell_power() + show_position() /mob/living/silicon/robot/restrained() return 0 From 57b955d915a648b14b23a0f78c91eef7fed659e0 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Wed, 7 Feb 2018 01:15:13 -0600 Subject: [PATCH 2/4] Put power warning on emote CD --- code/modules/mob/living/silicon/robot/emote.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index bf7f413708f..2351f90a972 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -166,6 +166,9 @@ set category = "Robot Commands" set name = "Power Warning" + if(handle_emote_CD()) + return + if(!is_component_functioning("power cell") || !cell || !cell.charge) visible_message("The power warning light on [src] flashes urgently.",\ "You announce you are operating in low power mode.") From 44f6def6afdc2fe7e0a5bd1ec401684c8303e18a Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Thu, 8 Feb 2018 00:09:37 -0600 Subject: [PATCH 3/4] Increase borg power warning CD to 5 seconds --- code/modules/mob/living/silicon/robot/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 2351f90a972..72df46e226f 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -166,7 +166,7 @@ set category = "Robot Commands" set name = "Power Warning" - if(handle_emote_CD()) + if(handle_emote_CD(50)) return if(!is_component_functioning("power cell") || !cell || !cell.charge) From e4e0c178a13ec72f71f19c57c7d4101081fadf94 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Sat, 3 Mar 2018 17:56:21 -0600 Subject: [PATCH 4/4] Revert "Show borg position in status panel" This reverts commit 034adc9069f31a306bf71668539b1b4ad3a77cc1. --- code/modules/mob/living/silicon/robot/robot.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e6b85a60112..e3df2023664 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -533,9 +533,6 @@ var/list/robot_verbs_default = list( else stat(null, text("No Cell Inserted!")) -/mob/living/silicon/robot/proc/show_position() - var/turf/pos = get_turf(src) - stat(null, text("Position: ([pos.x], [pos.y], [pos.z])")) // update the status screen display /mob/living/silicon/robot/Stat() @@ -543,7 +540,6 @@ var/list/robot_verbs_default = list( statpanel("Status") if(client.statpanel == "Status") show_cell_power() - show_position() /mob/living/silicon/robot/restrained() return 0