diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 2a974d287a0..e590708099c 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -225,9 +225,10 @@ new /obj/item/stack/medical/splint(src) new /obj/item/reagent_containers/applicator/dual(src) new /obj/item/stack/medical/ointment/advanced(src) + new /obj/item/stack/medical/ointment/advanced(src) new /obj/item/stack/medical/bruise_pack/advanced(src) - new /obj/item/storage/pill_bottle/ert(src) - new /obj/item/storage/pill_bottle/patch_pack/ert(src) + new /obj/item/stack/medical/bruise_pack/advanced(src) + /obj/item/storage/firstaid/ert_amber name = "amber ert first-aid kit" @@ -302,17 +303,18 @@ else return ..() -/obj/item/storage/pill_bottle/ert - wrapper_color = COLOR_MAROON +/obj/item/storage/pill_bottle/ert_red + wrapper_color = COLOR_NT_RED -/obj/item/storage/pill_bottle/ert/populate_contents() +/obj/item/storage/pill_bottle/ert_red/populate_contents() for(var/I in 1 to 6) new /obj/item/reagent_containers/food/pill/pentetic(src) new /obj/item/reagent_containers/food/pill/ironsaline(src) new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/reagent_containers/food/pill/mannitol(src) /obj/item/storage/pill_bottle/ert_amber - wrapper_color = COLOR_AMBER + wrapper_color = COLOR_ORANGE /obj/item/storage/pill_bottle/ert_amber/populate_contents() for(var/I in 1 to 6) @@ -320,6 +322,18 @@ new /obj/item/reagent_containers/food/pill/charcoal(src) new /obj/item/reagent_containers/food/pill/salicylic(src) +/obj/item/storage/pill_bottle/ert_gamma + wrapper_color = COLOR_YELLOW_GRAY + +/obj/item/storage/pill_bottle/ert_gamma/populate_contents() + for(var/I in 1 to 6) + new /obj/item/reagent_containers/food/pill/pentetic(src) + new /obj/item/reagent_containers/food/pill/ironsaline(src) + new /obj/item/reagent_containers/food/pill/hydrocodone(src) + new /obj/item/reagent_containers/food/pill/mannitol(src) + new /obj/item/reagent_containers/food/pill/lazarus_reagent(src) + new /obj/item/reagent_containers/food/pill/rezadone(src) + /obj/item/storage/pill_bottle/MouseDrop(obj/over_object) // Best utilized if you're a cantankerous doctor with a Vicodin habit. if(iscarbon(over_object)) var/mob/living/carbon/C = over_object @@ -380,8 +394,9 @@ new /obj/item/reagent_containers/food/pill/fakedeath(src) /obj/item/storage/pill_bottle/patch_pack/ert - name = "ert patch pack" - desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT medics." + name = "ert red patch pack" + desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Red level medics." + wrapper_color = COLOR_NT_RED /obj/item/storage/pill_bottle/patch_pack/ert/populate_contents() for(var/I in 1 to 5) @@ -389,9 +404,15 @@ new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) new /obj/item/reagent_containers/food/pill/patch/styptic(src) +/obj/item/storage/pill_bottle/patch_pack/ert/gamma + name = "ert gamma patch pack" + desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Gamma level medics." + wrapper_color = COLOR_YELLOW_GRAY + /obj/item/storage/pill_bottle/patch_pack/ert_amber name = "ert amber patch pack" desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Amber level medics" + wrapper_color = COLOR_ORANGE /obj/item/storage/pill_bottle/patch_pack/ert_amber/populate_contents() for(var/I in 1 to 5) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 74dda36236c..b5fc7ce019a 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -158,3 +158,15 @@ desc = "Used to help with blood loss." icon_state = "pill2" list_reagents = list("iron" = 10, "salglu_solution" = 10) + +/obj/item/reagent_containers/food/pill/lazarus_reagent + name = "\improper Lazarus Reagent pill" + desc = "Miraculous drug used for revival. Use with caution. Improper use may cause bodies to violently blow apart." + icon_state = "pill9" + list_reagents = list("lazarus_reagent" = 1) + +/obj/item/reagent_containers/food/pill/rezadone + name = "\improper Rezadone pill" + desc = "Used to rapidly repair cellular defects within a subject's cell structure." + icon_state = "pill10" + list_reagents = list("rezadone" = 1) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index cf89f76b2f9..ebc30f7d351 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -357,6 +357,8 @@ /obj/item/roller/holo = 1, /obj/item/bodyanalyzer = 1, /obj/item/handheld_defibrillator = 1, + /obj/item/storage/pill_bottle/ert_red = 1, + /obj/item/storage/pill_bottle/patch_pack/ert = 1, /obj/item/soap/nanotrasen = 1 ) @@ -388,6 +390,9 @@ /obj/item/extinguisher/mini = 1, /obj/item/roller/holo = 1, /obj/item/handheld_defibrillator = 1, + /obj/item/storage/box/autoinjectors = 1, + /obj/item/storage/pill_bottle/ert_gamma = 1, + /obj/item/storage/pill_bottle/patch_pack/ert/gamma = 1 ) cybernetic_implants = list(