From f928b624924bebe41df4bf58ee39072757638c1b Mon Sep 17 00:00:00 2001 From: ProperPants Date: Sun, 27 Mar 2016 23:23:38 -0400 Subject: [PATCH] Surprise commit. Fixed my borking of engi borg reduced cable coil. Removed plasteel from engi borg. Formatting fixes. --- .../objects/items/stacks/sheets/sheet_types.dm | 18 +++++++++--------- .../living/silicon/robot/drone/drone_items.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 3 +-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0ff7e698f61..fdb7a723539 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -132,15 +132,15 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ flags = CONDUCT origin_tech = "materials=2" - /obj/item/stack/sheet/plasteel/cyborg - name = "plasteel" - singular_name = "plasteel sheet" - desc = "This sheet is an alloy of iron and plasma." - icon_state = "sheet-plasteel" - item_state = "sheet-metal" - materials = list() - throwforce = 10.0 - flags = CONDUCT +/obj/item/stack/sheet/plasteel/cyborg + name = "plasteel" + singular_name = "plasteel sheet" + desc = "This sheet is an alloy of iron and plasma." + icon_state = "sheet-plasteel" + item_state = "sheet-metal" + materials = list() + throwforce = 10.0 + flags = CONDUCT /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) recipes = plasteel_recipes diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 78f193e65ab..99218fb699e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -383,4 +383,4 @@ stack = stack_plastic stack.amount++ - decompiler.stored_comms[type]--; + decompiler.stored_comms[type]-- diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 1121ee5f28d..154d0f88e41 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,10 +172,9 @@ stacktypes = list( /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel = 50, /obj/item/stack/sheet/glass = 50, /obj/item/stack/sheet/rglass = 50, - /obj/item/stack/cable_coil/cyborg = 30, + /obj/item/stack/cable_coil/cyborg = 50, /obj/item/stack/rods = 30, /obj/item/stack/tile/plasteel = 20 )