From e35ca3dd14427eea276e4ec474818b25620a0ffe Mon Sep 17 00:00:00 2001 From: Sealed101 <75863639+Sealed101@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:27:48 +0300 Subject: [PATCH] Cyborg Energy saw invisible sprite fix + omnitool selector + taster (#69991) * energy saw invisible sprite fix * omnitool med tools sprite fix + taster sprite fix --- code/game/objects/items/debug_items.dm | 16 ++++++++-------- code/game/objects/items/melee/energy.dm | 2 +- code/game/objects/items/taster.dm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index 9310bdbdc70..bab3db586d8 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -57,15 +57,15 @@ "Analyzer" = image(icon = 'icons/obj/device.dmi', icon_state = "analyzer"), "Pickaxe" = image(icon = 'icons/obj/mining.dmi', icon_state = "minipick"), "Shovel" = image(icon = 'icons/obj/mining.dmi', icon_state = "spade"), - "Retractor" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "retractor"), - "Hemostat" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "hemostat"), - "Cautery" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "cautery"), - "Drill" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "drill"), - "Scalpel" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "scalpel"), - "Saw" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "saw"), - "Bonesetter" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "bone setter"), + "Retractor" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "retractor"), + "Hemostat" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "hemostat"), + "Cautery" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "cautery"), + "Drill" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "drill"), + "Scalpel" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "scalpel"), + "Saw" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "saw"), + "Bonesetter" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "bonesetter"), "Knife" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "knife"), - "Blood Filter" = image(icon = 'icons/obj/medical/organs/organs.dmi', icon_state = "bloodfilter"), + "Blood Filter" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "bloodfilter"), "Rolling Pin" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "rolling_pin"), "Wire Brush" = image(icon = 'icons/obj/tools.dmi', icon_state = "wirebrush"), ) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index b3032929eb3..c75a06c9642 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -199,7 +199,7 @@ /obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs name = "energy saw" desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness." - icon = 'icons/obj/medical/organs/organs.dmi' + icon = 'icons/obj/medical/surgery_tools.dmi' icon_state = "esaw" hitsound = 'sound/weapons/circsawhit.ogg' force = 18 diff --git a/code/game/objects/items/taster.dm b/code/game/objects/items/taster.dm index 725d09ef820..d1d1a27fa4b 100644 --- a/code/game/objects/items/taster.dm +++ b/code/game/objects/items/taster.dm @@ -2,7 +2,7 @@ name = "taster" desc = "Tastes things, so you don't have to!" icon = 'icons/obj/medical/organs/organs.dmi' - icon_state = "tonguenormal" + icon_state = "tongue" w_class = WEIGHT_CLASS_TINY