From ed5dd1eeb5c0460d6321f9660fe500bc418b4ac1 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Wed, 14 Nov 2012 18:06:33 +0000 Subject: [PATCH] Added a cyborg rename module, and amended the names of all the cyborg modules to be lowercase, and reference "cyborgs" instead of "borgs". Removed an outdated robot.dm comment. Fixed the assume direct control logging. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5063 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/mecha/mech_fabricator.dm | 1 + .../objects/items/robot/robot_upgrades.dm | 50 ++++++++++++------- code/modules/admin/verbs/debug.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index f1b15e23fd..442e3b9dd8 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -113,6 +113,7 @@ "Cyborg Upgrade Modules" = list( /obj/item/borg/upgrade/reset, + /obj/item/borg/upgrade/rename, /obj/item/borg/upgrade/restart, /obj/item/borg/upgrade/vtec, /obj/item/borg/upgrade/tasercooler, diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 22dabe6f2e..28d38f7a0a 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -1,7 +1,7 @@ // robot_upgrades.dm // Contains various borg upgrades. -/obj/item/borg/upgrade/ +/obj/item/borg/upgrade name = "A borg upgrade module." desc = "Protected by FRM." icon = 'icons/obj/module.dmi' @@ -19,9 +19,9 @@ return 0 -/obj/item/borg/upgrade/reset/ - name = "Borg module reset board" - desc = "Used to reset a borg's module. Destroys any other upgrades applied to the borg." +/obj/item/borg/upgrade/reset + name = "cyborg module reset board" + desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the cyborg." icon_state = "cyborg_upgrade1" require_module = 1 @@ -39,17 +39,33 @@ return 1 +/obj/item/borg/upgrade/rename + name = "cyborg reclassification board" + desc = "Used to rename a cyborg." + icon_state = "cyborg_upgrade1" + construction_cost = list("metal"=35000) + var/heldname = "default name" -/obj/item/borg/upgrade/restart/ - name = "Borg emergency restart module" - desc = "Used to force a restart of a disabled-but-repaired borg, bringing it back online." +/obj/item/borg/upgrade/rename/attack_self(mob/user as mob) + heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN) + +/obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R) + if(..()) return 0 + R.name = heldname + R.real_name = heldname + + return 1 + +/obj/item/borg/upgrade/restart + name = "cyborg emergency restart module" + desc = "Used to force a restart of a disabled-but-repaired cyborg, bringing it back online." construction_cost = list("metal"=60000 , "glass"=5000) icon_state = "cyborg_upgrade1" /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the borg before using this module!" + usr << "You have to repair the cyborg before using this module!" return 0 if(!R.key) @@ -61,9 +77,9 @@ return 1 -/obj/item/borg/upgrade/vtec/ - name = "Borg VTEC Module" - desc = "Used to kick in a borgs VTEC systems, increasing their speed." +/obj/item/borg/upgrade/vtec + name = "cyborg VTEC Module" + desc = "Used to kick in a cyborg's VTEC systems, increasing their speed." construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000) icon_state = "cyborg_upgrade2" require_module = 1 @@ -78,9 +94,9 @@ return 1 -/obj/item/borg/upgrade/tasercooler/ - name = "Borg Rapid Taser Cooling Module" - desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate.." +/obj/item/borg/upgrade/tasercooler + name = "cyborg Rapid Taser Cooling Module" + desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate." construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500) icon_state = "cyborg_upgrade3" require_module = 1 @@ -113,9 +129,9 @@ return 1 -/obj/item/borg/upgrade/jetpack/ - name = "Mining Borg Jetpack" - desc = "A carbon dioxide jetpack suitable for low-gravity mining operations" +/obj/item/borg/upgrade/jetpack + name = "mining cyborg jetpack" + desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000) icon_state = "cyborg_upgrade3" require_module = 1 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 1f7fe8870f..9eb1a301e2 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -413,13 +413,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else var/mob/dead/observer/ghost = new/mob/dead/observer(M,1) ghost.ckey = M.ckey + message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1) + log_admin("[key_name(usr)] assumed direct control of [M].") var/mob/adminmob = src.mob M.ckey = src.ckey if( isobserver(adminmob) ) del(adminmob) feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - log_admin("[key_name(usr)] assumed direct control of [M].") - message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e2fbe9b23e..d743a13d9b 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -972,7 +972,7 @@ s_active.close(src) if(module) - if(module.type == /obj/item/weapon/robot_module/janitor) //you'd think checking the module would work + if(module.type == /obj/item/weapon/robot_module/janitor) var/turf/tile = loc if(isturf(tile)) tile.clean_blood()