From e7adce2163a2c914cea7c4d64d7acffe1689ad1d Mon Sep 17 00:00:00 2001 From: Atlantis Date: Fri, 14 Aug 2015 22:51:59 +0200 Subject: [PATCH 1/3] Better feedback - Attempting to hack already hacked APC now correctly produces "You already control this APC" message. --- .../malfunction/newmalf_ability_trees/HELPERS.dm | 9 ++++----- .../malfunction/newmalf_ability_trees/tree_networking.dm | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm index f757ed5e9e..69794c9af3 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm @@ -163,14 +163,13 @@ command_announcement.Announce(fulltext) -// Proc: get_unhacked_apcs() +// Proc: get_all_apcs() // Parameters: None -// Description: Returns a list of APCs that are not yet hacked. -/proc/get_unhacked_apcs() +// Description: Returns a list of all APCs +/proc/get_all_apcs() var/list/H = list() for(var/obj/machinery/power/apc/A in machines) - if(!A.hacker) - H.Add(A) + H.Add(A) return H diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index 9c3c584d9e..f1bad288ad 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -38,7 +38,7 @@ // END RESEARCH DATUMS // BEGIN ABILITY VERBS -/datum/game_mode/malfunction/verb/basic_encryption_hack(obj/machinery/power/apc/A as obj in get_unhacked_apcs()) +/datum/game_mode/malfunction/verb/basic_encryption_hack(obj/machinery/power/apc/A as obj in get_all_apcs()) set category = "Software" set name = "Basic Encryption Hack" set desc = "10 CPU - Basic encryption hack that allows you to overtake APCs on the station." From 20961ae9b6ef07436c58def27df0dd13e54e4652 Mon Sep 17 00:00:00 2001 From: Atlantis Date: Fri, 14 Aug 2015 23:00:53 +0200 Subject: [PATCH 2/3] Corrects wrongly displayed CPU generation. - Value displayed was per decisecond, not per second. Corrected. --- code/modules/mob/living/silicon/ai/ai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 888622ff38..76fc836269 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -830,7 +830,7 @@ var/list/ai_verbs_default = list( if(src.research) stat(null, "Available CPU: [src.research.stored_cpu] TFlops") stat(null, "Maximal CPU: [src.research.max_cpu] TFlops") - stat(null, "CPU generation rate: [src.research.cpu_increase_per_tick] TFlops/s") + stat(null, "CPU generation rate: [src.research.cpu_increase_per_tick * 10] TFlops/s") stat(null, "Current research focus: [src.research.focus ? src.research.focus.name : "None"]") if(src.research.focus) stat(null, "Research completed: [round(src.research.focus.invested, 0.1)]/[round(src.research.focus.price)]") From 7e8bfde893587099495950dd8561c2cdc7a2704c Mon Sep 17 00:00:00 2001 From: Atlantis Date: Fri, 14 Aug 2015 23:03:48 +0200 Subject: [PATCH 3/3] Increases CPU income from APC hacking - CPU generation from APCs is now doubled --- code/modules/mob/living/silicon/ai/ai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 76fc836269..937f25a0b4 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -769,7 +769,7 @@ var/list/ai_verbs_default = list( // Off-Station APCs should not count towards CPU generation. for(var/obj/machinery/power/apc/A in hacked_apcs) if(A.z in config.station_levels) - cpu_gain += 0.002 + cpu_gain += 0.004 cpu_storage += 10 research.max_cpu = cpu_storage + override_CPUStorage