From 9e94f2ceeb2f5254c8c1e7e6ea8541c883d55023 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 9 Mar 2017 02:08:42 -0500 Subject: [PATCH] Fixes Power Tools Materials and Recators Laser Scalpels --- code/game/objects/items/weapons/tools.dm | 26 ++++++++--------- .../research/designs/medical_designs.dm | 8 +++--- code/modules/surgery/encased.dm | 4 +-- code/modules/surgery/face.dm | 12 ++------ code/modules/surgery/generic.dm | 15 ++-------- code/modules/surgery/implant.dm | 7 ++--- code/modules/surgery/organs_internal.dm | 8 ++---- code/modules/surgery/tools.dm | 28 ++++++++----------- 8 files changed, 41 insertions(+), 67 deletions(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 5679ca7f02d..ebf5765eed3 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -28,12 +28,12 @@ origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "battered", "bludgeoned", "whacked") toolspeed = 1 - + /obj/item/weapon/wrench/suicide_act(mob/user) user.visible_message("[user] is beating themself to death with [src]! It looks like they're trying to commit suicide!") playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) return (BRUTELOSS) - + /obj/item/weapon/wrench/cyborg name = "automatic wrench" desc = "An advanced robotic wrench. Can be found in construction cyborgs." @@ -44,7 +44,7 @@ desc = "A brass wrench. It's faintly warm to the touch." icon_state = "wrench_brass" toolspeed = 0.5 - + /obj/item/weapon/wrench/abductor name = "alien wrench" desc = "A polarized wrench. It causes anything placed between the jaws to turn." @@ -162,7 +162,7 @@ if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) - + /obj/item/weapon/screwdriver/brass name = "brass screwdriver" desc = "A screwdriver made of brass. The handle feels freezing cold." @@ -249,7 +249,7 @@ return else ..() - + /obj/item/weapon/wirecutters/suicide_act(mob/user) user.visible_message("[user] is cutting at their arteries with [src]! It looks like they're trying to commit suicide!") playsound(loc, usesound, 50, 1, -1) @@ -280,7 +280,7 @@ icon_state = "jaws_cutter" item_state = "jawsoflife" origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.25 @@ -388,7 +388,7 @@ location = get_turf(M) if(isturf(location)) location.hotspot_expose(700, 5) - + /obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params) if(isscrewdriver(I)) flamethrower_screwdriver(I, user) @@ -578,7 +578,7 @@ /obj/item/weapon/weldingtool/mini/flamethrower_screwdriver() return - + /obj/item/weapon/weldingtool/abductor name = "alien welding tool" desc = "An alien welding tool. Whatever fuel it uses, it never runs out." @@ -589,7 +589,7 @@ change_icons = 0 origin_tech = "plasmatech=5;engineering=5;abductor=3" can_off_process = 1 - + /obj/item/weapon/weldingtool/abductor/process() if(get_fuel() <= max_fuel) reagents.add_reagent("fuel", 1) @@ -617,7 +617,7 @@ light_intensity = 1 toolspeed = 0.5 var/last_gen = 0 - + /obj/item/weapon/weldingtool/experimental/brass name = "brass welding tool" desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." @@ -652,7 +652,7 @@ obj/item/weapon/weldingtool/experimental/process() /obj/item/weapon/crowbar/red icon_state = "crowbar_red" force = 8 - + /obj/item/weapon/crowbar/brass name = "brass crowbar" desc = "A brass crowbar. It feels faintly warm to the touch." @@ -679,7 +679,7 @@ obj/item/weapon/weldingtool/experimental/process() icon_state = "crowbar_large" item_state = "crowbar" toolspeed = 0.5 - + /obj/item/weapon/crowbar/cyborg name = "hydraulic crowbar" desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." @@ -692,7 +692,7 @@ obj/item/weapon/weldingtool/experimental/process() desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head" icon_state = "jaws_pry" item_state = "jawsoflife" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_DIAMOND=25) origin_tech = "materials=2;engineering=2" usesound = 'sound/items/jaws_pry.ogg' force = 15 diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 4163b36f573..f1d477a4f89 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -165,7 +165,7 @@ req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2) build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_GLASS = 1500) - build_path = /obj/item/weapon/scalpel/laser1 + build_path = /obj/item/weapon/scalpel/laser/laser1 category = list("Medical") /datum/design/item/scalpel_laser2 @@ -175,7 +175,7 @@ req_tech = list("biotech" = 3, "materials" = 4, "magnets" = 4) build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000) - build_path = /obj/item/weapon/scalpel/laser2 + build_path = /obj/item/weapon/scalpel/laser/laser2 category = list("Medical") /datum/design/item/scalpel_laser3 @@ -185,7 +185,7 @@ req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000) - build_path = /obj/item/weapon/scalpel/laser3 + build_path = /obj/item/weapon/scalpel/laser/laser3 category = list("Medical") /datum/design/item/scalpel_manager @@ -195,7 +195,7 @@ req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4) build_type = PROTOLATHE materials = list (MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000) - build_path = /obj/item/weapon/scalpel/manager + build_path = /obj/item/weapon/scalpel/laser/manager category = list("Medical") /datum/design/alienscalpel diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 7d9152e01ff..fbcd9a21c69 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -70,7 +70,7 @@ /datum/surgery_step/open_encased/retract name = "retract bone" allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ /obj/item/weapon/crowbar = 75 ) @@ -121,7 +121,7 @@ /datum/surgery_step/open_encased/close name = "unretract bone" //i suck at names okay? give me a new one allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ /obj/item/weapon/crowbar = 75 ) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 6c2f7354b43..c17f318e748 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -28,10 +28,6 @@ /datum/surgery_step/generic/cut_face name = "make incision" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ - /obj/item/weapon/scalpel/manager = 120, \ /obj/item/weapon/scalpel = 100, \ /obj/item/weapon/kitchen/knife = 75, \ /obj/item/weapon/shard = 50, \ @@ -62,7 +58,7 @@ /datum/surgery_step/face/mend_vocal name = "mend vocal cords" allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. @@ -89,7 +85,7 @@ /datum/surgery_step/face/fix_face name = "reshape face" allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ /obj/item/weapon/crowbar = 55, \ /obj/item/weapon/kitchen/utensil/fork = 75) @@ -116,9 +112,7 @@ /datum/surgery_step/face/cauterize name = "close incision" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ + /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ /obj/item/weapon/lighter = 50, \ diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 8d5f7669ecd..3ff6020af26 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -23,10 +23,6 @@ name = "make incision" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ - /obj/item/weapon/scalpel/manager = 120, \ /obj/item/weapon/scalpel = 100, \ /obj/item/weapon/kitchen/knife = 75, \ /obj/item/weapon/shard = 50, \ @@ -65,10 +61,7 @@ name = "clamp bleeders" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 20 @@ -103,7 +96,7 @@ name = "retract skin" allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ /obj/item/weapon/crowbar = 75, \ /obj/item/weapon/kitchen/utensil/fork = 50 @@ -158,9 +151,7 @@ name = "cauterize incision" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ + /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ /obj/item/weapon/lighter = 50, \ diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 35a30674e3e..8d7b9a558d9 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -97,10 +97,7 @@ /datum/surgery_step/cavity/close_space name = "close cavity space" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ /obj/item/weapon/lighter = 50, \ @@ -354,7 +351,7 @@ name = "remove embedded objects" time = 32 allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 20 diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 73416045624..df9ab4dde20 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -69,7 +69,7 @@ var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 55) var/implements_mend = list(/obj/item/stack/medical/bruise_pack = 20,/obj/item/stack/medical/bruise_pack/advanced = 100,/obj/item/stack/nanopaste = 100) //Finish is just so you can close up after you do other things. - var/implements_finsh = list(/obj/item/weapon/scalpel/manager = 120,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75) + var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75) var/current_type var/obj/item/organ/internal/I = null var/obj/item/organ/external/affected = null @@ -368,10 +368,6 @@ /datum/surgery_step/cut_carapace name = "cut carapace" allowed_tools = list( - /obj/item/weapon/scalpel/laser3 = 115, \ - /obj/item/weapon/scalpel/laser2 = 110, \ - /obj/item/weapon/scalpel/laser1 = 105, \ - /obj/item/weapon/scalpel/manager = 120, \ /obj/item/weapon/scalpel = 100, \ /obj/item/weapon/kitchen/knife = 75, \ /obj/item/weapon/shard = 50, \ @@ -406,7 +402,7 @@ name = "retract carapace" allowed_tools = list( - /obj/item/weapon/scalpel/manager = 120, \ + /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ /obj/item/weapon/crowbar = 75, \ /obj/item/weapon/kitchen/utensil/fork = 50 diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 27ed3895a2c..b0014a391a3 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -59,6 +59,7 @@ desc = "Cut, cut, and once more cut." icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" + item_state = "scalpel" flags = CONDUCT force = 10.0 sharp = 1 @@ -82,40 +83,35 @@ /* * Researchable Scalpels */ -/obj/item/weapon/scalpel/laser1 //lasers also count as catuarys +/obj/item/weapon/scalpel/laser //parent type + name = "laser scalpel" + desc = "A scalpel augmented with a directed laser." + icon_state = "scalpel_laser1_on" + damtype = "fire" + hitsound = 'sound/weapons/sear.ogg' + +/obj/item/weapon/scalpel/laser/laser1 //lasers also count as catuarys name = "laser scalpel" desc = "A scalpel augmented with a directed laser. This one looks basic and could be improved." icon_state = "scalpel_laser1_on" - item_state = "scalpel" - damtype = "fire" - hitsound = 'sound/weapons/sear.ogg' toolspeed = 0.8 -/obj/item/weapon/scalpel/laser2 +/obj/item/weapon/scalpel/laser/laser2 name = "laser scalpel" desc = "A scalpel augmented with a directed laser. This one looks somewhat advanced." icon_state = "scalpel_laser2_on" - item_state = "scalpel" - damtype = "fire" - hitsound = 'sound/weapons/sear.ogg' toolspeed = 0.6 -/obj/item/weapon/scalpel/laser3 +/obj/item/weapon/scalpel/laser/laser3 name = "laser scalpel" desc = "A scalpel augmented with a directed laser. This one looks to be the pinnacle of precision energy cutlery!" icon_state = "scalpel_laser3_on" - item_state = "scalpel" - damtype = "fire" - hitsound = 'sound/weapons/sear.ogg' toolspeed = 0.4 -/obj/item/weapon/scalpel/manager //super tool! Retractor/hemostat +/obj/item/weapon/scalpel/laser/manager //super tool! Retractor/hemostat name = "incision management system" desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." icon_state = "scalpel_manager_on" - item_state = "scalpel" - damtype = "fire" - hitsound = 'sound/weapons/sear.ogg' toolspeed = 0.2 /obj/item/weapon/circular_saw