diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index 38d40c20e78..313b4ee2213 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -443,6 +443,9 @@ "DH" = ( /obj/structure/table, /obj/item/circular_saw, +/obj/item/scalpel/laser{ + pixel_y = 7 + }, /turf/simulated/floor/plating/airless, /area/ruin/space/tcommsat) "Ef" = ( @@ -502,7 +505,6 @@ /area/ruin/space/tcommsat) "If" = ( /obj/structure/table, -/obj/item/scalpel/laser/laser2, /turf/simulated/floor/plating/airless, /area/ruin/space/tcommsat) "Is" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm index d2724f27c0e..dde6747c29b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm @@ -797,7 +797,7 @@ "Zf" = ( /obj/structure/table, /obj/item/shard, -/obj/item/scalpel/laser/laser2, +/obj/item/scalpel/laser, /turf/template_noop, /area/template_noop) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 675edecf64f..2bb961c0635 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -513,7 +513,7 @@ require_module = TRUE module_type = /obj/item/robot_module/medical items_to_replace = list( - /obj/item/scalpel/laser/laser1 = /obj/item/scalpel/laser/alien, + /obj/item/scalpel/laser = /obj/item/scalpel/laser/alien, /obj/item/hemostat = /obj/item/hemostat/alien, /obj/item/retractor = /obj/item/retractor/alien, /obj/item/bonegel = /obj/item/bonegel/alien, diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 44c85c65f20..e319d941f13 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -120,7 +120,7 @@ /obj/item/reagent_containers/applicator/burn, /obj/item/clothing/glasses/sunglasses, /obj/item/food/fortunecookie, - /obj/item/scalpel/laser/laser1, + /obj/item/scalpel/laser, /obj/item/surgical_drapes, /obj/item/toy/figure/crew/cmo, /obj/item/toy/figure/crew/chemist, diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index b1ca8a390a5..e4d01704874 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -337,7 +337,7 @@ /obj/item/handheld_defibrillator, /obj/item/roller_holder, /obj/item/reagent_containers/borghypo, - /obj/item/scalpel/laser/laser1, + /obj/item/scalpel/laser, /obj/item/hemostat, /obj/item/retractor, /obj/item/circular_saw, @@ -820,7 +820,7 @@ /obj/item/handheld_defibrillator, /obj/item/roller_holder, /obj/item/reagent_containers/borghypo/syndicate, - /obj/item/scalpel/laser/laser1, + /obj/item/scalpel/laser, /obj/item/hemostat, /obj/item/retractor, /obj/item/melee/energy/sword/cyborg/saw, //Energy saw -- primary weapon diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 26deabf73d6..87a9c192e36 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -227,34 +227,14 @@ build_path = /obj/item/stack/synthetic_skin/level_3 category = list("Medical") -/datum/design/scalpel_laser1 - name = "Basic Laser Scalpel" - desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved." - id = "scalpel_laser1" - req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2) - build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_GLASS = 1500) - build_path = /obj/item/scalpel/laser/laser1 - category = list("Medical") - -/datum/design/scalpel_laser2 - name = "Improved Laser Scalpel" - desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." - id = "scalpel_laser2" - 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/scalpel/laser/laser2 - category = list("Medical") - -/datum/design/scalpel_laser3 - name = "Advanced Laser Scalpel" +/datum/design/scalpel_laser + name = "Laser Scalpel" desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!" - id = "scalpel_laser3" - req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) + id = "scalpel_laser" + req_tech = list("biotech" = 4, "materials" = 5, "magnets" = 5) build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000) - build_path = /obj/item/scalpel/laser/laser3 + build_path = /obj/item/scalpel/laser category = list("Medical") /datum/design/scalpel_manager diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index fcda75fe2b4..37941009504 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -174,14 +174,16 @@ /* * Researchable Scalpels */ -/// parent type +/// lasers also count as cauteries, and hemostats purely for opening surgery. /obj/item/scalpel/laser name = "laser scalpel" - desc = "A low-power laser emitter for creating and cauterizing precise surgical incisions." + desc = "An advanced laser emitter for creating and cauterizing precise surgical incisions with extreme speed." icon_state = "scalpel_laser1_on" damtype = "fire" hitsound = 'sound/weapons/sear.ogg' - materials = list(MAT_METAL = 2000, MAT_GLASS = 1500) + toolspeed = 0.4 + materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000) + origin_tech = "biotech=3;materials=4;magnets=4" /obj/item/scalpel/laser/interact_with_atom(atom/target, mob/living/user, list/modifiers) if(cigarette_lighter_act(user, target)) @@ -207,23 +209,6 @@ cig.light(user, target) return TRUE -/// lasers also count as catuarys -/obj/item/scalpel/laser/laser1 - desc = "A basic low-power laser emitter for creating and cauterizing precise surgical incisions." - toolspeed = 0.8 - -/obj/item/scalpel/laser/laser2 - desc = "An improved laser emitter for rapidly creating and cauterizing precise surgical incisions." - icon_state = "scalpel_laser2_on" - toolspeed = 0.6 - materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000) - -/obj/item/scalpel/laser/laser3 - desc = "An advanced laser emitter for creating and cauterizing precise surgical incisions with extreme speed." - icon_state = "scalpel_laser3_on" - toolspeed = 0.4 - materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000) - /// super tool! Retractor/hemostat /obj/item/scalpel/laser/manager name = "incision management system" diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 741aeac3ef8..f3034076fd4 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ