From b25bcbbfab34036128b22c369a8d4457a74367ed Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Feb 2018 00:47:39 -0600 Subject: [PATCH] [MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. (#5315) * Fixes power cell name and makes borgs use a standard high capacity cell. (#35265) * Fixes name for upgraded power cell * Harmonizes battery for cyborgs * Remove duplicate battery code * Fixes power cell name and makes borgs use a standard high capacity cell. --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/transform_procs.dm | 3 --- code/modules/power/cell.dm | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 92f960a5c9..0214f479eb 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -113,7 +113,7 @@ ident = rand(1, 999) if(!cell) - cell = new /obj/item/stock_parts/cell/high(src, 7500) + cell = new /obj/item/stock_parts/cell/high(src) if(lawupdate) make_laws() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index c501984de8..968e6fe983 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -374,9 +374,6 @@ var/mob/living/silicon/robot/R = new /mob/living/silicon/robot(loc) - // cyborgs produced by Robotize get an automatic power cell - R.cell = new /obj/item/stock_parts/cell/high(R, 7500) - R.gender = gender R.invisibility = 0 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 75d6d1778f..608a63ce8f 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -170,7 +170,7 @@ charge = 0 /obj/item/stock_parts/cell/upgraded - name = "high-capacity power cell" + name = "upgraded power cell" desc = "A power cell with a slightly higher capacity than normal!" maxcharge = 2500 materials = list(MAT_GLASS=50)