diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index 8af0d326d27..bc246bd0be9 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -37,7 +37,6 @@ /area/ruin/unpowered/misc_lavaruin) "l" = ( /obj/machinery/optable/abductor, -/obj/item/cautery/alien, /turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "m" = ( @@ -46,8 +45,8 @@ /turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "n" = ( -/obj/item/scalpel/alien, /obj/item/surgical_drapes, +/obj/item/scalpel/laser/alien, /turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "o" = ( diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index efd0c12a3e8..c59e15ef829 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -503,8 +503,7 @@ "cf" = ( /obj/structure/table/abductor, /obj/item/paper/abductor, -/obj/item/scalpel/alien, -/obj/item/cautery/alien, +/obj/item/scalpel/laser/alien, /turf/simulated/floor/plating/abductor, /area/abductor_ship) "cg" = ( diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 0f1c9a6569e..8b3f0fe349a 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -591,16 +591,16 @@ CONTENTS:
1.Acquire fresh specimen.
2.Put the specimen on operating table.
- 3.Apply scalpel to the chest, preparing for experimental dissection.
- 4.Apply scalpel to specimen's torso.
+ 3.Apply a scalpel to the chest, preparing for experimental dissection.
+ 4.Make incision on specimen's torso with a scalpel.
5.Clamp bleeders on specimen's torso with a hemostat.
6.Retract skin of specimen's torso with a retractor.
7.Saw through the specimen's torso with a saw.
8.Apply retractor again to specimen's torso.
9.Search through the specimen's torso with your hands to remove any superfluous organs.
10.Insert replacement gland (Retrieve one from gland storage).
- 11.Cauterize the patient's torso with a cautery.
- 12.Consider dressing the specimen back to not disturb the habitat.
+ 11.Cauterize the patient's torso. Your scalpel also functions as a cautery for this purpose.
+ 12.Consider dressing the specimen back to not disturb the habitat.
13.Put the specimen in the experiment machinery.
14.Choose one of the machine options. The target will be analyzed and teleported to the selected drop-off point.
15.You will receive one supply credit, and the subject will be counted towards your quota.
@@ -708,10 +708,11 @@ Congratulations! You are now trained for invasive xenobiology research!"} ///////////////////////////////////////// /////////// MEDICAL TOOLS /////////////// ///////////////////////////////////////// -/obj/item/scalpel/alien +/obj/item/scalpel/laser/alien name = "alien scalpel" - desc = "It's a gleaming sharp knife made out of silvery-green metal." + desc = "A translucent blade attached to a handle of strange silvery metal. When held still against broken flesh, the blade becomes extremely hot." icon = 'icons/obj/abductor.dmi' + icon_state = "scalpel" origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 @@ -743,13 +744,6 @@ Congratulations! You are now trained for invasive xenobiology research!"} origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/cautery/alien - name = "alien cautery" - desc = "Why would bloodless aliens have a tool to stop bleeding? Unless..." - icon = 'icons/obj/abductor.dmi' - origin_tech = "materials=2;biotech=2;abductor=2" - toolspeed = 0.25 - /obj/item/bonegel/alien name = "alien bone gel" desc = "It smells like duct tape." diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 7416143a6ab..8949a55103f 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -481,7 +481,7 @@ require_module = TRUE module_type = /obj/item/robot_module/medical items_to_replace = list( - /obj/item/scalpel/laser/laser1 = /obj/item/scalpel/laser/laser3, // No abductor laser scalpel, so next best thing. + /obj/item/scalpel/laser/laser1 = /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/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index b229bee2f8b..b8d8a225fcd 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -220,7 +220,7 @@ desc = "An advanced scalpel obtained through Abductor technology." id = "alien_scalpel" req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) - build_path = /obj/item/scalpel/alien + build_path = /obj/item/scalpel/laser/alien build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) category = list("Medical") @@ -265,16 +265,6 @@ materials = list(MAT_METAL = 10000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 1500) category = list("Medical") -/datum/design/aliencautery - name = "Alien Cautery" - desc = "An advanced cautery obtained through Abductor technology." - id = "alien_cautery" - req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) - build_path = /obj/item/cautery/alien - build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) - category = list("Medical") - /datum/design/alienbonegel name = "Alien Bone Gel" desc = "Advanced bone gel obtained through Abductor technology." diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index fea781e8ccf..38d26906717 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -268,7 +268,7 @@ desc = "An alien surgical toolset, designed to be installed on the subject's arm." icon_state = "toolkit_surgical" origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=2" - contents = newlist(/obj/item/retractor/alien, /obj/item/hemostat/alien, /obj/item/cautery/alien, /obj/item/bonesetter/alien, /obj/item/scalpel/alien, /obj/item/circular_saw/alien, /obj/item/bonegel/alien, /obj/item/fix_o_vein/alien, /obj/item/surgicaldrill/alien) + contents = newlist(/obj/item/retractor/alien, /obj/item/hemostat/alien, /obj/item/bonesetter/alien, /obj/item/scalpel/laser/alien, /obj/item/circular_saw/alien, /obj/item/bonegel/alien, /obj/item/fix_o_vein/alien, /obj/item/surgicaldrill/alien) action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi') action_icon_state = list(/datum/action/item_action/organ_action/toggle = "belt") diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index d62b2497567..db854a660e6 100644 Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ