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/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), \ ) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 425b7e0b54f..09c0cf69309 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -272,4 +272,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/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index c7ba0de8a64..6868765250b 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -15,6 +15,7 @@ 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. 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..9eaf627858b 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -374,4 +374,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..104ef75a0dc 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -171,12 +171,12 @@ 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 = 15, - /obj/item/stack/tile/plasteel = 15 + /obj/item/stack/rods = 30, + /obj/item/stack/tile/plasteel = 20 ) /obj/item/weapon/robot_module/engineering/New() @@ -198,29 +198,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 +460,13 @@ 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/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/cyborg = 50, + /obj/item/stack/sheet/glass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 30 ) @@ -531,4 +511,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)