From 7276aedde88ff2b51797406b8e0670a9b57423f3 Mon Sep 17 00:00:00 2001 From: naut <55491249+nauticall@users.noreply.github.com> Date: Wed, 19 Jul 2023 22:29:19 +0800 Subject: [PATCH] New medkit and trauma pouch sprites (#16744) * New first aid kit sprites * Kit map changes * Inhand sprites + combat kit correction * changelog * retcons * Coding and description tweaks * szsz * New-new first aid kits * removal * handle removal --- .../objects/items/weapons/storage/firstaid.dm | 164 ++++++++++++++---- .../items/weapons/storage/med_pouch.dm | 29 +++- html/changelogs/nauticall-medkits.yml | 42 +++++ icons/obj/storage/firstaid.dmi | Bin 13381 -> 6664 bytes maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 93 ++++++---- 5 files changed, 255 insertions(+), 73 deletions(-) create mode 100644 html/changelogs/nauticall-medkits.yml diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 5ea129d2e26..f9706513f15 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -14,7 +14,7 @@ /obj/item/storage/firstaid/empty name = "empty first-aid kit" - desc = "It's an emergency medical kit for people who like wish soup." + desc = "It's a first-aid kit. Comes with nothing, so feel free to put your own stuff in it." /obj/item/storage/firstaid/regular starts_with = list( @@ -26,48 +26,86 @@ /obj/item/device/healthanalyzer = 1 ) +/obj/item/storage/firstaid/large + name = "large first-aid kit" + desc = "A large first-aid kit containing plenty of the basics for wound treatment." + icon_state = "firstaid_large" + item_state = "firstaid" + w_class = ITEMSIZE_LARGE + throw_range = 6 + starts_with = list( + /obj/item/stack/medical/bruise_pack = 4, + /obj/item/stack/medical/ointment = 4, + /obj/item/storage/pill_bottle/inaprovaline = 1, + /obj/item/storage/pill_bottle/perconol = 1, + /obj/item/stack/medical/splint = 2, + /obj/item/device/healthanalyzer = 1 + ) + /obj/item/storage/firstaid/fire name = "fire first-aid kit" - desc = "It's an emergency medical kit for when the toxins lab -spontaneously- burns down." + desc = "An emergency medical kit for treating burn-related injuries, whether they be from fires, chemicals, lasers, cigarettes - you name it. Warranty void if used on synthetics." icon_state = "firefirstaid" item_state = "firefirstaid" starts_with = list( /obj/item/storage/box/fancy/med_pouch/burn = 4 ) -/obj/item/storage/firstaid/fire/fill() - . = ..() - icon_state = pick("firefirstaid","firefirstaid2","firefirstaid3") +/obj/item/storage/firstaid/large/fire + name = "large fire first-aid kit" + desc = "A large emergency medical kit for treating a lot of burn-related injuries. Perhaps multiple people stood in the way of an emitter, or bathed in acid. In any case, this kit is there to treat it all." + icon_state = "firefirstaid_large" + item_state = "firefirstaid" + starts_with = list( + /obj/item/stack/medical/advanced/ointment = 4, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 4, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, + /obj/item/device/healthanalyzer = 1 + ) /obj/item/storage/firstaid/toxin name = "toxin first-aid" - desc = "Used to treat when you have a high amount of toxins in your body." - icon_state = "antitoxinfirstaid" - item_state = "antitoxinfirstaid" + desc = "An emergency medical kit for treating exposure to harmful toxins. Useful for phoron leaks, poisonings, or that one guy who accidentally ate k'ois." + icon_state = "antitoxfirstaid" + item_state = "antitoxfirstaid" starts_with = list( /obj/item/storage/box/fancy/med_pouch/toxin = 4 ) -/obj/item/storage/firstaid/toxin/fill() - . = ..() - icon_state = pick("antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") +/obj/item/storage/firstaid/large/toxin + name = "large toxin first-aid kit" + desc = "A large emergency medical kit for treating severe toxin exposure cases. This kit contains advanced medications to purge toxins and may result in side-effects to those they are administered to." + icon_state = "antitoxfirstaid_large" + item_state = "antitoxfirstaid" + starts_with = list( + /obj/item/storage/box/fancy/med_pouch/toxin = 8, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 2, + /obj/item/device/healthanalyzer = 1 + ) /obj/item/storage/firstaid/o2 name = "oxygen deprivation kit" - desc = "A box full of oxygen related goodies." + desc = "An emergency medical kit for treating oxygen deprivation. There's a label on the box that says to make sure to only apply the kit after you have left the oxygen-deprived area." icon_state = "o2firstaid" item_state = "o2firstaid" starts_with = list( /obj/item/storage/box/fancy/med_pouch/oxyloss = 4 ) -/obj/item/storage/firstaid/o2/fill() - . = ..() - icon_state = pick("o2firstaid","o2firstaid2","o2firstaid3") +/obj/item/storage/firstaid/large/o2 + name = "large oxygen deprivation kit" + desc = "A large emergency medical kit for treating really bad cases of oxygen deprivation. Contains medication intended to restore breathing as well as oxygenation." + icon_state = "o2firstaid_large" + item_state = "o2firstaid" + starts_with = list( + /obj/item/storage/box/fancy/med_pouch/oxyloss = 8, + /obj/item/reagent_containers/inhaler/pneumalin = 2, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dexalin_plus = 2, + ) /obj/item/storage/firstaid/adv name = "advanced first-aid kit" - desc = "Contains advanced medical treatments." + desc = "An advanced medical kit full of advanced medical things. The kits inside are more effective at treating injuries than your standard gauze-and-ointment." icon_state = "advfirstaid" item_state = "advfirstaid" starts_with = list( @@ -78,13 +116,22 @@ /obj/item/device/healthanalyzer = 1 ) -/obj/item/storage/firstaid/adv/fill() - . = ..() - icon_state = pick("advfirstaid","advfirstaid2","advfirstaid3") +/obj/item/storage/firstaid/large/adv + name = "large advanced first-aid kit" + desc = "A large advanced medical kit full of many advanced medical kits. This one comes packed with advanced stabilization treatments." + icon_state = "advfirstaid_large" + item_state = "advfirstaid" + starts_with = list( + /obj/item/storage/pill_bottle/assorted = 2, + /obj/item/stack/medical/advanced/bruise_pack = 5, + /obj/item/stack/medical/advanced/ointment = 4, + /obj/item/stack/medical/splint = 2, + /obj/item/device/healthanalyzer = 1 + ) /obj/item/storage/firstaid/combat name = "combat medical kit" - desc = "Contains advanced medical treatments." + desc = "A military-grade combat medical kit containing rapidly-deliverable treatments for triage on the dangerous front line of a battle. Warranty void if used in a danger-free environment." icon_state = "bezerk" item_state = "bezerk" starts_with = list( @@ -98,9 +145,26 @@ /obj/item/device/healthanalyzer = 1 ) +/obj/item/storage/firstaid/large/combat + name = "advanced combat medical kit" + desc = "A bulky, advanced military-grade combat medical kit containing rapidly-deliverable treatments for triage on the dangerous front line of a battle. Warranty void if used in a danger-free environment." + icon_state = "bezerk_large" + item_state = "bezerk" + starts_with = list( + /obj/item/reagent_containers/hypospray/combat/empty = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1, + /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 1, + /obj/item/stack/medical/splint = 1, + /obj/item/device/healthanalyzer = 1 + ) + /obj/item/storage/firstaid/surgery name = "surgery kit" - desc = "Contains tools for surgery. Has precise foam fitting for safe transport." + desc = "A sterile medical kit containing tools for surgery on-the-go. Even comes with a foam lining so your delicate instruments don't break in transit. How considerate." icon_state = "purplefirstaid" item_state = "purplefirstaid" starts_with = list( @@ -120,38 +184,54 @@ /obj/item/storage/firstaid/surgery/fill() . = ..() make_exact_fit() - icon_state = pick("purplefirstaid","purplefirstaid2","purplefirstaid3") /obj/item/storage/firstaid/trauma name = "trauma first-aid kit" - desc = "It's an emergency medical kit for when people brought ballistic weapons to a laser fight." + desc = "An emergency medical kit for treating trauma-related injuries. Useful for injuries stemming from sharp sticks, blunt sticks, and toolboxes." icon_state = "traumafirstaid" item_state = "traumafirstaid" starts_with = list( /obj/item/storage/box/fancy/med_pouch/trauma = 4 ) -/obj/item/storage/firstaid/trauma/fill() - ..() - icon_state = pick("traumafirstaid","traumafirstaid2","traumafirstaid3") +/obj/item/storage/firstaid/large/trauma + name = "large trauma first-aid kit" + desc = "An advanced trauma kit for treating serious injuries. This one is particularly specialized for trauma treatment and comes with advanced medication." + icon_state = "traumafirstaid_large" + item_state = "traumafirstaid" + starts_with = list( + /obj/item/stack/medical/advanced/bruise_pack = 4, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/butazoline = 4, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, + /obj/item/device/healthanalyzer = 1 + ) /obj/item/storage/firstaid/radiation name = "radiation first-aid kit" - desc = "It's an emergency medical kit for when you try to hug the reactor." + desc = "An emergency medical kit for treating radiation exposure. Useful for people who say their mouth tastes like iron before vomiting blood, or for people who are too 'hardcore' to wear a radiation suit next to a supermatter reactor." icon_state = "radfirstaid" item_state = "radfirstaid" starts_with = list( /obj/item/storage/box/fancy/med_pouch/radiation = 4 ) -/obj/item/storage/firstaid/radiation/Initialize() - . = ..() - icon_state = pick("radfirstaid","radfirstaid2","radfirstaid3") +/obj/item/storage/firstaid/large/radiation + name = "large radiation first-aid kit" + desc = "An emergency medical kit for treating radiation exposure. Useful for people who say their mouth tastes like iron before vomiting blood, or for people who are too 'hardcore' to wear a radiation suit next to a supermatter reactor." + icon_state = "radfirstaid_large" + item_state = "radfirstaid" + starts_with = list( + /obj/item/storage/box/fancy/med_pouch/radiation = 6, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 1, + /obj/item/stack/medical/ointment = 2, + /obj/item/device/healthanalyzer = 1 + ) /obj/item/storage/firstaid/stab // Generic first aid kit for mappers that covers all bases. - name = "stabilisation first-aid" - desc = "Stocked with medical pouches." + name = "stabilization first-aid" + desc = "A jack-of-all-trades medical kit containing a sampler platter of medical treatments. Useful for when someone is screwed up in more ways than you can count." icon_state = "firstaid_multi" + item_state = "firstaid_multi" starts_with = list( /obj/item/storage/box/fancy/med_pouch/trauma = 1, /obj/item/storage/box/fancy/med_pouch/burn = 1, @@ -161,9 +241,23 @@ /obj/item/device/healthanalyzer = 1 ) +/obj/item/storage/firstaid/large/stab // Generic first aid kit for mappers that covers all bases. + name = "large stabilization first-aid" + desc = "A big jack-of-all-trades medical kit containing a sizeable sampler platter of medical treatments. Useful for when someone is screwed up in more ways than you can count." + icon_state = "firstaid_multi_large" + item_state = "firstaid_multi" + starts_with = list( + /obj/item/storage/box/fancy/med_pouch/trauma = 2, + /obj/item/storage/box/fancy/med_pouch/burn = 2, + /obj/item/storage/box/fancy/med_pouch/oxyloss = 2, + /obj/item/storage/box/fancy/med_pouch/toxin = 2, + /obj/item/storage/box/fancy/med_pouch/radiation = 2, + /obj/item/device/healthanalyzer = 1 + ) + /obj/item/storage/firstaid/sleekstab - name = "Slimline stabilisation kit" - desc = "A sleek and expensive looking medical kit." + name = "slimline stabilization kit" + desc = "A sleek and expensive looking medical kit containing a plethora of colorful autoinjectors. Read the labels!" icon_state = "firstaid_multi" item_state = "firstaid_multi" w_class = ITEMSIZE_SMALL @@ -181,7 +275,7 @@ /obj/item/storage/firstaid/light // For pilot/expedition closets, which we don't have. Yet. name = "light first-aid kit" - desc = "It's a small emergency medical kit." + desc = "It's a small emergency medical kit for when you have small emergency medical needs." icon_state = "fak-light" item_state = "advfirstaid" storage_slots = 5 diff --git a/code/game/objects/items/weapons/storage/med_pouch.dm b/code/game/objects/items/weapons/storage/med_pouch.dm index 4b148020bc1..f682b0cd2b5 100644 --- a/code/game/objects/items/weapons/storage/med_pouch.dm +++ b/code/game/objects/items/weapons/storage/med_pouch.dm @@ -161,25 +161,52 @@ Single Use Emergency Pouches /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto name = "emergency autoinjector" - desc = "An emergency autoinjector from an emergency medical pouch." + desc = "An emergency autoinjector from an emergency medical pouch. Do not administer more than one of each type of autoinjector to a patient." /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/inaprovaline name = "emergency inaprovaline autoinjector" + desc = "An emergency autoinjector containing inaprovaline, for stabilizing patients in or near critical condition." reagents_to_add = list(/singleton/reagent/inaprovaline = 5) /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl name = "emergency mortaphenyl autoinjector" + desc = "An emergency autoinjector containing mortaphenyl, a powerful painkiller for use in extreme injury. Side effects include confusion and impaired vision. DO NOT APPLY TO ANYONE UNDER THE INFLUENCE OF ALCOHOL." reagents_to_add = list(/singleton/reagent/mortaphenyl = 5) /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dylovene name = "emergency dylovene autoinjector" + desc = "An emergency autoinjector containing dylovene, an effective anti-toxin medicine that protects the body from poisoning effects and neutralizes toxins." reagents_to_add = list(/singleton/reagent/dylovene = 5) /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dexalin name = "emergency dexalin autoinjector" + desc = "An emergency autoinjector containing dexalin, a medicine which delivers oxygen to patients who are deprived of it, such as with lung injuries or vacuum exposure. DO NOT APPLY TO VAURCAE." reagents_to_add = list(/singleton/reagent/dexalin = 5) /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/adrenaline name = "emergency adrenaline autoinjector" + desc = "An emergency autoinjector containing adrenaline, or epinephrine. This autoinjector comes with a dosage meant to make rescusitation easier. Apply to those in critical condition only, and combine with CPR." amount_per_transfer_from_this = 8 reagents_to_add = list(/singleton/reagent/adrenaline = 8) + +//advanced autos + +/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/butazoline + name = "emergency butazoline autoinjector" + desc = "An emergency autoinjector containing butazoline for treating severe trauma. Side effects include dehydration and itchiness." + reagents_to_add = list(/singleton/reagent/butazoline = 10) + +/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline + name = "emergency dermaline autoinjector" + desc = "An emergency autoinjector containing dermaline for treating severe burns. Side effects include dehydration and itchiness." + reagents_to_add = list(/singleton/reagent/dermaline = 10) + +/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dexalin_plus + name = "emergency dexalin plus autoinjector" + desc = "An emergency autoinjector containing dexalin plus, a medicine which efficiently delivers oxygen to patients who are deprived of it, such as with lung injuries or vacuum exposure. DO NOT APPLY TO VAURCAE." + reagents_to_add = list(/singleton/reagent/dexalin/plus = 10) + +/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem + name = "emergency bloodstream purge autoinjector" + desc = "An emergency anti-toxin autoinjector that, when injected into a person, purges their bloodstream of chemicals, including toxins and medicine alike. Useful in the event of severe poisonings.PURGES MEDICINE. DO NOT APPLY IF ANY MEDICATION WAS ALREADY GIVEN." + reagents_to_add = list(/singleton/reagent/fluvectionem = 5) diff --git a/html/changelogs/nauticall-medkits.yml b/html/changelogs/nauticall-medkits.yml new file mode 100644 index 00000000000..f84cee9e017 --- /dev/null +++ b/html/changelogs/nauticall-medkits.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: nauticall + +# 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: "Resprited the first aid kits - all of them - to look prettier. Pouches inside were tweaked as well." + - maptweak: "Modified Horizon's medical bay to stack the new first aid kits in a better and more compact fashion. Some space has been freed up as a result." diff --git a/icons/obj/storage/firstaid.dmi b/icons/obj/storage/firstaid.dmi index 75c54fd2c4ab1d0e37dd10d8be277d1550356b8e..631f9225a79e85a469f70150e2b55078e8718e30 100644 GIT binary patch literal 6664 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 literal 13381 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 diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 878c163921b..3c798c978ba 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -4481,14 +4481,15 @@ /area/horizon/security/brig) "bZD" = ( /obj/structure/table/standard, -/obj/item/storage/firstaid/regular{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/corner_wide/green/full{ dir = 8 }, +/obj/item/storage/firstaid/adv{ + pixel_y = 8 + }, +/obj/item/storage/firstaid/adv{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "bZE" = ( @@ -5133,13 +5134,32 @@ "cua" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/o2{ - pixel_x = 5; - pixel_y = 5 + pixel_y = 8; + pixel_x = -17 }, -/obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/item/storage/firstaid/o2{ + pixel_y = 3; + pixel_x = -17 + }, +/obj/item/storage/firstaid/toxin{ + pixel_y = 8; + pixel_x = -2 + }, +/obj/item/storage/firstaid/toxin{ + pixel_y = 3; + pixel_x = -2 + }, +/obj/item/storage/firstaid/fire{ + pixel_y = 8; + pixel_x = 13 + }, +/obj/item/storage/firstaid/fire{ + pixel_y = 3; + pixel_x = 13 + }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "cuQ" = ( @@ -18911,11 +18931,12 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/storage/firstaid/adv{ - pixel_x = 5; +/obj/item/storage/firstaid/large/adv{ + pixel_y = 10 + }, +/obj/item/storage/firstaid/large/adv{ pixel_y = 5 }, -/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "jeY" = ( @@ -19866,17 +19887,20 @@ /area/engineering/locker_room) "jBw" = ( /obj/structure/table/standard, -/obj/item/storage/firstaid/toxin{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, /obj/machinery/light{ dir = 1 }, +/obj/item/storage/firstaid/regular{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/storage/firstaid/regular{ + pixel_y = 3; + pixel_x = -4 + }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "jCt" = ( @@ -21243,11 +21267,6 @@ /area/maintenance/aux_atmospherics/deck_2/starboard) "kiJ" = ( /obj/structure/table/standard, -/obj/item/storage/firstaid/fire{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner_wide/green/full{ dir = 1 }, @@ -21256,6 +21275,22 @@ dir = 8 }, /obj/machinery/firealarm/east, +/obj/item/storage/box/syringes{ + pixel_y = 15; + pixel_x = -4 + }, +/obj/item/storage/box/syringes{ + pixel_y = 15; + pixel_x = 5 + }, +/obj/item/storage/box/bloodpacks{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/storage/box/bloodpacks{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "kiK" = ( @@ -44274,10 +44309,6 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 10 }, -/obj/item/storage/box/syringes{ - pixel_x = -2; - pixel_y = 10 - }, /obj/item/bodybag/cryobag{ pixel_x = 13; pixel_y = 10 @@ -44294,18 +44325,6 @@ pixel_x = 13; pixel_y = 2 }, -/obj/item/storage/box/bloodpacks{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/storage/box/syringes{ - pixel_x = -2; - pixel_y = 7 - }, -/obj/item/storage/box/bloodpacks{ - pixel_x = -5; - pixel_y = -1 - }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "vHy" = (