From f79d33d47b527c2056a63bafb53378e92f5e0e7a Mon Sep 17 00:00:00 2001 From: ProperPants Date: Sun, 27 Mar 2016 21:26:45 -0400 Subject: [PATCH 1/8] This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel. --- .../items/stacks/sheets/sheet_types.dm | 10 ++++ .../mob/living/silicon/robot/drone/drone.dm | 3 ++ .../living/silicon/robot/drone/drone_items.dm | 13 ++++- .../mob/living/silicon/robot/robot_modules.dm | 53 +++++++------------ 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 11db68ec671..0ff7e698f61 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -132,6 +132,16 @@ 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/New(var/loc, var/amount=null) recipes = plasteel_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 c7ba0de8a64..ad805ca9312 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -15,10 +15,12 @@ req_access = list(access_engine, access_robotics) local_transmit = 1 ventcrawler = 2 + magpulse = 1 // 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 @@ -60,6 +62,7 @@ //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 1a3c52ad8be..78f193e65ab 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -157,9 +157,10 @@ icon = 'icons/obj/device.dmi' icon_state = "decompiler" - //Metal, glass, wood, plastic. + //Metal, plasteel, glass, wood, plastic. var/list/stored_comms = list( "metal" = 0, + "plasteel" = 0, "glass" = 0, "wood" = 0, "plastic" = 0 @@ -212,6 +213,7 @@ 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 @@ -242,6 +244,7 @@ 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"]++ @@ -251,6 +254,7 @@ 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)) @@ -357,6 +361,11 @@ 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) @@ -374,4 +383,4 @@ stack = stack_plastic stack.amount++ - decompiler.stored_comms[type]--; \ No newline at end of file + 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 fa17d76570d..1121ee5f28d 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,11 +172,12 @@ 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 = 50, - /obj/item/stack/rods = 15, - /obj/item/stack/tile/plasteel = 15 + /obj/item/stack/cable_coil/cyborg = 30, + /obj/item/stack/rods = 30, + /obj/item/stack/tile/plasteel = 20 ) /obj/item/weapon/robot_module/engineering/New() @@ -198,29 +199,10 @@ src.emag = new /obj/item/borg/stun(src) - var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src) - M.amount = 50 - src.modules += M - - var/obj/item/stack/sheet/rglass/cyborg/R = new /obj/item/stack/sheet/rglass/cyborg(src) - R.amount = 50 - src.modules += R - - var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src) - G.amount = 50 - src.modules += G - - var/obj/item/stack/cable_coil/cyborg/W = new /obj/item/stack/cable_coil/cyborg(src) - W.amount = 50 - src.modules += W - - var/obj/item/stack/rods/Q = new /obj/item/stack/rods(src) - Q.amount = 15 - src.modules += Q - - var/obj/item/stack/tile/plasteel/F = new /obj/item/stack/tile/plasteel(src) //floor tiles not regular plasteel, calm down - F.amount = 15 - src.modules += F + for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia. + var/obj/item/stack/sheet/M = new G(src) + M.amount = stacktypes[G] + src.modules += M fix_modules() @@ -479,14 +461,15 @@ name = "drone module" module_type = "Engineer" stacktypes = list( - /obj/item/stack/sheet/wood = 1, - /obj/item/stack/sheet/mineral/plastic = 1, - /obj/item/stack/sheet/rglass = 5, - /obj/item/stack/tile/wood = 5, - /obj/item/stack/rods = 15, - /obj/item/stack/tile/plasteel = 15, - /obj/item/stack/sheet/metal = 20, - /obj/item/stack/sheet/glass = 20, + /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 = 50, + /obj/item/stack/sheet/glass = 50, /obj/item/stack/cable_coil/cyborg = 30 ) @@ -531,4 +514,4 @@ var/mob/living/silicon/robot/R = src.loc - return (src in R.module.modules) \ No newline at end of file + return (src in R.module.modules) From f928b624924bebe41df4bf58ee39072757638c1b Mon Sep 17 00:00:00 2001 From: ProperPants Date: Sun, 27 Mar 2016 23:23:38 -0400 Subject: [PATCH 2/8] 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 ) From f8f132d2f1c2f86542160a567276f8c12a35da83 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 17:06:38 -0400 Subject: [PATCH 3/8] Should make robots unable to build anything out of plasteel and only plasteel. Here's hoping. --- code/game/objects/items/stacks/stack.dm | 6 +++++- code/modules/mob/living/silicon/robot/robot_modules.dm | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 425b7e0b54f..97081779c39 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -34,6 +34,10 @@ /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 @@ -272,4 +276,4 @@ New(title, recipes, req_amount = 1) src.title = title src.recipes = recipes - src.req_amount = req_amount \ No newline at end of file + src.req_amount = req_amount diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 154d0f88e41..c3c7de3084f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,6 +172,7 @@ 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, @@ -467,7 +468,7 @@ /obj/item/stack/rods = 30, /obj/item/stack/tile/plasteel = 20, /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel = 50, + /obj/item/stack/sheet/plasteel/cyborg = 50, /obj/item/stack/sheet/glass = 50, /obj/item/stack/cable_coil/cyborg = 30 ) From 0d9fc370658e6c007dbf4b965ea01496b259fd3b Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 17:16:31 -0400 Subject: [PATCH 4/8] Forgot a comma. --- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index c3c7de3084f..3bedf5e8097 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,7 +172,7 @@ stacktypes = list( /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel/cyborg = 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, From b5c073e58ba5c87f6299c6cfda19005e421a3282 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 21:32:46 -0400 Subject: [PATCH 5/8] 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 ) From 937a4c7479cd1a918a8069c06488dc6b1237c0e3 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 22:42:12 -0400 Subject: [PATCH 6/8] Forgot something else --- code/game/objects/items/stacks/sheets/sheet_types.dm | 12 +----------- .../mob/living/silicon/robot/drone/drone_items.dm | 1 - 2 files changed, 1 insertion(+), 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 215fea9aa98..11db68ec671 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -131,17 +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" - 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 return ..() 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 2de1ce34cdd..9eaf627858b 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -160,7 +160,6 @@ //Metal, glass, wood, plastic. var/list/stored_comms = list( "metal" = 0, - "plasteel" = 0, "glass" = 0, "wood" = 0, "plastic" = 0 From cff2b62736f2cf6a008dc73d06c97f406c4b37c9 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 22:51:27 -0400 Subject: [PATCH 7/8] Deleted a blank line and some unused code that I came across. Tigercat2000 gave me permission. --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 11db68ec671..84f95a70665 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -107,7 +107,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ recipes = metal_recipes return ..() - /* * Plasteel */ @@ -116,8 +115,6 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \ new/datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), \ -// new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/rust_fuel_assembly_port_frame, 12, time = 50, one_per_turf = 1), \ -// new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/rust_fuel_compressor_frame, 12, time = 50, one_per_turf = 1), \ ) From c1affcd02b466feb955e015df08f4b21134048e5 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Mon, 28 Mar 2016 23:36:03 -0400 Subject: [PATCH 8/8] Cyborg versions of some stuff. Added a line in some commentary that should have been there, but wasn't. --- code/game/objects/items/stacks/sheets/mineral.dm | 3 ++- .../mob/living/silicon/robot/robot_modules.dm | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index d924a84da2d..03890ce4372 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -5,6 +5,7 @@ Mineral Sheets - Diamond - Uranium - Plasma + - Plastic - Gold - Silver - Bananium @@ -191,4 +192,4 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \ name = "enriched uranium" icon_state = "sheet-enruranium" origin_tech = "materials=6" - materials = list(MAT_URANIUM=3000) \ No newline at end of file + materials = list(MAT_URANIUM=3000) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f9277d4230d..104ef75a0dc 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -171,9 +171,9 @@ subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) stacktypes = list( - /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/glass = 50, - /obj/item/stack/sheet/rglass = 50, + /obj/item/stack/sheet/metal/cyborg = 50, + /obj/item/stack/sheet/glass/cyborg = 50, + /obj/item/stack/sheet/rglass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 50, /obj/item/stack/rods = 30, /obj/item/stack/tile/plasteel = 20 @@ -460,13 +460,13 @@ name = "drone module" module_type = "Engineer" stacktypes = list( - /obj/item/stack/sheet/wood = 10, - /obj/item/stack/sheet/rglass = 50, + /obj/item/stack/sheet/wood/cyborg = 10, + /obj/item/stack/sheet/rglass/cyborg = 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/glass = 50, + /obj/item/stack/sheet/metal/cyborg = 50, + /obj/item/stack/sheet/glass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 30 )