From ba82f03d7c53fde4b413eeddc38198dbd2c37d39 Mon Sep 17 00:00:00 2001 From: DZD Date: Sat, 1 Aug 2015 10:13:54 -0400 Subject: [PATCH] Drill and drone fixes - Fixes mining drones having access to a plasma cutter energy weapon, replaced with a diamond drill. Functionality is almost identical to what it was with old plasma cutters. - Pathing fixes for diamond drills. --- code/game/gamemodes/newobjective.dm | 2 +- code/game/gamemodes/steal_items.dm | 2 +- code/game/objects/structures/girders.dm | 4 ++-- code/game/turfs/simulated/walls.dm | 2 +- code/game/turfs/simulated/walls_reinforced.dm | 2 +- code/modules/mob/living/silicon/robot/robot_modules.dm | 3 +-- code/modules/research/designs/mining_designs.dm | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 7ef2121d7c3..caaf37f084c 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -841,7 +841,7 @@ datum return 2 diamond_drill - steal_target = /obj/item/weapon/pickaxe/diamonddrill + steal_target = /obj/item/weapon/pickaxe/drill/diamonddrill explanation_text = "Steal a diamond drill." weight = 20 diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index c063ed0bd9b..fd648b05c7d 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -212,7 +212,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/special/diamond_drill name = "diamond drill" - typepath = /obj/item/weapon/pickaxe/diamonddrill + typepath = /obj/item/weapon/pickaxe/drill/diamonddrill /datum/theft_objective/special/boh name = "bag of holding" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b93b7e3571e..ef70953075d 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -32,7 +32,7 @@ new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) - else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) user << "\blue You drill through the girder!" new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) @@ -224,7 +224,7 @@ user << "\blue You slice apart the girder!" dismantle() - else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) user << "\blue You drill through the girder!" dismantle() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index b89c84cbcd8..58bd290bf5e 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -385,7 +385,7 @@ return //DRILLING - else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + else if (istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) user << "You begin to drill though the wall." diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index c46c2c6fa5a..cf094395019 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -253,7 +253,7 @@ //vv OK, we weren't performing a valid deconstruction step or igniting thermite,let's check the other possibilities vv //DRILLING - if (istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + if (istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) user << "You begin to drill though the wall." diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index a34e61662b0..3a680bf2fc0 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -415,8 +415,7 @@ src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src) src.modules += new /obj/item/weapon/soap(src) - src.emag = new /obj/item/weapon/gun/energy/plasmacutter(src) - src.emag.name = "Plasma Cutter" + src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src) for(var/T in stacktypes) var/obj/item/stack/sheet/W = new T(src) diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 61f86c16294..8fcbf4b48ce 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -9,7 +9,7 @@ build_type = PROTOLATHE materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed. reliability_base = 79 - build_path = /obj/item/weapon/pickaxe/diamonddrill + build_path = /obj/item/weapon/pickaxe/drill/diamonddrill category = list("Mining") /datum/design/pick_diamond