From 37aef47198e019ba7f9c19d9fab963e02a3e2965 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 27 Jul 2013 00:48:50 -0700 Subject: [PATCH 1/2] Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode. --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/living/silicon/robot/robot_modules.dm | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 375e77d3219..eb9ef5d85b7 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -148,7 +148,7 @@ if(module) return var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security") - if(crisis) //Leaving this in until it's balanced appropriately. + if(crisis && security_level == SEC_LEVEL_RED) //Leaving this in until it's balanced appropriately. src << "\red Crisis mode active. Combat module available." modules+="Combat" var/mod = input("Please, select a module!", "Robot", null, null) in modules diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f0cf94d8e63..fc3a8152661 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -223,13 +223,12 @@ /obj/item/weapon/robot_module/combat name = "combat robot module" - New() src.modules += new /obj/item/borg/sight/thermal(src) - src.modules += new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) + src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src) src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) src.modules += new /obj/item/borg/combat/shield(src) src.modules += new /obj/item/borg/combat/mobility(src) src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair? - src.emag = new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src) + src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) return \ No newline at end of file From 1670ed805110d59e8e8ee678e545d41abe19928a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 27 Jul 2013 01:08:27 -0700 Subject: [PATCH 2/2] Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices. --- code/modules/mob/living/silicon/robot/robot.dm | 3 +++ code/modules/mob/living/silicon/robot/robot_upgrades.dm | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index eb9ef5d85b7..0016ee9720b 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -201,6 +201,7 @@ module_sprites["Red Knight"] = "Security" module_sprites["Black Knight"] = "securityrobot" module_sprites["Bloodhound"] = "bloodhound" + module_sprites["Mark II"] = "droid-combat" if("Engineering") module = new /obj/item/weapon/robot_module/engineering(src) @@ -1247,9 +1248,11 @@ else src << "Something is badly wrong with the sprite selection. Harass a coder." icon_state = module_sprites[1] + base_icon = icon_state return overlays -= "eyes" + base_icon = icon_state updateicon() if (triesleft >= 1) diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm index 7c6db9c7f44..eeb66f46a25 100644 --- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm +++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm @@ -24,14 +24,15 @@ /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) R.uneq_all() - R.hands.icon_state = "nomod" - R.icon_state = "robot" del(R.module) R.module = null R.modtype = "robot" R.real_name = "Cyborg [R.ident]" R.name = R.real_name R.nopush = 0 + R.hands.icon_state = "nomod" + R.base_icon = "robot" + R.icon_state = "robot" R.updateicon() return 1