From e6f31fae1a5187dc55cc09fde95e7106402e1ecd Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Thu, 9 Feb 2012 02:38:15 +0000 Subject: [PATCH] Amended feedback vars from last commit. New vars are as follows. cyborg_frames_built cyborg_birth cyborg_mmis_filled cyborg_ais_created cyborg_standard cyborg_service cyborg_miner cyborg_medical cyborg_security cyborg_engineering cyborg_janitor git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3065 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/computer/ai_core.dm | 2 +- code/game/objects/items/robot_parts.dm | 2 +- code/modules/mob/living/carbon/brain/MMI.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index cb7d18c7184..0d58f013629 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -154,7 +154,7 @@ playsound(loc, 'Screwdriver.ogg', 50, 1) user << "\blue You connect the monitor." new /mob/living/silicon/ai ( loc, laws, brain ) - feedback_inc("ais_created",1) + feedback_inc("cyborg_ais_created",1) del(src) /obj/structure/AIcore/deactivated diff --git a/code/game/objects/items/robot_parts.dm b/code/game/objects/items/robot_parts.dm index 671164bca69..83675375da6 100644 --- a/code/game/objects/items/robot_parts.dm +++ b/code/game/objects/items/robot_parts.dm @@ -207,7 +207,7 @@ W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. O.mmi = W - feedback_inc("cyborgs_created",1) + feedback_inc("cyborg_birth",1) del(src) else diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 886ad66fbda..1852989ff9c 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -42,7 +42,7 @@ locked = 1 - feedback_inc("mmis_filled",1) + feedback_inc("cyborg_mmis_filled",1) return diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d429c852907..a0209ededd8 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -71,7 +71,7 @@ hands.icon_state = "standard" icon_state = "robot" modtype = "Stand" - feedback_inc("standard_cyborgs",1) + feedback_inc("cyborg_standard",1) if("Service") module = new /obj/item/weapon/robot_module/butler(src) @@ -88,14 +88,14 @@ else icon_state = "Service2" modtype = "Butler" - feedback_inc("service_cyborgs",1) + feedback_inc("cyborg_service",1) if("Miner") module = new /obj/item/weapon/robot_module/miner(src) hands.icon_state = "miner" icon_state = "Miner" modtype = "Miner" - feedback_inc("miner_cyborgs",1) + feedback_inc("cyborg_miner",1) if("Medical") module = new /obj/item/weapon/robot_module/medical(src) @@ -103,28 +103,28 @@ icon_state = "surgeon" modtype = "Med" nopush = 1 - feedback_inc("medical_cyborgs",1) + feedback_inc("cyborg_medical",1) if("Security") module = new /obj/item/weapon/robot_module/security(src) hands.icon_state = "security" icon_state = "bloodhound" modtype = "Sec" - feedback_inc("security_cyborgs",1) + feedback_inc("cyborg_security",1) if("Engineering") module = new /obj/item/weapon/robot_module/engineering(src) hands.icon_state = "engineer" icon_state = "landmate" modtype = "Eng" - feedback_inc("engineering_cyborgs",1) + feedback_inc("cyborg_engineering",1) if("Janitor") module = new /obj/item/weapon/robot_module/janitor(src) hands.icon_state = "janitor" icon_state = "mopgearrex" modtype = "Jan" - feedback_inc("janitor_cyborgs",1) + feedback_inc("cyborg_janitor",1) overlays -= "eyes" //Takes off the eyes that it started with updateicon()