New Medical Items

code/game/objects/items/weapons/surgery_tools.dm

@@ -1,18 +1,22 @@
 /* Surgery Tools
  * Contains:
+ *		Bio-Regenerator
  *		Retractor
  *		Hemostat
  *		Cautery
  *		Surgical Drill
  *		Scalpel
- *		Circular Saw
- *		Bio-Regenerator
+ *		Researchable Scalpels
+ *		Circular Saws
+ *		Misc Tools
+ *		Cyborg Tools
+ *		Alien Tools
  */
 
 /obj/item/weapon/surgical
 	name = "Surgical tool"
 	desc = "This shouldn't be here, ahelp it."
-	icon = 'icons/obj/surgery.dmi'
+	icon = 'icons/obj/surgery_vr.dmi'
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/weldingtool.ogg'
 	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
@@ -29,7 +33,6 @@
 /obj/item/weapon/surgical/bioregen
 	name="bioregenerator"
 	desc="A special tool used in surgeries which can pull toxins from and restore oxygen to organic tissue as well as recreate missing biological structures to allow otherwise irreperable flesh to be mended."
-	icon='icons/obj/surgery_vr.dmi'
 	icon_state="bioregen"
 	drop_sound = 'sound/items/drop/scrap.ogg'
 
@@ -110,27 +113,27 @@
 /obj/item/weapon/surgical/scalpel/laser1
 	name = "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."
-	icon_state = "scalpel_laser1_on"
+	icon_state = "scalpel_laser1"
 	damtype = "fire"
 
 /obj/item/weapon/surgical/scalpel/laser2
 	name = "laser scalpel"
 	desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field.  This one looks somewhat advanced."
-	icon_state = "scalpel_laser2_on"
+	icon_state = "scalpel_laser2"
 	damtype = "fire"
 	force = 12.0
 
 /obj/item/weapon/surgical/scalpel/laser3
 	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!"
-	icon_state = "scalpel_laser3_on"
+	icon_state = "scalpel_laser3"
 	damtype = "fire"
 	force = 15.0
 
 /obj/item/weapon/surgical/scalpel/manager
 	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"
+	icon_state = "scalpel_manager"
 	force = 7.5
 
 /obj/item/weapon/surgical/scalpel/ripper
@@ -143,12 +146,12 @@
 	origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 3, TECH_ILLEGAL = 2)
 
 /*
- * Circular Saw
+ * Circular Saws
  */
 /obj/item/weapon/surgical/circular_saw
 	name = "circular saw"
 	desc = "For heavy duty cutting."
-	icon_state = "saw3"
+	icon_state = "saw"
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	force = 15.0
@@ -169,13 +172,15 @@
 	item_state = "saw3"
 	hitsound = 'sound/weapons/emitter2.ogg'
 	damtype = SEARING
-	w_class = ITEMSIZE_LARGE
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 6)
-	matter = list(MAT_STEEL = 12500)
+	matter = list(MAT_STEEL = 25000,MAT_GLASS = 20000)
 	attack_verb = list("attacked", "slashed", "seared", "cut")
 	toolspeed = 0.75
 
-//misc, formerly from code/defines/weapons.dm
+/*
+ * Misc Tools
+ */
 /obj/item/weapon/surgical/bonegel
 	name = "bone gel"
 	desc = "For fixing bones."
@@ -192,7 +197,7 @@
 	throwforce = 1.0
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
 	var/usage_amount = 10
-	drop_sound = 'sound/items/drop/accessory.ogg'
+	drop_sound = 'sound/items/drop/bottle.ogg'
 
 /obj/item/weapon/surgical/bonesetter
 	name = "bone setter"
@@ -215,24 +220,31 @@
 	throw_range = 5
 	attack_verb = list("attacked", "hit", "bludgeoned")
 
-// Cyborg Tools
-
+/*
+ * Cyborg Tools
+ */
 /obj/item/weapon/surgical/retractor/cyborg
+	icon_state = "cyborg_retractor"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/hemostat/cyborg
+	icon_state = "cyborg_hemostat"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/cautery/cyborg
+	icon_state = "cyborg_cautery"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/surgicaldrill/cyborg
+	icon_state = "cyborg_drill"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/scalpel/cyborg
+	icon_state = "cyborg_scalpel"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/circular_saw/cyborg
+	icon_state = "cyborg_saw"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/bonegel/cyborg
@@ -242,13 +254,16 @@
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/bonesetter/cyborg
+	icon_state = "cyborg_setter"
 	toolspeed = 0.5
 
 /obj/item/weapon/surgical/bioregen/cyborg //VoreStation edit: let the borgs S U C C
+	icon_state = "cyborg_bioregen"
 	toolspeed = 0.5
 
-
-// Alien Tools
+/*
+ * Alien Tools
+ */
 /obj/item/weapon/surgical/retractor/alien
 	icon = 'icons/obj/abductor.dmi'
 	toolspeed = 0.25