diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 47dafb5c2be..f9aaef94fb6 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -11,7 +11,7 @@ /obj/item/storage/firstaid name = "generic first-aid kit" desc = "If you can see this, make a bug report on GitHub, something went wrong!" - icon_state = "genericfirstaid" + icon_state = "firstaid_generic" throw_range = 8 req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots. var/treatment_brute = "salglu_solution" @@ -27,7 +27,8 @@ /obj/item/storage/firstaid/regular name = "first-aid kit" desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer." - icon_state = "firstaid" + icon_state = "firstaid_regular" + inhand_icon_state = "firstaid_regular" /obj/item/storage/firstaid/regular/populate_contents() new /obj/item/reagent_containers/patch/styptic(src) @@ -56,14 +57,10 @@ /obj/item/storage/firstaid/fire name = "fire first-aid kit" desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer." - icon_state = "ointment" - inhand_icon_state = "firstaid-ointment" + icon_state = "firstaid_burn" + inhand_icon_state = "firstaid_burn" med_bot_skin = "ointment" -/obj/item/storage/firstaid/fire/Initialize(mapload) - . = ..() - icon_state = pick("ointment", "firefirstaid") - /obj/item/storage/firstaid/fire/populate_contents() new /obj/item/stack/medical/suture/regen_mesh/advanced(src) new /obj/item/stack/medical/suture/regen_mesh(src) @@ -78,14 +75,10 @@ /obj/item/storage/firstaid/toxin name = "toxin first aid kit" desc = "A medical kit designed to counter poisoning by common toxins. Contains three pills and syringes, and a health analyzer to determine the health of the patient." - icon_state = "antitoxin" - inhand_icon_state = "firstaid-toxin" + icon_state = "firstaid_toxin" + inhand_icon_state = "firstaid_toxin" med_bot_skin = "tox" -/obj/item/storage/firstaid/toxin/Initialize(mapload) - . = ..() - icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2") - /obj/item/storage/firstaid/toxin/populate_contents() for(var/I in 1 to 3) new /obj/item/reagent_containers/syringe/charcoal(src) @@ -98,8 +91,8 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation first aid kit" desc = "A first aid kit that contains four pills of salbutamol, which is able to counter injuries caused by suffocation. Also contains a health analyzer to determine the health of the patient." - icon_state = "o2" - inhand_icon_state = "firstaid-o2" + icon_state = "firstaid_o2" + inhand_icon_state = "firstaid_o2" med_bot_skin = "o2" /obj/item/storage/firstaid/o2/populate_contents() @@ -115,14 +108,10 @@ /obj/item/storage/firstaid/brute name = "brute trauma treatment kit" desc = "A medical kit that contains several medical patches and pills for treating brute injuries. Contains one epinephrine syringe for emergency use and a health analyzer." - icon_state = "brute" - inhand_icon_state = "firstaid-brute" + icon_state = "firstaid_brute" + inhand_icon_state = "firstaid_brute" med_bot_skin = "brute" -/obj/item/storage/firstaid/brute/Initialize(mapload) - . = ..() - icon_state = pick("brute", "brute2") - /obj/item/storage/firstaid/brute/populate_contents() new /obj/item/stack/medical/suture/medicated(src) new /obj/item/stack/medical/suture(src) @@ -137,8 +126,8 @@ /obj/item/storage/firstaid/adv name = "advanced first-aid kit" desc = "Contains advanced medical treatments." - icon_state = "advfirstaid" - inhand_icon_state = "firstaid-advanced" + icon_state = "firstaid_advanced" + inhand_icon_state = "firstaid_advanced" med_bot_skin = "adv" /obj/item/storage/firstaid/adv/populate_contents() @@ -156,8 +145,8 @@ /obj/item/storage/firstaid/machine name = "machine repair kit" desc = "A kit that contains supplies to repair IPCs on the go." - icon_state = "machinefirstaid" - inhand_icon_state = "firstaid-machine" + icon_state = "firstaid_machine" + inhand_icon_state = "firstaid_machine" med_bot_skin = "machine" /obj/item/storage/firstaid/machine/populate_contents() @@ -171,9 +160,10 @@ return /obj/item/storage/firstaid/tactical - name = "first-aid kit" + name = "tactical first-aid kit" desc = "I hope you've got insurance." - icon_state = "bezerk" + icon_state = "firstaid_elite" + inhand_icon_state = "firstaid_elite" treatment_oxy = "perfluorodecalin" treatment_brute = "bicaridine" treatment_fire = "kelotane" @@ -196,9 +186,8 @@ /obj/item/storage/firstaid/surgery name = "field surgery kit" desc = "A kit for surgery in the field." - icon_state = "duffel-med" - lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' - righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' + icon_state = "firstaid_surgery" + inhand_icon_state = "firstaid_o2" max_w_class = WEIGHT_CLASS_BULKY max_combined_w_class = 21 storage_slots = 10 @@ -220,7 +209,8 @@ /obj/item/storage/firstaid/ert name = "ert first-aid kit" desc = "A medical kit used by Nanotrasen emergency response team personnel." - icon_state = "bezerk" + icon_state = "firstaid_elite" + inhand_icon_state = "firstaid_elite" med_bot_skin = "bezerk" /obj/item/storage/firstaid/ert/populate_contents() @@ -232,11 +222,12 @@ new /obj/item/stack/medical/bruise_pack/advanced(src) new /obj/item/stack/medical/bruise_pack/advanced(src) - /obj/item/storage/firstaid/ert_amber name = "amber ert first-aid kit" desc = "A medical kit used by Amber level emergency response team personnel." - icon_state = "firstaid" + icon_state = "firstaid_elite" + inhand_icon_state = "firstaid_elite" + med_bot_skin = "bezerk" /obj/item/storage/firstaid/ert_amber/populate_contents() new /obj/item/healthanalyzer/advanced(src) @@ -250,7 +241,8 @@ /obj/item/storage/firstaid/fake_tactical name = "tactical first-aid kit" desc = "I hope you've got insurance. The paint is still wet." - icon_state = "bezerk" + icon_state = "firstaid_elite" + inhand_icon_state = "firstaid_elite" med_bot_skin = "bezerk" /obj/item/storage/firstaid/fake_tactical/populate_contents() diff --git a/code/modules/awaymissions/mission_code/ruins/freegolems.dm b/code/modules/awaymissions/mission_code/ruins/freegolems.dm index 4c3acac6336..0b1bb84004b 100644 --- a/code/modules/awaymissions/mission_code/ruins/freegolems.dm +++ b/code/modules/awaymissions/mission_code/ruins/freegolems.dm @@ -1,7 +1,8 @@ /obj/item/storage/firstaid/freegolem name = "golem emergency treatment kit" desc = "A box of essential medical supplies, formulated for golems' hard skin." - icon_state = "medbriefcase" + icon_state = "firstaid_freegolem" + inhand_icon_state = "firstaid_freegolem" /obj/item/storage/firstaid/freegolem/populate_contents() new /obj/item/healthanalyzer(src) diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 897fb06cfef..ea02dc80495 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -50,7 +50,8 @@ ////////////////////////////// /obj/item/storage/firstaid/ancient name = "first-aid kit" - icon_state = "firstaid" + icon_state = "firstaid_regular" + inhand_icon_state = "firstaid_regular" desc = "A first aid kit with the ability to heal common types of injuries." /obj/item/storage/firstaid/ancient/populate_contents() diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 3b5ff24c6c5..a3cfd1e3ebd 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index e45138484d8..db85b328196 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 18c9534c3f8..7b17cc58ec5 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ