diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 087c917fee6..c33f4377267 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -891,12 +891,12 @@ proc/is_hot(obj/item/W as obj)
/proc/is_surgery_tool(obj/item/W as obj)
return ( \
- istype(W, /obj/item/scalpel) || \
- istype(W, /obj/item/hemostat) || \
- istype(W, /obj/item/retractor) || \
- istype(W, /obj/item/cautery) || \
- istype(W, /obj/item/bonegel) || \
- istype(W, /obj/item/bonesetter)
+ istype(W, /obj/item/surgery/scalpel) || \
+ istype(W, /obj/item/surgery/hemostat) || \
+ istype(W, /obj/item/surgery/retractor) || \
+ istype(W, /obj/item/surgery/cautery) || \
+ istype(W, /obj/item/surgery/bonegel) || \
+ istype(W, /obj/item/surgery/bonesetter)
)
/proc/is_borg_item(obj/item/W as obj)
diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm
index 4ae57801a86..3df5aafa0a5 100644
--- a/code/controllers/subsystems/traumas.dm
+++ b/code/controllers/subsystems/traumas.dm
@@ -103,7 +103,7 @@ var/datum/controller/subsystem/traumas/SStraumas
/obj/item/storage/backpack/medic, /obj/item/storage/backpack/messenger/med, /obj/item/storage/belt/medical,
/obj/machinery/vending/medical, /obj/structure/closet/crate/medical, /obj/structure/closet/medical_wall,
/obj/structure/sign/greencross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical,
- /obj/item/clothing/under/rank/medical, /obj/item/scalpel, /obj/machinery/clonepod, /obj/item/storage/firstaid, /obj/machinery/optable,
+ /obj/item/clothing/under/rank/medical, /obj/item/surgery/scalpel, /obj/machinery/clonepod, /obj/item/storage/firstaid, /obj/machinery/optable,
/obj/item/clothing/accessory/armband/science, /obj/item/clothing/under/rank/scientist, /obj/machinery/door/airlock/science, /obj/machinery/door/airlock/medical))
)
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 30d81fded5a..d227db3bf66 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -437,7 +437,7 @@
l_ear = /obj/item/device/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
l_pocket = /obj/item/material/knife
- r_pocket = /obj/item/scalpel
+ r_pocket = /obj/item/surgery/scalpel
r_hand = /obj/item/material/twohanded/fireaxe
id = null
diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm
index 70322501a38..3748472b7b5 100644
--- a/code/datums/trading/ai.dm
+++ b/code/datums/trading/ai.dm
@@ -167,16 +167,16 @@ They sell generic supplies and ask for generic supplies.
/obj/item/stack/medical/ointment = TRADER_THIS_TYPE,
/obj/item/stack/medical/advanced = TRADER_SUBTYPES_ONLY,
/obj/item/stack/medical/splint = TRADER_THIS_TYPE,
- /obj/item/bonesetter = TRADER_THIS_TYPE,
- /obj/item/retractor = TRADER_THIS_TYPE,
- /obj/item/hemostat = TRADER_THIS_TYPE,
- /obj/item/cautery = TRADER_THIS_TYPE,
- /obj/item/surgicaldrill = TRADER_THIS_TYPE,
- /obj/item/scalpel = TRADER_ALL,
- /obj/item/circular_saw = TRADER_THIS_TYPE,
- /obj/item/bonegel = TRADER_THIS_TYPE,
- /obj/item/FixOVein = TRADER_THIS_TYPE,
- /obj/item/bonesetter = TRADER_THIS_TYPE,
+ /obj/item/surgery/bonesetter = TRADER_THIS_TYPE,
+ /obj/item/surgery/retractor = TRADER_THIS_TYPE,
+ /obj/item/surgery/hemostat = TRADER_THIS_TYPE,
+ /obj/item/surgery/cautery = TRADER_THIS_TYPE,
+ /obj/item/surgery/surgicaldrill = TRADER_THIS_TYPE,
+ /obj/item/surgery/scalpel = TRADER_ALL,
+ /obj/item/surgery/circular_saw = TRADER_THIS_TYPE,
+ /obj/item/surgery/bonegel = TRADER_THIS_TYPE,
+ /obj/item/surgery/FixOVein = TRADER_THIS_TYPE,
+ /obj/item/surgery/bonesetter = TRADER_THIS_TYPE,
/obj/item/storage/box/syringes = TRADER_THIS_TYPE,
/obj/item/storage/box/syringegun = TRADER_THIS_TYPE,
/obj/item/storage/box/masks = TRADER_THIS_TYPE,
diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index 679f8f31d0d..674c656343b 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -204,32 +204,32 @@
/datum/autolathe/recipe/scalpel
name = "scalpel"
- path = /obj/item/scalpel
+ path = /obj/item/surgery/scalpel
category = "Medical"
/datum/autolathe/recipe/circularsaw
name = "circular saw"
- path = /obj/item/circular_saw
+ path = /obj/item/surgery/circular_saw
category = "Medical"
/datum/autolathe/recipe/surgicaldrill
name = "surgical drill"
- path = /obj/item/surgicaldrill
+ path = /obj/item/surgery/surgicaldrill
category = "Medical"
/datum/autolathe/recipe/retractor
name = "retractor"
- path = /obj/item/retractor
+ path = /obj/item/surgery/retractor
category = "Medical"
/datum/autolathe/recipe/cautery
name = "cautery"
- path = /obj/item/cautery
+ path = /obj/item/surgery/cautery
category = "Medical"
/datum/autolathe/recipe/hemostat
name = "hemostat"
- path = /obj/item/hemostat
+ path = /obj/item/surgery/hemostat
category = "Medical"
/datum/autolathe/recipe/beaker
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index e2372e361a2..389eacfb36f 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -274,7 +274,7 @@ for reference:
desc = "A do-it-yourself kit for constructing the finest of emergency floodlights."
icon = 'icons/obj/storage.dmi'
icon_state = "inf_box"
- item_state = "syringe_kit"
+ item_state = "box"
var/kit_product = /obj/machinery/floodlight
var/assembly_time = 8 SECONDS
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index a6b7b72dc41..ba89644768c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -853,7 +853,7 @@ About the new airlock wires panel:
cut_sound = "sparks"
cut_delay *= 1
cutting = TRUE
- else if(istype(tool,/obj/item/circular_saw))
+ else if(istype(tool,/obj/item/surgery/circular_saw))
cut_verb = "sawing"
cut_sound = 'sound/weapons/saw/circsawhit.ogg'
cut_delay *= 2
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 669d86ea8a3..9bc7a631fb9 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -74,7 +74,7 @@
desc = "A do-it-yourself kit for constructing the finest of mass drivers."
icon = 'icons/obj/storage.dmi'
icon_state = "inf_box"
- item_state = "syringe_kit"
+ item_state = "box"
/obj/item/mass_driver_diy/attack_self(mob/user)
to_chat(user, "You start piecing together the kit...")
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index 48590587337..40c16202abe 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -937,8 +937,8 @@
/obj/item/device/assembly/prox_sensor = 3,
/obj/item/device/assembly/signaler = 3,
/obj/item/device/healthanalyzer = 3,
- /obj/item/scalpel = 2,
- /obj/item/circular_saw = 2,
+ /obj/item/surgery/scalpel = 2,
+ /obj/item/surgery/circular_saw = 2,
/obj/item/tank/anesthetic = 2,
/obj/item/clothing/mask/breath/medical = 5,
/obj/item/screwdriver = 5,
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 95f9fbb7c62..edf386d4379 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -34,10 +34,13 @@
/obj/item/device/lightreplacer
-
name = "light replacer"
desc = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass."
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "lightreplacer"
item_state = "lightreplacer"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 82f39cf7c3d..abce2e6f68f 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -2,7 +2,12 @@
name = "\improper DNA injector"
desc = "This injects the person with DNA."
icon = 'icons/obj/items.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
icon_state = "dnainjector"
+ item_state = "dnainjector"
var/block=0
var/datum/dna2/record/buf=null
var/s_time = 10.0
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index c4ff67d4775..cce784b018c 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -1,6 +1,10 @@
/obj/item/implanter
name = "implanter"
icon = 'icons/obj/items.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
icon_state = "implanter0"
item_state = "syringe_0"
throw_speed = 1
diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm
index 80a9c10e43c..a915db14382 100644
--- a/code/game/objects/items/weapons/material/material_armor.dm
+++ b/code/game/objects/items/weapons/material/material_armor.dm
@@ -90,6 +90,10 @@ Protectiveness | Armor %
desc = "It's a bucket with a large hole cut into it. You could wear it on your head."
flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
icon = 'icons/obj/clothing/material_armor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "bucket"
item_state = "bucket"
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 9d4a23dabc2..6b3598573dc 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -28,7 +28,12 @@
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
icon = 'icons/obj/weapons.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
+ )
icon_state = "hatchet"
+ item_state = "hatchet"
force_divisor = 0.2 // 12 with hardness 60 (steel)
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
w_class = 2
@@ -68,6 +73,10 @@
name = "mini hoe"
desc = "It's used for removing weeds or scratching your back."
icon = 'icons/obj/weapons.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
+ )
icon_state = "hoe"
item_state = "hoe"
force_divisor = 0.25 // 5 with weight 20 (steel)
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index d963cb2edb4..1d371e6d5a2 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -2,6 +2,10 @@
desc = "The world of janitalia wouldn't be complete without a mop."
name = "mop"
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "mop"
item_state = "mop"
force = 3.0
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index 61da3bd9558..22c181a6e6d 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -5,6 +5,10 @@
desc = "A cheap bar of soap. Doesn't smell."
gender = PLURAL
icon = 'icons/obj/soap.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "soap"
item_state = "soap"
w_class = 2.0
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 41ef151ae58..be382509ad1 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -33,6 +33,10 @@
name = "trash bag"
desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "trashbag0"
item_state = "trashbag"
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 84f82433b3d..5043d11491a 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -25,7 +25,7 @@
name = "box"
desc = "It's just an ordinary box."
icon_state = "box"
- item_state = "syringe_kit"
+ item_state = "box"
center_of_mass = list("x" = 13,"y" = 10)
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
var/maxHealth = 20 //health is already defined
@@ -360,7 +360,7 @@
name = "death alarm kit"
desc = "Box of stuff used to implant death alarms."
icon_state = "implant"
- item_state = "syringe_kit"
+ item_state = "box"
starts_with = list(/obj/item/implanter = 1, /obj/item/implantcase/death_alarm = 6)
/obj/item/storage/box/condimentbottles
@@ -501,7 +501,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "light"
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
- item_state = "syringe_kit"
+ item_state = "box"
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/storage/box/lights/Initialize() // TODO-STORAGE: Initialize()?
@@ -584,6 +584,10 @@
name = "portable freezer"
desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
icon = 'icons/obj/storage.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
icon_state = "portafreezer"
item_state = "medicalpack"
max_w_class = 3
@@ -594,9 +598,8 @@
/obj/item/storage/box/freezer/organcooler
name = "organ cooler"
desc = "A sealed, cooled container to keep organs from decaying."
- icon = 'icons/obj/storage.dmi'
icon_state = "organcooler"
- item_state = "firstaid-advanced"
+ item_state = "advfirstaid"
max_w_class = ITEMSIZE_NORMAL
foldable = FALSE
w_class = ITEMSIZE_LARGE
@@ -606,7 +609,6 @@
/obj/item/reagent_containers/glass,
/obj/item/gun
)
- use_to_pickup = FALSE
storage_slots = 2
/obj/item/storage/box/kitchen
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 9cbac30b0cb..c6603546bd7 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -15,7 +15,7 @@
/obj/item/storage/fancy
- item_state = "syringe_kit" //placeholder, many of these don't have inhands
+ item_state = "box" //placeholder, many of these don't have inhands
var/icon_type = null
var/storage_type = "box"
drop_sound = 'sound/items/drop/box.ogg'
@@ -339,7 +339,7 @@
desc = "A locked box for keeping things away from children."
icon = 'icons/obj/vialbox.dmi'
icon_state = "vialbox0"
- item_state = "syringe_kit"
+ item_state = "box"
use_sound = 'sound/items/drop/glass.ogg'
drop_sound = 'sound/items/drop/metalboots.ogg'
max_w_class = 2
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a54baef6042..94e410eccb7 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -11,6 +11,10 @@
name = "first-aid kit"
desc = "It's an emergency medical kit for those serious boo-boos."
icon_state = "firstaid"
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
center_of_mass = list("x" = 13,"y" = 10)
throw_speed = 2
throw_range = 8
@@ -25,7 +29,7 @@
name = "fire first-aid kit"
desc = "It's an emergency medical kit for when the toxins lab -spontaneously- burns down."
icon_state = "ointment"
- item_state = "firstaid-ointment"
+ item_state = "ointment"
starts_with = list(
/obj/item/reagent_containers/pill/kelotane = 3,
/obj/item/stack/medical/ointment = 2,
@@ -50,7 +54,7 @@
name = "toxin first aid"
desc = "Used to treat when you have a high amount of toxins in your body."
icon_state = "antitoxin"
- item_state = "firstaid-toxin"
+ item_state = "antitoxin"
starts_with = list(
/obj/item/reagent_containers/syringe/dylovene = 3,
/obj/item/reagent_containers/pill/antitox = 3,
@@ -65,7 +69,7 @@
name = "oxygen deprivation kit"
desc = "A box full of oxygen related goodies."
icon_state = "o2"
- item_state = "firstaid-o2"
+ item_state = "o2"
starts_with = list(
/obj/item/reagent_containers/inhaler/dexalin = 4,
/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 2,
@@ -76,7 +80,7 @@
name = "advanced first-aid kit"
desc = "Contains advanced medical treatments."
icon_state = "advfirstaid"
- item_state = "firstaid-advanced"
+ item_state = "advfirstaid"
starts_with = list(
/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 1,
/obj/item/stack/medical/advanced/bruise_pack = 3,
@@ -88,7 +92,7 @@
name = "combat medical kit"
desc = "Contains advanced medical treatments."
icon_state = "bezerk"
- item_state = "firstaid-advanced"
+ item_state = "bezerk"
starts_with = list(
/obj/item/storage/pill_bottle/bicaridine = 1,
/obj/item/storage/pill_bottle/dermaline = 1,
@@ -103,18 +107,18 @@
name = "surgery kit"
desc = "Contains tools for surgery. Has precise foam fitting for safe transport."
icon_state = "purplefirstaid"
- item_state = "firstaid-advanced"
+ item_state = "purplefirstaid"
use_sound = 'sound/items/storage/briefcase.ogg'
starts_with = list(
- /obj/item/bonesetter = 1,
- /obj/item/cautery = 1,
- /obj/item/circular_saw = 1,
- /obj/item/hemostat = 1,
- /obj/item/retractor = 1,
- /obj/item/scalpel = 1,
- /obj/item/surgicaldrill = 1,
- /obj/item/bonegel = 1,
- /obj/item/FixOVein = 1,
+ /obj/item/surgery/bonesetter = 1,
+ /obj/item/surgery/cautery = 1,
+ /obj/item/surgery/circular_saw = 1,
+ /obj/item/surgery/hemostat = 1,
+ /obj/item/surgery/retractor = 1,
+ /obj/item/surgery/scalpel = 1,
+ /obj/item/surgery/surgicaldrill = 1,
+ /obj/item/surgery/bonegel = 1,
+ /obj/item/surgery/FixOVein = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/reagent_containers/inhaler/soporific = 2
)
@@ -128,6 +132,7 @@
name = "brute aid kit"
desc = "A NanoTrasen care package for moderately injured miners."
icon_state = "brute"
+ item_state = "brute"
starts_with = list(
/obj/item/stack/medical/bruise_pack = 4,
/obj/item/stack/medical/advanced/bruise_pack = 2
@@ -141,7 +146,11 @@
desc = "It's an airtight container for storing medication."
icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi'
- item_state = "contsolid"
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
+ item_state = "pill_canister"
center_of_mass = list("x" = 16,"y" = 12)
w_class = 2.0
can_hold = list(/obj/item/reagent_containers/pill,/obj/item/dice,/obj/item/paper)
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 2aac1e716ee..6ef416c8374 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -95,7 +95,7 @@
name = "medal box"
desc = "A locked box used to store medals."
icon_state = "medalbox+l"
- item_state = "syringe_kit"
+ item_state = "box"
w_class = 3
max_w_class = 2
req_access = list(access_captain)
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index b6eae798004..d6bb1b54c4b 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -8,59 +8,63 @@
* Circular Saw
* Tray
*/
+/obj/item/surgery/
+ name = "surgery tool"
+ desc = "hey, you aren't supposed to have this"
+ icon = 'icons/obj/surgery.dmi'
+ w_class = 2.0
+ drop_sound = 'sound/items/drop/scrap.ogg'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
/*
* Retractor
*/
-/obj/item/retractor
+/obj/item/surgery/retractor
name = "retractor"
desc = "Retracts stuff."
- icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
+ item_state = "retractor"
matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000)
flags = CONDUCT
- w_class = 2.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
- drop_sound = 'sound/items/drop/scrap.ogg'
/*
* Hemostat
*/
-/obj/item/hemostat
+/obj/item/surgery/hemostat
name = "hemostat"
desc = "You think you have seen this before."
- icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
+ item_state = "hemostat"
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
flags = CONDUCT
- w_class = 2.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("attacked", "pinched")
- drop_sound = 'sound/items/drop/scrap.ogg'
/*
* Cautery
*/
-/obj/item/cautery
+/obj/item/surgery/cautery
name = "cautery"
desc = "This stops bleeding."
- icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
+ item_state = "cautery"
matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
flags = CONDUCT
- w_class = 2.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("burnt")
- drop_sound = 'sound/items/drop/scrap.ogg'
/*
* Surgical Drill
*/
-/obj/item/surgicaldrill
+/obj/item/surgery/surgicaldrill
name = "surgical drill"
desc = "You can drill using this item. You dig?"
- icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
+ item_state = "drill"
hitsound = 'sound/weapons/saw/circsawhit.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000)
flags = CONDUCT
@@ -73,11 +77,11 @@
/*
* Scalpel
*/
-/obj/item/scalpel
+/obj/item/surgery/scalpel
name = "scalpel"
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
@@ -95,40 +99,40 @@
/*
* Researchable Scalpels
*/
-/obj/item/scalpel/laser1
+/obj/item/surgery/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/scalpel/laser2
+/obj/item/surgery/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/scalpel/laser3
+/obj/item/surgery/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/scalpel/manager
+/obj/item/surgery/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
/*
* Circular Saw
*/
-/obj/item/circular_saw
+/obj/item/surgery/circular_saw
name = "circular saw"
desc = "For heavy duty cutting."
- icon = 'icons/obj/surgery.dmi'
icon_state = "saw"
+ item_state = "scalpel"
hitsound = 'sound/weapons/saw/circsawhit.ogg'
flags = CONDUCT
force = 15.0
@@ -144,37 +148,33 @@
drop_sound = 'sound/items/drop/accessory.ogg'
//misc, formerly from code/defines/weapons.dm
-/obj/item/bonegel
+/obj/item/surgery/bonegel
name = "bone gel"
- icon = 'icons/obj/surgery.dmi'
icon_state = "bone-gel"
+ item_state = "bone-gel"
force = 0
- w_class = 2.0
throwforce = 1.0
drop_sound = 'sound/items/drop/bottle.ogg'
-/obj/item/FixOVein
+/obj/item/surgery/FixOVein
name = "FixOVein"
- icon = 'icons/obj/surgery.dmi'
icon_state = "fixovein"
+ item_state = "fixovein"
force = 0
throwforce = 1.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
- w_class = 2.0
var/usage_amount = 10
drop_sound = 'sound/items/drop/accessory.ogg'
-/obj/item/bonesetter
+/obj/item/surgery/bonesetter
name = "bone setter"
- icon = 'icons/obj/surgery.dmi'
icon_state = "bonesetter"
+ item_state = "bonesetter"
force = 8.0
throwforce = 9.0
throw_speed = 3
throw_range = 5
- w_class = 2.0
attack_verb = list("attacked", "hit", "bludgeoned")
- drop_sound = 'sound/items/drop/scrap.ogg'
/obj/item/storage/fancy/tray
name = "surgery tray"
@@ -190,29 +190,29 @@
icon_type = "surgery tool"
storage_type = "tray"
can_hold = list(
- /obj/item/bonesetter,
- /obj/item/cautery,
- /obj/item/circular_saw,
- /obj/item/hemostat,
- /obj/item/retractor,
- /obj/item/scalpel,
- /obj/item/surgicaldrill,
- /obj/item/bonegel,
- /obj/item/FixOVein,
+ /obj/item/surgery/bonesetter,
+ /obj/item/surgery/cautery,
+ /obj/item/surgery/circular_saw,
+ /obj/item/surgery/hemostat,
+ /obj/item/surgery/retractor,
+ /obj/item/surgery/scalpel,
+ /obj/item/surgery/surgicaldrill,
+ /obj/item/surgery/bonegel,
+ /obj/item/surgery/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/nanopaste
)
starts_with = list(
- /obj/item/bonesetter = 1,
- /obj/item/cautery = 1,
- /obj/item/circular_saw = 1,
- /obj/item/hemostat = 1,
- /obj/item/retractor = 1,
- /obj/item/scalpel = 1,
- /obj/item/surgicaldrill = 1,
- /obj/item/bonegel = 1,
- /obj/item/FixOVein = 1,
+ /obj/item/surgery/bonesetter = 1,
+ /obj/item/surgery/cautery = 1,
+ /obj/item/surgery/circular_saw = 1,
+ /obj/item/surgery/hemostat = 1,
+ /obj/item/surgery/retractor = 1,
+ /obj/item/surgery/scalpel = 1,
+ /obj/item/surgery/surgicaldrill = 1,
+ /obj/item/surgery/bonegel = 1,
+ /obj/item/surgery/FixOVein = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
)
@@ -220,15 +220,19 @@
cut_overlays()
var/list/types_and_overlays = list(
- /obj/item/bonesetter = "tray_bonesetter",
- /obj/item/cautery = "tray_cautery",
- /obj/item/circular_saw = "tray_saw",
- /obj/item/hemostat = "tray_hemostat",
- /obj/item/retractor = "tray_retractor",
- /obj/item/scalpel = "tray_scalpel",
- /obj/item/surgicaldrill = "tray_drill",
- /obj/item/bonegel = "tray_bone-gel",
- /obj/item/FixOVein = "tray_fixovein",
+ /obj/item/surgery/bonesetter = "tray_bonesetter",
+ /obj/item/surgery/cautery = "tray_cautery",
+ /obj/item/surgery/circular_saw = "tray_saw",
+ /obj/item/surgery/hemostat = "tray_hemostat",
+ /obj/item/surgery/retractor = "tray_retractor",
+ /obj/item/surgery/scalpel = "tray_scalpel",
+ /obj/item/surgery/scalpel/laser1 = "tray_scalpel_laser1",
+ /obj/item/surgery/scalpel/laser2 = "tray_scalpel_laser2",
+ /obj/item/surgery/scalpel/laser3 = "tray_scalpel_laser3",
+ /obj/item/surgery/scalpel/manager = "tray_scalpel_manager",
+ /obj/item/surgery/surgicaldrill = "tray_drill",
+ /obj/item/surgery/bonegel = "tray_bone-gel",
+ /obj/item/surgery/FixOVein = "tray_fixovein",
/obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack"
)
for (var/obj/item/W in contents)
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 67bb345f7d8..48eb3aab1f3 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -34,9 +34,9 @@
name = "jetpack (empty)"
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
+ item_state = "jetpack"
gauge_icon = null
w_class = 4.0
- item_state = "jetpack"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
var/datum/effect_system/ion_trail/ion_trail
var/on = 0.0
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 37ba5618f2a..5598297a0f3 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -108,6 +108,7 @@
name = "emergency oxygen tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
+ item_state = "emergency"
gauge_icon = "indicator_emergency"
gauge_cap = 4
flags = CONDUCT
@@ -131,11 +132,13 @@
/obj/item/tank/emergency_oxygen/engi
name = "extended-capacity emergency oxygen tank"
icon_state = "emergency_engi"
+ item_state = "emergency_engi"
volume = 6
/obj/item/tank/emergency_oxygen/double
name = "double emergency oxygen tank"
icon_state = "emergency_double"
+ item_state = "emergency_engi"
gauge_icon = "indicator_emergency_double"
volume = 10
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 2bf7781dd36..b48e126f289 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -6,6 +6,10 @@
name = "tank"
icon = 'icons/obj/tank.dmi'
drop_sound = 'sound/items/drop/gascan.ogg'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_tank.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_tank.dmi',
+ )
var/gauge_icon = "indicator_tank"
var/last_gauge_pressure
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 19bf5193cec..be836726581 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -258,7 +258,7 @@
name = "inflatable barrier box"
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
- item_state = "syringe_kit"
+ item_state = "box"
w_class = 3
max_storage_space = 28
can_hold = list(/obj/item/inflatable)
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index e8762b2a129..fb1757bbf8f 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -1,6 +1,10 @@
/obj/item/device/assembly/mousetrap
name = "mousetrap"
desc = "A handy little spring-loaded trap for catching pesty rodents."
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "mousetrap"
origin_tech = list(TECH_COMBAT = 1)
matter = list(DEFAULT_WALL_MATERIAL = 100)
diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm
index c01f6c8113f..e0dda968b4e 100644
--- a/code/modules/cargo/random_stock/t2_uncommon.dm
+++ b/code/modules/cargo/random_stock/t2_uncommon.dm
@@ -304,9 +304,9 @@ STOCK_ITEM_UNCOMMON(blade, 1.2)
STOCK_ITEM_UNCOMMON(laserscalpel, 1.3)
var/list/lasers = list(
- /obj/item/scalpel/laser1 = 3,
- /obj/item/scalpel/laser2 = 2,
- /obj/item/scalpel/laser3 = 1
+ /obj/item/surgery/scalpel/laser1 = 3,
+ /obj/item/surgery/scalpel/laser2 = 2,
+ /obj/item/surgery/scalpel/laser3 = 1
)
var/type = pickweight(lasers)
new type(L)
diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm
index f6e598c9ae7..b6d7cc323a9 100644
--- a/code/modules/cargo/random_stock/t3_rare.dm
+++ b/code/modules/cargo/random_stock/t3_rare.dm
@@ -76,7 +76,7 @@ STOCK_ITEM_RARE(sword, 0.5)
new /obj/random/sword(L)
STOCK_ITEM_RARE(ims, 1.5)
- new /obj/item/scalpel/manager(L)
+ new /obj/item/surgery/scalpel/manager(L)
STOCK_ITEM_RARE(exogear, 1.5)
var/list/equips = list(
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 371e09f7b37..0ba20e24d4a 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -362,7 +362,7 @@
/obj/item/clothing/gloves/attackby(obj/item/W, mob/user)
..()
- if(W.iswirecutter() || istype(W, /obj/item/scalpel))
+ if(W.iswirecutter() || istype(W, /obj/item/surgery/scalpel))
if (clipped)
to_chat(user, "\The [src] have already been clipped!")
update_icon()
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 809d51dc384..5a81fe94983 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -577,7 +577,7 @@ BLIND // can't see anything
name = "optical thermal implants"
desc = "A set of implantable lenses designed to augment your vision"
icon_state = "thermalimplants"
- item_state = "syringe_kit"
+ item_state = "box"
item_flags = null
/obj/item/clothing/glasses/thermal/aviator
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index d9c8f4bd68d..08eb187b5a6 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -6,7 +6,7 @@
species_restricted = list("exclude","Vaurca Breeder","Vaurca Warform")
/obj/item/clothing/gloves/boxing/attackby(obj/item/W, mob/user)
- if(W.iswirecutter() || istype(W, /obj/item/scalpel))
+ if(W.iswirecutter() || istype(W, /obj/item/surgery/scalpel))
to_chat(user, "That won't work.") //Nope)
return
..()
diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm
index 6316c1f109d..af06df380ac 100644
--- a/code/modules/clothing/gloves/stungloves.dm
+++ b/code/modules/clothing/gloves/stungloves.dm
@@ -42,7 +42,7 @@
update_icon()
return
- else if((cell || wired) && (W.iswirecutter() || istype(W, /obj/item/scalpel)))
+ else if((cell || wired) && (W.iswirecutter() || istype(W, /obj/item/surgery/scalpel)))
//stunglove stuff
if(cell)
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index b2e6fe8f593..e0f0b938e3f 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -647,6 +647,10 @@
description_fluff = "Used by the janitor to passive-aggressively point at when you eventually slip on one of their mopped floors."
description_info = "Alt-click, or click in-hand to toggle the caution lights. It looks like you can wear it in your suit slot."
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "caution"
drop_sound = 'sound/items/drop/shoes.ogg'
force = 1
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index fa72c47ccad..9ddfce26c35 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -170,6 +170,10 @@
name = "stethoscope"
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
icon_state = "stethoscope"
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
flippable = 1
/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 2ed6c2b1268..83f2c0335ce 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1379,7 +1379,7 @@ All custom items with worn sprites must follow the contained sprite system: http
desc = "A kit containing a change of casual clothes, packaged for easy transport. This one advertises some sort of cartoon featuring slimes. It is labeled \"J. Beal.\""
icon = 'icons/obj/custom_items/jennifer_clothes.dmi'
icon_state = "jennifer_wardrobe_box"
- item_state = "syringe_kit"
+ item_state = "box"
/obj/item/fluff/jennifer_wardrobe_kit/attack_self(mob/user as mob)
if (use_check_and_message(user, USE_DISALLOW_SILICONS))
@@ -1829,7 +1829,7 @@ All custom items with worn sprites must follow the contained sprite system: http
w_class = 2
-/obj/item/retractor/fluff/tristen_retractor //Laser Retractor - Tristen Wolff - elianabeth
+/obj/item/surgery/retractor/fluff/tristen_retractor //Laser Retractor - Tristen Wolff - elianabeth
name = "laser retractor"
desc = "The fabled laser retractor. It's a horrible amalgamation of a laser pointer, a retractor, and lots of tape."
icon = 'icons/obj/custom_items/tristen_retractor.dmi'
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 157f58f51b4..06d90159b07 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -44,7 +44,7 @@
/obj/item/corncob/attackby(obj/item/W as obj, mob/user as mob)
..()
- if(istype(W, /obj/item/circular_saw) || istype(W, /obj/item/material/hatchet) || istype(W, /obj/item/material/kitchen/utensil/knife) || istype(W, /obj/item/material/knife) || istype(W, /obj/item/material/knife/ritual))
+ if(istype(W, /obj/item/surgery/circular_saw) || istype(W, /obj/item/material/hatchet) || istype(W, /obj/item/material/kitchen/utensil/knife) || istype(W, /obj/item/material/knife) || istype(W, /obj/item/material/knife/ritual))
to_chat(user, "You use [W] to fashion a pipe out of the corn cob!")
new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc)
qdel(src)
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index 8cb2bc05ba3..ff0037e0ebc 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -242,7 +242,7 @@
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
SSplants.add_plant(src)
- if(W.iswirecutter() || istype(W, /obj/item/scalpel))
+ if(W.iswirecutter() || istype(W, /obj/item/surgery/scalpel))
if(sampled)
to_chat(user, "\The [src] has already been sampled recently.")
return
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 7e21fd9b60e..75281db4722 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -462,7 +462,7 @@
if (O.is_open_container())
return 0
- if(O.iswirecutter() || istype(O, /obj/item/scalpel))
+ if(O.iswirecutter() || istype(O, /obj/item/surgery/scalpel))
if(!seed)
to_chat(user, "There is nothing to take a sample from in \the [src].")
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index 98e8f68c446..7666598a16e 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -321,19 +321,19 @@ var/list/worths = list(
/obj/item/shield/buckler = 200,
/obj/item/shield/energy = 1200,
//SURGERY,
- /obj/item/retractor = 80,
- /obj/item/hemostat = 90,
- /obj/item/cautery = 110,
- /obj/item/surgicaldrill = 130,
- /obj/item/scalpel/laser1 = 300,
- /obj/item/scalpel/laser2 = 600,
- /obj/item/scalpel/laser3 = 900,
- /obj/item/scalpel/manager = 1200,
- /obj/item/scalpel = 60,
- /obj/item/circular_saw = 140,
- /obj/item/bonegel = 300,
- /obj/item/FixOVein = 500,
- /obj/item/bonesetter = 150,
+ /obj/item/surgery/retractor = 80,
+ /obj/item/surgery/hemostat = 90,
+ /obj/item/surgery/cautery = 110,
+ /obj/item/surgery/surgicaldrill = 130,
+ /obj/item/surgery/scalpel/laser1 = 300,
+ /obj/item/surgery/scalpel/laser2 = 600,
+ /obj/item/surgery/scalpel/laser3 = 900,
+ /obj/item/surgery/scalpel/manager = 1200,
+ /obj/item/surgery/scalpel = 60,
+ /obj/item/surgery/circular_saw = 140,
+ /obj/item/surgery/bonegel = 300,
+ /obj/item/surgery/FixOVein = 500,
+ /obj/item/surgery/bonesetter = 150,
/obj/item/locator = 100,
/obj/item/wrench = 30,
/obj/item/screwdriver = 15,
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index fffedbf6d03..8d728f5ef1e 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -343,6 +343,10 @@
/obj/item/shovel/spade
name = "spade"
desc = "A small tool for digging and moving dirt."
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
+ )
icon_state = "spade"
item_state = "spade"
force = 5.0
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9cd9e6507bc..dd784ded060 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -207,15 +207,15 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/borg/sight/hud/med(src)
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/reagent_containers/borghypo/medical(src)
- src.modules += new /obj/item/scalpel(src)
- src.modules += new /obj/item/hemostat(src)
- src.modules += new /obj/item/retractor(src)
- src.modules += new /obj/item/cautery(src)
- src.modules += new /obj/item/bonegel(src)
- src.modules += new /obj/item/FixOVein(src)
- src.modules += new /obj/item/bonesetter(src)
- src.modules += new /obj/item/circular_saw(src)
- src.modules += new /obj/item/surgicaldrill(src)
+ src.modules += new /obj/item/surgery/scalpel(src)
+ src.modules += new /obj/item/surgery/hemostat(src)
+ src.modules += new /obj/item/surgery/retractor(src)
+ src.modules += new /obj/item/surgery/cautery(src)
+ src.modules += new /obj/item/surgery/bonegel(src)
+ src.modules += new /obj/item/surgery/FixOVein(src)
+ src.modules += new /obj/item/surgery/bonesetter(src)
+ src.modules += new /obj/item/surgery/circular_saw(src)
+ src.modules += new /obj/item/surgery/surgicaldrill(src)
src.modules += new /obj/item/gripper/chemistry(src)
src.modules += new /obj/item/reagent_containers/dropper/industrial(src)
src.modules += new /obj/item/roller_holder(src)
@@ -697,8 +697,8 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/wrench/robotic(src)
src.modules += new /obj/item/screwdriver(src)
src.modules += new /obj/item/crowbar/robotic(src)
- src.modules += new /obj/item/scalpel(src)
- src.modules += new /obj/item/circular_saw(src)
+ src.modules += new /obj/item/surgery/scalpel(src)
+ src.modules += new /obj/item/surgery/circular_saw(src)
src.modules += new /obj/item/extinguisher/mini(src)
src.modules += new /obj/item/reagent_containers/syringe(src)
src.modules += new /obj/item/gripper/chemistry(src)
@@ -980,15 +980,15 @@ var/global/list/robot_modules = list(
// Medical
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/reagent_containers/borghypo/medical(src)
- src.modules += new /obj/item/scalpel(src)
- src.modules += new /obj/item/hemostat(src)
- src.modules += new /obj/item/retractor(src)
- src.modules += new /obj/item/cautery(src)
- src.modules += new /obj/item/bonegel(src)
- src.modules += new /obj/item/FixOVein(src)
- src.modules += new /obj/item/bonesetter(src)
- src.modules += new /obj/item/circular_saw(src)
- src.modules += new /obj/item/surgicaldrill(src)
+ src.modules += new /obj/item/surgery/scalpel(src)
+ src.modules += new /obj/item/surgery/hemostat(src)
+ src.modules += new /obj/item/surgery/retractor(src)
+ src.modules += new /obj/item/surgery/cautery(src)
+ src.modules += new /obj/item/surgery/bonegel(src)
+ src.modules += new /obj/item/surgery/FixOVein(src)
+ src.modules += new /obj/item/surgery/bonesetter(src)
+ src.modules += new /obj/item/surgery/circular_saw(src)
+ src.modules += new /obj/item/surgery/surgicaldrill(src)
src.modules += new /obj/item/gripper/chemistry(src)
src.modules += new /obj/item/reagent_containers/dropper/industrial(src)
src.modules += new /obj/item/reagent_containers/syringe(src)
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index 151170c5fcd..6c852dbd7c7 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -296,7 +296,7 @@
return
/obj/item/organ/internal/brain/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W,/obj/item/surgicaldrill))
+ if(istype(W,/obj/item/surgery/surgicaldrill))
if(!can_lobotomize)
return
if(!lobotomized)
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 3a3011e702b..4a86fd56041 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -137,17 +137,17 @@
/obj/item/organ/external/attackby(obj/item/W as obj, mob/user as mob)
switch(stage)
if(0)
- if(istype(W,/obj/item/scalpel))
+ if(istype(W,/obj/item/surgery/scalpel))
user.visible_message("[user] cuts [src] open with [W]!")
stage++
return
if(1)
- if(istype(W,/obj/item/retractor))
+ if(istype(W,/obj/item/surgery/retractor))
user.visible_message("[user] cracks [src] open like an egg with [W]!")
stage++
return
if(2)
- if(istype(W,/obj/item/hemostat))
+ if(istype(W,/obj/item/surgery/hemostat))
if(contents.len)
var/obj/item/removing = pick(contents)
removing.forceMove(get_turf(user.loc))
diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm
index 4873fcead5f..d93eae86f91 100644
--- a/code/modules/power/lights/bulbs.dm
+++ b/code/modules/power/lights/bulbs.dm
@@ -63,7 +63,7 @@
name = "light bulb"
desc = "A replacement light bulb."
icon_state = "lbulb_preset"//preset state for mapping
- item_state = "contvapour"
+ item_state = "egg"
matter = list(MATERIAL_GLASS = 100)
brightness_range = 5
brightness_power = 0.75
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 4050fb1def2..7f6d9baeb09 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -71,7 +71,7 @@
icon = 'icons/obj/ammo.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
- item_state = "syringe_kit"
+ item_state = "box"
matter = list(DEFAULT_WALL_MATERIAL = 500)
throwforce = 5
w_class = 2
diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm
index 7926e9e651c..fa6cdbaabfc 100644
--- a/code/modules/projectiles/guns/projectile/improvised.dm
+++ b/code/modules/projectiles/guns/projectile/improvised.dm
@@ -33,7 +33,7 @@
/obj/item/gun/projectile/shotgun/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
- if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/gun/energy/plasmacutter) && w_class != 3)
+ if(istype(A, /obj/item/surgery/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/gun/energy/plasmacutter) && w_class != 3)
to_chat(user, "You begin to shorten the barrel of \the [src].")
if(loaded.len)
for(var/i in 1 to max_shells)
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 92d22976e53..9f54f828484 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -11,7 +11,7 @@
return ..()
var/static/list/barrel_cutting_tools = typecacheof(list(
- /obj/item/circular_saw,
+ /obj/item/surgery/circular_saw,
/obj/item/melee/energy,
/obj/item/gun/energy/plasmacutter // does this even work?
))
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 48e015d70dd..10f21f59862 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -2,7 +2,12 @@
name = "dropper"
desc = "A dropper. Transfers 5 units."
icon = 'icons/obj/chemical.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
icon_state = "dropper0"
+ item_state = "dropper"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
w_class = ITEMSIZE_TINY
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index c0258fd9af8..ef4827c704b 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -127,7 +127,7 @@
name = "robust coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
@@ -139,7 +139,7 @@
name = "seasonal pumpkin spice latte"
desc = "A limited edition pumpkin spice coffee drink!"
icon_state = "psl_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
@@ -151,7 +151,7 @@
name = "duke purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "coffee_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -163,7 +163,7 @@
name = "green tea"
desc = "Tasty green tea. It's good for you!"
icon_state = "greentea_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -175,7 +175,7 @@
name = "hot cider"
desc = "A hearty apple drink, spiced just right."
icon_state = "soy_latte_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -187,7 +187,7 @@
name = "chai Tea"
desc = "The name is redundant but the flavor is delicious!"
icon_state = "chai_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -199,7 +199,7 @@
name = "ice cup"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee_vended"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=15, "y"=10)
@@ -211,7 +211,7 @@
name = "dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=15, "y"=13)
@@ -223,7 +223,7 @@
name = "cup ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
- item_state = "contvapour"
+ item_state = "coffee"
trash = /obj/item/trash/ramen
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index e68c661ad4c..c47c7e859ce 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -221,6 +221,10 @@
desc = "A blue plastic bucket."
name = "bucket"
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "bucket"
item_state = "bucket"
center_of_mass = list("x" = 16,"y" = 10)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index b28d42ff9c1..0543ae38784 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -8,6 +8,10 @@
description_fluff = "The Zeng-Hu Pharmaceuticals' Hypospray - 9 out of 10 doctors recommend it!"
description_info = "Unlike a syringe, reagents have to be poured into the hypospray before it can be used."
icon = 'icons/obj/syringe.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
item_state = "hypo"
icon_state = "hypo"
amount_per_transfer_from_this = 5
@@ -95,8 +99,8 @@
name = "autoinjector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
icon_state = "autoinjector1"
+ item_state = "autoinjector1"
var/empty_state = "autoinjector0"
- item_state = "autoinjector"
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
volume = 5
@@ -105,6 +109,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/Initialize()
. =..()
icon_state = empty_state
+ item_state = empty_state
update_icon()
/obj/item/reagent_containers/hypospray/autoinjector/attack(var/mob/M, var/mob/user, target_zone)
@@ -136,8 +141,10 @@
/obj/item/reagent_containers/hypospray/autoinjector/update_icon()
if(reagents.total_volume > 0 && !is_open_container())
icon_state = initial(icon_state)
+ item_state = initial(icon_state)
else
icon_state = empty_state
+ item_state = empty_state
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user)
..(user)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 77265ae34c4..959ada421e1 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -2,6 +2,10 @@
name = "spray bottle"
desc = "A spray bottle, with an unscrewable top."
icon = 'icons/obj/janitor.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
+ )
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass = list("x" = 16,"y" = 10)
@@ -240,6 +244,10 @@
name = "Plant-B-Gone"
desc = "Kills those pesky weeds!"
icon = 'icons/obj/hydroponics_machines.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
+ )
icon_state = "plantbgone"
item_state = "plantbgone"
volume = 100
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 8072039607f..9b6019ea76e 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -10,6 +10,10 @@
name = "syringe"
desc = "A syringe."
icon = 'icons/obj/syringe.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
+ )
item_state = "syringe_0"
icon_state = "0"
center_of_mass = list("x" = 16,"y" = 14)
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 9a0f8faaff0..67dcf06c7ef 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -89,7 +89,7 @@
id = "scalpel_laser1"
req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500)
- build_path = /obj/item/scalpel/laser1
+ build_path = /obj/item/surgery/scalpel/laser1
sort_string = "MBBAA"
/datum/design/item/scalpel_laser2
@@ -98,7 +98,7 @@
id = "scalpel_laser2"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2500)
- build_path = /obj/item/scalpel/laser2
+ build_path = /obj/item/surgery/scalpel/laser2
sort_string = "MBBAB"
/datum/design/item/scalpel_laser3
@@ -107,7 +107,7 @@
id = "scalpel_laser3"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2000, MATERIAL_GOLD = 1500)
- build_path = /obj/item/scalpel/laser3
+ build_path = /obj/item/surgery/scalpel/laser3
sort_string = "MBBAC"
/datum/design/item/scalpel_manager
@@ -116,7 +116,7 @@
id = "scalpel_manager"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 5, TECH_DATA = 4)
materials = list (DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 1500, MATERIAL_GOLD = 1500, MATERIAL_DIAMOND = 750)
- build_path = /obj/item/scalpel/manager
+ build_path = /obj/item/surgery/scalpel/manager
sort_string = "MBBAD"
/datum/design/item/medical/inhaler
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
index 637e51f83ed..55ce17c18a0 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
@@ -43,17 +43,17 @@
/obj/item/device/radio/beacon,\
/obj/item/autopsy_scanner,\
/obj/item/bikehorn,\
- /obj/item/bonesetter,\
+ /obj/item/surgery/bonesetter,\
/obj/item/material/hatchet/butch,\
/obj/item/clothing/suit/caution,\
/obj/item/clothing/head/cone,\
/obj/item/crowbar,\
/obj/item/clipboard,\
/obj/item/cell,\
- /obj/item/circular_saw,\
+ /obj/item/surgery/circular_saw,\
/obj/item/material/hatchet,\
/obj/item/handcuffs,\
- /obj/item/hemostat,\
+ /obj/item/surgery/hemostat,\
/obj/item/material/knife,\
/obj/item/flame/lighter,\
/obj/item/light/bulb,\
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 94a7fa05d94..19390c9e7fd 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -154,7 +154,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "excavation"
desc = "A set of picks for excavation."
- item_state = "syringe_kit"
+ item_state = "box"
foldable = /obj/item/stack/material/cardboard //BubbleWrap
storage_slots = 7
w_class = 2
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index 263854dd1e6..a20317a2c4f 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -5,7 +5,7 @@
/datum/surgery_step/glue_bone
allowed_tools = list(
- /obj/item/bonegel = 100, \
+ /obj/item/surgery/bonegel = 100, \
/obj/item/tape_roll = 60
)
can_infect = 1
@@ -42,7 +42,7 @@
/datum/surgery_step/set_bone
allowed_tools = list(
- /obj/item/bonesetter = 100, \
+ /obj/item/surgery/bonesetter = 100, \
/obj/item/wrench = 75 \
)
@@ -81,7 +81,7 @@
/datum/surgery_step/mend_skull
allowed_tools = list(
- /obj/item/bonesetter = 100, \
+ /obj/item/surgery/bonesetter = 100, \
/obj/item/wrench = 75 \
)
@@ -115,7 +115,7 @@
/datum/surgery_step/finish_bone
allowed_tools = list(
- /obj/item/bonegel = 100, \
+ /obj/item/surgery/bonegel = 100, \
/obj/item/tape_roll = 60
)
can_infect = 1
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index e9fccbb580a..491ebc1961b 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -17,7 +17,7 @@
/datum/surgery_step/open_encased/saw
allowed_tools = list(
- /obj/item/circular_saw = 100,
+ /obj/item/surgery/circular_saw = 100,
/obj/item/melee/energy = 100,
/obj/item/melee/chainsword = 70,
/obj/item/material/hatchet = 75
@@ -65,7 +65,7 @@
/datum/surgery_step/open_encased/retract
allowed_tools = list(
- /obj/item/retractor = 100, \
+ /obj/item/surgery/retractor = 100, \
/obj/item/crowbar = 75
)
@@ -115,7 +115,7 @@
/datum/surgery_step/open_encased/close
allowed_tools = list(
- /obj/item/retractor = 100, \
+ /obj/item/surgery/retractor = 100, \
/obj/item/crowbar = 75
)
@@ -172,7 +172,7 @@
/datum/surgery_step/open_encased/mend
allowed_tools = list(
- /obj/item/bonegel = 100, \
+ /obj/item/surgery/bonegel = 100, \
/obj/item/tape_roll = 60
)
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index 3deb78d8682..2a680aae3f9 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -17,7 +17,7 @@
/datum/surgery_step/generic/cut_face
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -55,7 +55,7 @@
/datum/surgery_step/robotics/face/synthskin
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
diff --git a/code/modules/surgery/facial_surgery.dm b/code/modules/surgery/facial_surgery.dm
index 06f9a603b5f..03169445686 100644
--- a/code/modules/surgery/facial_surgery.dm
+++ b/code/modules/surgery/facial_surgery.dm
@@ -18,7 +18,7 @@
/datum/surgery_step/generic/prepare_face
allowed_tools = list(
- /obj/item/retractor = 100,
+ /obj/item/surgery/retractor = 100,
/obj/item/material/knife/tacknife = 75
)
@@ -48,7 +48,7 @@
/datum/surgery_step/generic/alter_face
allowed_tools = list(
- /obj/item/hemostat = 100, \
+ /obj/item/surgery/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.
)
@@ -93,7 +93,7 @@
/datum/surgery_step/face/cauterize
allowed_tools = list(
- /obj/item/cautery = 100, \
+ /obj/item/surgery/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
@@ -136,7 +136,7 @@
/datum/surgery_step/robotics/face/synthskinopen
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -164,7 +164,7 @@
/datum/surgery_step/robotics/face/prepare_face
allowed_tools = list(
- /obj/item/retractor = 100,
+ /obj/item/surgery/retractor = 100,
/obj/item/material/knife/tacknife = 75
)
@@ -233,7 +233,7 @@
/datum/surgery_step/robotics/face/seal_face
allowed_tools = list(
- /obj/item/cautery = 100, \
+ /obj/item/surgery/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index e526bee99a4..ca2e209d87c 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -24,9 +24,9 @@
/datum/surgery_step/generic/cut_with_laser
allowed_tools = list(
- /obj/item/scalpel/laser3 = 95, \
- /obj/item/scalpel/laser2 = 85, \
- /obj/item/scalpel/laser1 = 75
+ /obj/item/surgery/scalpel/laser3 = 95, \
+ /obj/item/surgery/scalpel/laser2 = 85, \
+ /obj/item/surgery/scalpel/laser1 = 75
)
priority = 2
min_duration = 90
@@ -67,7 +67,7 @@
/datum/surgery_step/generic/incision_manager
allowed_tools = list(
- /obj/item/scalpel/manager = 100
+ /obj/item/surgery/scalpel/manager = 100
)
priority = 2
min_duration = 80
@@ -107,7 +107,7 @@
/datum/surgery_step/generic/cut_open
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -151,7 +151,7 @@
/datum/surgery_step/generic/cut_open_vaurca
allowed_tools = list(
- /obj/item/surgicaldrill = 85,
+ /obj/item/surgery/surgicaldrill = 85,
/obj/item/pickaxe/ = 15
)
@@ -192,7 +192,7 @@
/datum/surgery_step/generic/clamp_bleeders
allowed_tools = list(
- /obj/item/hemostat = 100, \
+ /obj/item/surgery/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 20
)
@@ -228,7 +228,7 @@
/datum/surgery_step/generic/retract_skin
allowed_tools = list(
- /obj/item/retractor = 100, \
+ /obj/item/surgery/retractor = 100, \
/obj/item/crowbar = 75, \
/obj/item/material/kitchen/utensil/fork = 50
)
@@ -283,7 +283,7 @@
/datum/surgery_step/generic/cauterize
allowed_tools = list(
- /obj/item/cautery = 100,
+ /obj/item/surgery/cautery = 100,
/obj/item/clothing/mask/smokable/cigarette = 25,
/obj/item/flame/lighter = 50,
/obj/item/weldingtool = 75
@@ -320,7 +320,7 @@
/datum/surgery_step/generic/amputate
allowed_tools = list(
- /obj/item/circular_saw = 100,
+ /obj/item/surgery/circular_saw = 100,
/obj/item/melee/energy = 100,
/obj/item/melee/chainsword = 100,
/obj/item/material/hatchet = 55
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index 3febe14853c..e85f253f700 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -41,7 +41,7 @@
/datum/surgery_step/cavity/make_space
allowed_tools = list(
- /obj/item/surgicaldrill = 100, \
+ /obj/item/surgery/surgicaldrill = 100, \
/obj/item/pen = 75, \
/obj/item/stack/rods = 50
)
@@ -71,7 +71,7 @@
/datum/surgery_step/cavity/close_space
priority = 2
allowed_tools = list(
- /obj/item/cautery = 100, \
+ /obj/item/surgery/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
@@ -146,7 +146,7 @@
/datum/surgery_step/cavity/implant_removal
allowed_tools = list(
- /obj/item/hemostat = 100, \
+ /obj/item/surgery/hemostat = 100, \
/obj/item/wirecutters = 75, \
/obj/item/material/kitchen/utensil/fork = 20
)
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index d20481e90c8..3ddf433703e 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -50,7 +50,7 @@
/datum/surgery_step/limb/connect
allowed_tools = list(
- /obj/item/hemostat = 100, \
+ /obj/item/surgery/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 5d4db2a39fc..bb3adc07e77 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -99,7 +99,7 @@
/datum/surgery_step/internal/detach_organ
priority = 1
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -157,7 +157,7 @@
/datum/surgery_step/internal/remove_organ
allowed_tools = list(
- /obj/item/hemostat = 100, \
+ /obj/item/surgery/hemostat = 100, \
/obj/item/wirecutters = 75, \
/obj/item/material/kitchen/utensil/fork = 20
)
@@ -294,7 +294,7 @@
/datum/surgery_step/internal/attach_organ
allowed_tools = list(
- /obj/item/FixOVein = 100, \
+ /obj/item/surgery/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
@@ -342,8 +342,8 @@
/datum/surgery_step/internal/lobotomize
allowed_tools = list(
- /obj/item/scalpel/manager = 95,
- /obj/item/surgicaldrill = 75,
+ /obj/item/surgery/scalpel/manager = 95,
+ /obj/item/surgery/surgicaldrill = 75,
/obj/item/pickaxe/ = 5
)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index bd30e43d075..377d00f84ae 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -7,7 +7,7 @@
/datum/surgery_step/fix_vein
priority = 3
allowed_tools = list(
- /obj/item/FixOVein = 100, \
+ /obj/item/surgery/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
can_infect = 1
@@ -52,7 +52,7 @@
/datum/surgery_step/fix_dead_tissue //Debridement
priority = 3
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -182,7 +182,7 @@
/datum/surgery_step/fix_tendon
priority = 2
allowed_tools = list(
- /obj/item/FixOVein = 100, \
+ /obj/item/surgery/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
can_infect = 1
@@ -218,7 +218,7 @@
/datum/surgery_step/hardsuit
allowed_tools = list(
/obj/item/weldingtool = 80,
- /obj/item/circular_saw = 60,
+ /obj/item/surgery/circular_saw = 60,
/obj/item/gun/energy/plasmacutter = 100
)
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 66d22d5c121..c91c6d8c87f 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -56,7 +56,7 @@
/datum/surgery_step/robotics/open_hatch
allowed_tools = list(
- /obj/item/retractor = 100,
+ /obj/item/surgery/retractor = 100,
/obj/item/crowbar = 100,
/obj/item/material/kitchen/utensil = 50
)
@@ -88,7 +88,7 @@
/datum/surgery_step/robotics/close_hatch
allowed_tools = list(
- /obj/item/retractor = 100,
+ /obj/item/surgery/retractor = 100,
/obj/item/crowbar = 100,
/obj/item/material/kitchen/utensil = 50
)
@@ -198,7 +198,7 @@
/datum/surgery_step/robotics/fix_organ_robotic //For artificial organs
allowed_tools = list(
/obj/item/stack/nanopaste = 100,
- /obj/item/bonegel = 30,
+ /obj/item/surgery/bonegel = 30,
/obj/item/screwdriver = 70
)
diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm
index 7c7a8f1eb2c..a428f388194 100644
--- a/code/modules/surgery/slimes.dm
+++ b/code/modules/surgery/slimes.dm
@@ -10,7 +10,7 @@
/datum/surgery_step/slime/cut_flesh
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -36,7 +36,7 @@
/datum/surgery_step/slime/cut_innards
allowed_tools = list(
- /obj/item/scalpel = 100,
+ /obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
@@ -62,7 +62,7 @@
/datum/surgery_step/slime/saw_core
allowed_tools = list(
- /obj/item/circular_saw = 100, \
+ /obj/item/surgery/circular_saw = 100, \
/obj/item/material/hatchet = 75
)
diff --git a/html/changelogs/wezzy_janitor_medical_inhands.yml b/html/changelogs/wezzy_janitor_medical_inhands.yml
new file mode 100644
index 00000000000..0a32ffbb20b
--- /dev/null
+++ b/html/changelogs/wezzy_janitor_medical_inhands.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - imageadd: "Adds new inhands for janitorial, hydroponic, medical and tank items."
+ - imageadd: "Adds missing icons for upgraded scalpels in the surgery tray."
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 741bde66643..8a7dc243bc1 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/lefthand_hydro.dmi b/icons/mob/items/lefthand_hydro.dmi
new file mode 100644
index 00000000000..005598b707b
Binary files /dev/null and b/icons/mob/items/lefthand_hydro.dmi differ
diff --git a/icons/mob/items/lefthand_janitor.dmi b/icons/mob/items/lefthand_janitor.dmi
new file mode 100644
index 00000000000..67d88a8ab2b
Binary files /dev/null and b/icons/mob/items/lefthand_janitor.dmi differ
diff --git a/icons/mob/items/lefthand_medical.dmi b/icons/mob/items/lefthand_medical.dmi
new file mode 100644
index 00000000000..d0be598e0c3
Binary files /dev/null and b/icons/mob/items/lefthand_medical.dmi differ
diff --git a/icons/mob/items/lefthand_tank.dmi b/icons/mob/items/lefthand_tank.dmi
new file mode 100644
index 00000000000..5af980100e6
Binary files /dev/null and b/icons/mob/items/lefthand_tank.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 7831a3297fb..ef9207c1f56 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/mob/items/righthand_hydro.dmi b/icons/mob/items/righthand_hydro.dmi
new file mode 100644
index 00000000000..65afb2c1c3c
Binary files /dev/null and b/icons/mob/items/righthand_hydro.dmi differ
diff --git a/icons/mob/items/righthand_janitor.dmi b/icons/mob/items/righthand_janitor.dmi
new file mode 100644
index 00000000000..1515212a246
Binary files /dev/null and b/icons/mob/items/righthand_janitor.dmi differ
diff --git a/icons/mob/items/righthand_medical.dmi b/icons/mob/items/righthand_medical.dmi
new file mode 100644
index 00000000000..99fab85f91c
Binary files /dev/null and b/icons/mob/items/righthand_medical.dmi differ
diff --git a/icons/mob/items/righthand_tank.dmi b/icons/mob/items/righthand_tank.dmi
new file mode 100644
index 00000000000..8cd66d09217
Binary files /dev/null and b/icons/mob/items/righthand_tank.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 84c6a552aaa..2d895e623cb 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 41ef31c75e6..b8db4419239 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 377c00f9115..ca9924077b8 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 55049588125..7806547e692 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -6199,8 +6199,8 @@
dir = 1
},
/obj/structure/table/standard,
-/obj/item/bonesetter,
-/obj/item/bonegel,
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/bonegel,
/turf/simulated/floor/shuttle/white,
/area/syndicate_station/start)
"aoQ" = (
@@ -6285,8 +6285,8 @@
/area/merchant_station)
"aoZ" = (
/obj/structure/table/standard,
-/obj/item/scalpel,
-/obj/item/circular_saw{
+/obj/item/surgery/scalpel,
+/obj/item/surgery/circular_saw{
pixel_y = 8
},
/obj/machinery/light/small{
@@ -6306,7 +6306,7 @@
/obj/item/reagent_containers/syringe,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/gloves/latex,
-/obj/item/surgicaldrill,
+/obj/item/surgery/surgicaldrill,
/obj/structure/closet/secure_closet/medical_wall{
pixel_x = 32;
pixel_y = 0;
@@ -6368,9 +6368,9 @@
/area/merchant_station)
"apm" = (
/obj/structure/table/standard,
-/obj/item/cautery,
-/obj/item/hemostat,
-/obj/item/FixOVein,
+/obj/item/surgery/cautery,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/FixOVein,
/turf/simulated/floor/shuttle/white,
/area/syndicate_station/start)
"apn" = (
@@ -6380,7 +6380,7 @@
"apo" = (
/obj/structure/table/standard,
/obj/item/stack/medical/advanced/bruise_pack,
-/obj/item/retractor,
+/obj/item/surgery/retractor,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
frequency = 1213;
@@ -7782,25 +7782,25 @@
/turf/simulated/floor/shuttle/white,
/area/shuttle/administration/centcom)
"auo" = (
-/obj/item/cautery{
+/obj/item/surgery/cautery{
pixel_y = 4
},
-/obj/item/hemostat{
+/obj/item/surgery/hemostat{
pixel_y = 4
},
-/obj/item/FixOVein,
-/obj/item/scalpel,
-/obj/item/retractor{
+/obj/item/surgery/FixOVein,
+/obj/item/surgery/scalpel,
+/obj/item/surgery/retractor{
pixel_x = 0;
pixel_y = 6
},
-/obj/item/bonegel{
+/obj/item/surgery/bonegel{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/bonesetter,
-/obj/item/circular_saw,
-/obj/item/surgicaldrill,
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/circular_saw,
+/obj/item/surgery/surgicaldrill,
/obj/structure/closet/medical_wall{
name = "Surgery Tools";
pixel_x = 32
@@ -11258,25 +11258,25 @@
/area/centcom/specops)
"aBD" = (
/obj/structure/closet/crate/medical,
-/obj/item/circular_saw,
-/obj/item/surgicaldrill,
-/obj/item/bonegel{
+/obj/item/surgery/circular_saw,
+/obj/item/surgery/surgicaldrill,
+/obj/item/surgery/bonegel{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/bonesetter,
-/obj/item/scalpel,
-/obj/item/retractor{
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/scalpel,
+/obj/item/surgery/retractor{
pixel_x = 0;
pixel_y = 6
},
-/obj/item/hemostat{
+/obj/item/surgery/hemostat{
pixel_y = 4
},
-/obj/item/cautery{
+/obj/item/surgery/cautery{
pixel_y = 4
},
-/obj/item/FixOVein{
+/obj/item/surgery/FixOVein{
pixel_x = -6;
pixel_y = 1
},
@@ -17860,11 +17860,11 @@
/area/skipjack_station/start)
"aQK" = (
/obj/structure/table/standard,
-/obj/item/circular_saw{
+/obj/item/surgery/circular_saw{
pixel_y = 8
},
-/obj/item/hemostat,
-/obj/item/scalpel,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/scalpel,
/obj/item/stack/medical/advanced/bruise_pack,
/turf/simulated/floor/shuttle/white,
/area/skipjack_station/start)
@@ -18040,8 +18040,8 @@
/area/skipjack_station/start)
"aRi" = (
/obj/structure/table/standard,
-/obj/item/cautery,
-/obj/item/retractor,
+/obj/item/surgery/cautery,
+/obj/item/surgery/retractor,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/reagent_containers/syringe,
@@ -18167,9 +18167,9 @@
/area/skipjack_station/start)
"aRx" = (
/obj/structure/table/standard,
-/obj/item/bonesetter,
-/obj/item/bonegel,
-/obj/item/FixOVein,
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/bonegel,
+/obj/item/surgery/FixOVein,
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/reagent_containers/syringe/antiviral,
/turf/simulated/floor/shuttle/white,
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index fb27cba9614..b49c03a07ac 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -17275,8 +17275,8 @@
/area/rnd/xenobiology)
"aGK" = (
/obj/structure/table/standard,
-/obj/item/circular_saw,
-/obj/item/scalpel{
+/obj/item/surgery/circular_saw,
+/obj/item/surgery/scalpel{
pixel_y = 8
},
/obj/machinery/alarm{
@@ -21002,7 +21002,7 @@
"aOa" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/table/standard,
-/obj/item/scalpel,
+/obj/item/surgery/scalpel,
/obj/item/autopsy_scanner,
/obj/machinery/firealarm/south,
/turf/simulated/floor/tiled/white,
@@ -26054,7 +26054,7 @@
pixel_x = -2;
pixel_y = 7
},
-/obj/item/scalpel,
+/obj/item/surgery/scalpel,
/turf/simulated/floor/tiled/dark{
name = "cooled dark floor";
temperature = 278
@@ -31575,9 +31575,9 @@
/area/rnd/isolation_a)
"jED" = (
/obj/structure/table/standard,
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/circular_saw,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/retractor,
+/obj/item/surgery/circular_saw,
/turf/simulated/floor/tiled/dark,
/area/rnd/test_range)
"jHy" = (
@@ -37499,7 +37499,7 @@
"xSj" = (
/obj/structure/table/standard,
/obj/item/autopsy_scanner,
-/obj/item/scalpel{
+/obj/item/surgery/scalpel{
desc = "Cut, cut, and once more cut. This one is extra shiny!";
name = "shiny scalpel"
},
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 684fc915495..13087e42a19 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -488,11 +488,11 @@
/area/mine/unexplored)
"aaZ" = (
/obj/structure/table/standard,
-/obj/item/scalpel{
+/obj/item/surgery/scalpel{
desc = "Cut, cut, and once more cut. This one looks a little rusty. Perhaps its best not to cut yourself with this!";
name = "rusty scalpel"
},
-/obj/item/retractor,
+/obj/item/surgery/retractor,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -34726,7 +34726,7 @@
/area/assembly/robotics)
"biC" = (
/obj/machinery/vending/robotics{
- products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4, /obj/item/clothing/under/rank/roboticist = 4, /obj/item/stack/cable_coil = 4, /obj/item/cell/high = 12, /obj/item/device/assembly/prox_sensor = 8, /obj/item/device/assembly/signaler = 3, /obj/item/device/healthanalyzer = 8, /obj/item/scalpel = 2, /obj/item/circular_saw = 2, /obj/item/tank/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, /obj/item/screwdriver = 5, /obj/item/crowbar = 5)
+ products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4, /obj/item/clothing/under/rank/roboticist = 4, /obj/item/stack/cable_coil = 4, /obj/item/cell/high = 12, /obj/item/device/assembly/prox_sensor = 8, /obj/item/device/assembly/signaler = 3, /obj/item/device/healthanalyzer = 8, /obj/item/surgery/scalpel = 2, /obj/item/surgery/circular_saw = 2, /obj/item/tank/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, /obj/item/screwdriver = 5, /obj/item/crowbar = 5)
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 6c367b7148f..bafdd2d73fa 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -7573,7 +7573,7 @@
"sN" = (
/obj/structure/table/standard,
/obj/item/autopsy_scanner,
-/obj/item/scalpel{
+/obj/item/surgery/scalpel{
desc = "Cut, cut, and once more cut. This one is extra shiny!";
name = "shiny scalpel"
},
@@ -8638,9 +8638,9 @@
/area/medical/upperlevel)
"zU" = (
/obj/structure/table/standard,
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/circular_saw,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/retractor,
+/obj/item/surgery/circular_saw,
/turf/simulated/floor/tiled/dark{
name = "cooled dark floor";
temperature = 278
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index 4891b67c1a6..13f17792c9c 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -36241,7 +36241,7 @@
"bpd" = (
/obj/structure/table/standard,
/obj/item/autopsy_scanner,
-/obj/item/scalpel,
+/obj/item/surgery/scalpel,
/obj/effect/floor_decal/corner/paleblue{
icon_state = "corner_white";
dir = 9
@@ -70182,8 +70182,8 @@
/area/rnd/xenobiology)
"cxA" = (
/obj/structure/table/standard,
-/obj/item/circular_saw,
-/obj/item/scalpel{
+/obj/item/surgery/circular_saw,
+/obj/item/surgery/scalpel{
pixel_y = 12
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -79399,7 +79399,7 @@
"rGs" = (
/obj/structure/table/standard,
/obj/item/autopsy_scanner,
-/obj/item/scalpel{
+/obj/item/surgery/scalpel{
desc = "Cut, cut, and once more cut. This one is extra shiny!";
name = "shiny scalpel"
},
@@ -80126,9 +80126,9 @@
/area/lawoffice)
"wnI" = (
/obj/structure/table/standard,
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/circular_saw,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/retractor,
+/obj/item/surgery/circular_saw,
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index 2da7de9edf1..5a640fd6c9b 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -6412,8 +6412,8 @@
dir = 1
},
/obj/structure/table/standard,
-/obj/item/bonesetter,
-/obj/item/bonegel,
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/bonegel,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
@@ -6527,8 +6527,8 @@
/area/supply/dock)
"arN" = (
/obj/structure/table/standard,
-/obj/item/scalpel,
-/obj/item/circular_saw{
+/obj/item/surgery/scalpel,
+/obj/item/surgery/circular_saw{
pixel_y = 8
},
/obj/machinery/light/small{
@@ -6550,7 +6550,7 @@
/obj/item/reagent_containers/syringe,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/gloves/latex,
-/obj/item/surgicaldrill,
+/obj/item/surgery/surgicaldrill,
/obj/structure/closet/secure_closet/medical_wall{
pixel_x = 32;
pixel_y = 0;
@@ -6623,9 +6623,9 @@
/area/supply/dock)
"asa" = (
/obj/structure/table/standard,
-/obj/item/cautery,
-/obj/item/hemostat,
-/obj/item/FixOVein,
+/obj/item/surgery/cautery,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/FixOVein,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
@@ -6639,7 +6639,7 @@
"asc" = (
/obj/structure/table/standard,
/obj/item/stack/medical/advanced/bruise_pack,
-/obj/item/retractor,
+/obj/item/surgery/retractor,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
frequency = 1213;
@@ -8226,25 +8226,25 @@
/area/centcom/specops)
"ayi" = (
/obj/structure/closet/crate/medical,
-/obj/item/circular_saw,
-/obj/item/surgicaldrill,
-/obj/item/bonegel{
+/obj/item/surgery/circular_saw,
+/obj/item/surgery/surgicaldrill,
+/obj/item/surgery/bonegel{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/bonesetter,
-/obj/item/scalpel,
-/obj/item/retractor{
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/scalpel,
+/obj/item/surgery/retractor{
pixel_x = 0;
pixel_y = 6
},
-/obj/item/hemostat{
+/obj/item/surgery/hemostat{
pixel_y = 4
},
-/obj/item/cautery{
+/obj/item/surgery/cautery{
pixel_y = 4
},
-/obj/item/FixOVein{
+/obj/item/surgery/FixOVein{
pixel_x = -6;
pixel_y = 1
},
@@ -11091,11 +11091,11 @@
/area/skipjack_station/start)
"aHG" = (
/obj/structure/table/standard,
-/obj/item/circular_saw{
+/obj/item/surgery/circular_saw{
pixel_y = 8
},
-/obj/item/hemostat,
-/obj/item/scalpel,
+/obj/item/surgery/hemostat,
+/obj/item/surgery/scalpel,
/obj/item/stack/medical/advanced/bruise_pack,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
@@ -11144,8 +11144,8 @@
/area/skipjack_station/start)
"aHO" = (
/obj/structure/table/standard,
-/obj/item/cautery,
-/obj/item/retractor,
+/obj/item/surgery/cautery,
+/obj/item/surgery/retractor,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/reagent_containers/syringe,
@@ -11175,9 +11175,9 @@
/area/skipjack_station/start)
"aHR" = (
/obj/structure/table/standard,
-/obj/item/bonesetter,
-/obj/item/bonegel,
-/obj/item/FixOVein,
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/bonegel,
+/obj/item/surgery/FixOVein,
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/reagent_containers/syringe/antiviral,
/turf/simulated/floor/shuttle{
@@ -12394,10 +12394,10 @@
/area/centcom/ferry)
"aLA" = (
/obj/structure/table/standard,
-/obj/item/cautery{
+/obj/item/surgery/cautery{
pixel_y = 4
},
-/obj/item/hemostat{
+/obj/item/surgery/hemostat{
pixel_y = 4
},
/turf/unsimulated/floor{
@@ -12814,7 +12814,7 @@
/area/centcom/spawning)
"aMz" = (
/obj/structure/table/standard,
-/obj/item/FixOVein{
+/obj/item/surgery/FixOVein{
pixel_x = -6;
pixel_y = 1
},
@@ -14160,8 +14160,8 @@
/area/centcom/holding)
"aPA" = (
/obj/structure/table/standard,
-/obj/item/surgicaldrill,
-/obj/item/circular_saw,
+/obj/item/surgery/surgicaldrill,
+/obj/item/surgery/circular_saw,
/turf/unsimulated/floor{
icon_state = "whitecorner";
dir = 8
@@ -15505,11 +15505,11 @@
/area/shuttle/administration/centcom)
"aSC" = (
/obj/structure/table/standard,
-/obj/item/retractor{
+/obj/item/surgery/retractor{
pixel_x = 0;
pixel_y = 6
},
-/obj/item/scalpel,
+/obj/item/surgery/scalpel,
/obj/machinery/light{
dir = 1;
icon_state = "tube1";
@@ -18224,8 +18224,8 @@
/area/centcom/specops)
"aYH" = (
/obj/structure/table/standard,
-/obj/item/bonesetter,
-/obj/item/bonegel{
+/obj/item/surgery/bonesetter,
+/obj/item/surgery/bonegel{
pixel_x = 4;
pixel_y = 3
},
diff --git a/maps/exodus/exodus-3_telecomms.dmm b/maps/exodus/exodus-3_telecomms.dmm
index 24307735545..86ed219f84f 100644
--- a/maps/exodus/exodus-3_telecomms.dmm
+++ b/maps/exodus/exodus-3_telecomms.dmm
@@ -61,7 +61,7 @@
/turf/template_noop,
/area/derelict/ship)
"at" = (
-/obj/item/scalpel,
+/obj/item/surgery/scalpel,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},