From b5c073e58ba5c87f6299c6cfda19005e421a3282 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 21:32:46 -0400 Subject: [PATCH] Removes plasteel from drones and borgs. --- code/game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- code/game/objects/items/stacks/stack.dm | 4 ---- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 -- .../mob/living/silicon/robot/drone/drone_items.dm | 10 +--------- code/modules/mob/living/silicon/robot/robot_modules.dm | 3 --- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index fdb7a723539..215fea9aa98 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -131,7 +131,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ throwforce = 10.0 flags = CONDUCT origin_tech = "materials=2" - +/* Just in case we ever decide to use it /obj/item/stack/sheet/plasteel/cyborg name = "plasteel" singular_name = "plasteel sheet" @@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ materials = list() throwforce = 10.0 flags = CONDUCT - +*/ /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) recipes = plasteel_recipes return ..() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 97081779c39..09c0cf69309 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -34,10 +34,6 @@ /obj/item/stack/attack_self(mob/user as mob) list_recipes(user) -/obj/item/stack/sheet/plasteel/cyborg/attack_self(mob/user as mob) - user << "You lack the subroutines necessary to build more complex structures with that material." - return - /obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist) if (!recipes) return diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index ad805ca9312..6868765250b 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -20,7 +20,6 @@ // We need to keep track of a few module items so we don't need to do list operations // every time we need them. These get set in New() after the module is chosen. var/obj/item/stack/sheet/metal/cyborg/stack_metal = null - var/obj/item/stack/sheet/plasteel/cyborg/stack_plasteel = null //does stack_plasteel work here? var/obj/item/stack/sheet/wood/cyborg/stack_wood = null var/obj/item/stack/sheet/glass/cyborg/stack_glass = null var/obj/item/stack/sheet/mineral/plastic/cyborg/stack_plastic = null @@ -62,7 +61,6 @@ //Grab stacks. stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module - stack_plasteel = locate(/obj/item/stack/sheet/plasteel/cyborg) in src.module stack_wood = locate(/obj/item/stack/sheet/wood/cyborg) in src.module stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in src.module stack_plastic = locate(/obj/item/stack/sheet/mineral/plastic/cyborg) in src.module 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 99218fb699e..2de1ce34cdd 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -157,7 +157,7 @@ icon = 'icons/obj/device.dmi' icon_state = "decompiler" - //Metal, plasteel, glass, wood, plastic. + //Metal, glass, wood, plastic. var/list/stored_comms = list( "metal" = 0, "plasteel" = 0, @@ -213,7 +213,6 @@ new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) stored_comms["metal"] += 15 - stored_comms["plasteel"] += 15 stored_comms["glass"] += 15 stored_comms["wood"] += 5 stored_comms["plastic"] += 5 @@ -244,7 +243,6 @@ stored_comms["plastic"]++ stored_comms["plastic"]++ stored_comms["glass"]++ - stored_comms["plasteel"]++ else if(istype(W,/obj/item/trash)) stored_comms["metal"]++ stored_comms["plastic"]++ @@ -254,7 +252,6 @@ stored_comms["metal"]++ stored_comms["glass"]++ stored_comms["glass"]++ - stored_comms["plasteel"]++ else if(istype(W,/obj/item/ammo_casing)) stored_comms["metal"]++ else if(istype(W,/obj/item/weapon/shard/shrapnel)) @@ -361,11 +358,6 @@ stack_metal = new /obj/item/stack/sheet/metal/cyborg(src.module) stack_metal.amount = 1 stack = stack_metal - if("plasteel") - if(!stack_plasteel) - stack_plasteel = new /obj/item/stack/sheet/plasteel/cyborg(src.module) - stack_plasteel.amount = 1 - stack = stack_plasteel if("glass") if(!stack_glass) stack_glass = new /obj/item/stack/sheet/glass/cyborg(src.module) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3bedf5e8097..f9277d4230d 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,7 +172,6 @@ stacktypes = list( /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel/cyborg = 50, /obj/item/stack/sheet/glass = 50, /obj/item/stack/sheet/rglass = 50, /obj/item/stack/cable_coil/cyborg = 50, @@ -462,13 +461,11 @@ module_type = "Engineer" stacktypes = list( /obj/item/stack/sheet/wood = 10, - /obj/item/stack/sheet/mineral/plastic = 10, /obj/item/stack/sheet/rglass = 50, /obj/item/stack/tile/wood = 20, /obj/item/stack/rods = 30, /obj/item/stack/tile/plasteel = 20, /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel/cyborg = 50, /obj/item/stack/sheet/glass = 50, /obj/item/stack/cable_coil/cyborg = 30 )