diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index ff51c99604c..72e5512d2a8 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -108,6 +108,7 @@ /obj/item/storage/medkit/emergency icon_state = "medbriefcase" + inhand_icon_state = "medkit-emergency" name = "emergency medkit" desc = "A very simple first aid kit meant to secure and stabilize serious wounds for later treatment." @@ -127,7 +128,7 @@ /obj/item/storage/medkit/surgery name = "surgical medkit" icon_state = "medkit_surgery" - inhand_icon_state = "medkit" + inhand_icon_state = "medkit-surgical" desc = "A high capacity aid kit for doctors, full of medical supplies and basic surgical equipment." custom_premium_price = PAYCHECK_COMMAND * 6 // BUBBER EDIT ADDITION @@ -276,7 +277,7 @@ name = "advanced first aid kit" desc = "An advanced kit to help deal with advanced wounds." icon_state = "medkit_advanced" - inhand_icon_state = "medkit-rad" + inhand_icon_state = "medkit-advanced" custom_premium_price = PAYCHECK_COMMAND * 6 damagetype_healed = HEAL_ALL_DAMAGE @@ -295,8 +296,8 @@ /obj/item/storage/medkit/tactical_lite name = "combat first aid kit" - icon_state = "medkit_tactical" - inhand_icon_state = "medkit-tactical" + icon_state = "medkit_tactical_lite" + inhand_icon_state = "medkit-tactical-lite" damagetype_healed = HEAL_ALL_DAMAGE /obj/item/storage/medkit/tactical_lite/get_medbot_skin() @@ -351,6 +352,8 @@ /obj/item/storage/medkit/tactical/premium name = "premium combat medical kit" desc = "May or may not contain traces of lead." + icon_state = "medkit_tactical_premium" + inhand_icon_state = "medkit-tactical-premium" grind_results = list(/datum/reagent/lead = 10) /obj/item/storage/medkit/tactical/premium/Initialize(mapload) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png index 15de6eb624a..ba18a7ec165 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png differ diff --git a/html/changelogs/AutoChangeLog-pr-89085.yml b/html/changelogs/AutoChangeLog-pr-89085.yml new file mode 100644 index 00000000000..a4df0c607ea --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89085.yml @@ -0,0 +1,4 @@ +author: "MTandi" +delete-after: True +changes: + - image: "yet another medkit resprite" \ No newline at end of file diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index feaed169078..8495aa6355e 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index 15ccf5c090e..c013e3021f6 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/obj/storage/medkit.dmi b/icons/obj/storage/medkit.dmi index 1fec4edb3b4..a7d20f39c6d 100644 Binary files a/icons/obj/storage/medkit.dmi and b/icons/obj/storage/medkit.dmi differ diff --git a/modular_zubbers/code/game/Items/storage/medkit.dm b/modular_zubbers/code/game/Items/storage/medkit.dm deleted file mode 100644 index 7f713fcb416..00000000000 --- a/modular_zubbers/code/game/Items/storage/medkit.dm +++ /dev/null @@ -1,9 +0,0 @@ -/obj/item/storage/medkit - icon = 'modular_zubbers/icons/obj/storage/medkit.dmi' - icon_state = "medkit" - inhand_icon_state = "medkit" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - -/obj/item/storage/medkit/coroner - icon = 'modular_zubbers/icons/obj/storage/medkit.dmi' diff --git a/modular_zubbers/icons/obj/storage/medkit.dmi b/modular_zubbers/icons/obj/storage/medkit.dmi index 63e2d391525..c4336da17a3 100644 Binary files a/modular_zubbers/icons/obj/storage/medkit.dmi and b/modular_zubbers/icons/obj/storage/medkit.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e1d890e0fe4..b026c1eda0b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8772,7 +8772,6 @@ #include "modular_zubbers\code\game\Items\plushes.dm" #include "modular_zubbers\code\game\Items\sec_hailer.dm" #include "modular_zubbers\code\game\Items\storage\backpack.dm" -#include "modular_zubbers\code\game\Items\storage\medkit.dm" #include "modular_zubbers\code\game\machinery\crew_monitor.dm" #include "modular_zubbers\code\game\machinery\department_balance.dm" #include "modular_zubbers\code\game\machinery\medipen_refiller.dm"