diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 37be07fc675..82188a5dc54 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -29,7 +29,7 @@ /obj/item/storage/firstaid/regular/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/stack/medical/gauze = 1, /obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, @@ -44,7 +44,7 @@ /obj/item/storage/firstaid/ancient/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/stack/medical/gauze = 1, /obj/item/stack/medical/bruise_pack = 3, /obj/item/stack/medical/ointment= 3) @@ -67,7 +67,7 @@ /obj/item/storage/firstaid/fire/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/reagent_containers/pill/patch/silver_sulf = 3, /obj/item/reagent_containers/pill/oxandrolone = 2, /obj/item/reagent_containers/hypospray/medipen = 1, @@ -91,7 +91,7 @@ /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/reagent_containers/syringe/charcoal = 4, /obj/item/storage/pill_bottle/charcoal = 2, /obj/item/healthanalyzer = 1) @@ -110,7 +110,7 @@ /obj/item/storage/firstaid/o2/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/reagent_containers/pill/salbutamol = 4, /obj/item/reagent_containers/hypospray/medipen = 2, /obj/item/healthanalyzer = 1) @@ -129,12 +129,29 @@ /obj/item/storage/firstaid/brute/PopulateContents() if(empty) return - var/static/items_inside = list( + var/static/items_inside = list( /obj/item/reagent_containers/pill/patch/styptic = 4, /obj/item/stack/medical/gauze = 2, /obj/item/healthanalyzer = 1) generate_items_inside(items_inside,src) +/obj/item/storage/firstaid/advanced + name = "advanced first aid kit" + desc = "An advanced kit to help deal with advanced wounds." + icon_state = "radfirstaid" + item_state = "firstaid-rad" + custom_premium_price = 600 + +/obj/item/storage/firstaid/advanced/PopulateContents() + if(empty) + return + var/static/items_inside = list( + /obj/item/reagent_containers/pill/patch/synthflesh = 3, + /obj/item/reagent_containers/hypospray/medipen/atropine = 2, + /obj/item/stack/medical/gauze = 1, + /obj/item/healthanalyzer/advanced = 1) + generate_items_inside(items_inside,src) + /obj/item/storage/firstaid/tactical name = "combat medical kit" desc = "I hope you've got insurance." diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 99489d9eb65..6db47118b54 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -175,3 +175,8 @@ volume = 250 list_reagents = list("holywater" = 150, "tiresolution" = 50, "dizzysolution" = 50) amount_per_transfer_from_this = 50 + +/obj/item/reagent_containers/hypospray/medipen/atropine + name = "atropine autoinjector" + desc = "A rapid way to save a person from a critical injury state!" + list_reagents = list("atropine" = 10) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index b11ef878b6d..5372f733879 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -37,4 +37,10 @@ name = "burn patch" desc = "Helps with burn injuries." list_reagents = list("silver_sulfadiazine" = 20) - icon_state = "bandaid_burn" \ No newline at end of file + icon_state = "bandaid_burn" + +/obj/item/reagent_containers/pill/patch/synthflesh + name = "brute and burn patch" + desc = "Helps with brute and burn injuries." + list_reagents = list("synthflesh" = 15) + icon_state = "bandaid_both" \ No newline at end of file diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 0f6d4d99b77..f4a06874372 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -32,7 +32,8 @@ /obj/item/storage/pill_bottle/psicodine = 2, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/storage/belt/medical = 3, - /obj/item/wrench/medical = 1) + /obj/item/wrench/medical = 1, + /obj/item/storage/firstaid/advanced = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index ad3dede2018..60768e3c9ae 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 de57235f29c..29d047382b3 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/chemical.dmi b/icons/obj/chemical.dmi index f35099c19cb..2453b7d66d7 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ