cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

New medkit and trauma pouch sprites (#16744)

Browse Source 
* 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
This commit is contained in:
naut
2023-07-19 14:29:19 +00:00
committed by GitHub
parent 9272d875b4
commit 7276aedde8
5 changed files with 255 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+129 -35
View File
@@ -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 <i>-spontaneously-</i> 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. <b>This kit contains advanced medications to purge toxins and may result in side-effects to those they are administered to.</b>"
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 <i>after</i> 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
code/game/objects/items/weapons/storage/med_pouch.dm
+28 -1
View File
@@ -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. <b>DO NOT APPLY TO ANYONE UNDER THE INFLUENCE OF ALCOHOL.</b>"
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. <b>DO NOT APPLY TO VAURCAE.</b>"
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. <b>DO NOT APPLY TO VAURCAE.</b>"
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.<b>PURGES MEDICINE. DO NOT APPLY IF ANY MEDICATION WAS ALREADY GIVEN.</b>"
reagents_to_add = list(/singleton/reagent/fluvectionem = 5)