diff --git a/code/datums/supplypacks/medical_vr.dm b/code/datums/supplypacks/medical_vr.dm index 0538f83867..2d6a340f0a 100644 --- a/code/datums/supplypacks/medical_vr.dm +++ b/code/datums/supplypacks/medical_vr.dm @@ -1,3 +1,6 @@ +/datum/supply_pack/med/medical + cost = 15 + /datum/supply_pack/med/medicalbiosuits contains = list( /obj/item/clothing/head/bio_hood/scientist = 3, diff --git a/code/datums/uplink/medical_vr.dm b/code/datums/uplink/medical_vr.dm index 324398843f..cb6c9e6231 100644 --- a/code/datums/uplink/medical_vr.dm +++ b/code/datums/uplink/medical_vr.dm @@ -50,8 +50,3 @@ name = "Healing Nanite pill bottle" item_cost = 30 path = /obj/item/weapon/storage/pill_bottle/healing_nanites - -/datum/uplink_item/item/medical/insiderepair - name = "Combat organ kit" - item_cost = 120 - path = /obj/item/weapon/storage/firstaid/insiderepair diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index c47e564e01..703649f4f1 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -10,26 +10,26 @@ /obj/item/weapon/storage/firstaid name = "first aid kit" desc = "It's an emergency medical kit for those serious boo-boos." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "firstaid" throw_speed = 2 throw_range = 8 max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 -// var/list/icon_variety // VOREStation edit + var/list/icon_variety drop_sound = 'sound/items/drop/box.ogg' /obj/item/weapon/storage/firstaid/Initialize() . = ..() -// if(icon_variety) // VOREStation edit -// icon_state = pick(icon_variety) -// icon_variety = null + if(icon_variety) + icon_state = pick(icon_variety) + icon_variety = null /obj/item/weapon/storage/firstaid/fire name = "fire first aid kit" desc = "It's an emergency medical kit for when the toxins lab spontaneously burns down." icon_state = "ointment" item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment") -// icon_variety = list("ointment","firefirstaid") // VOREStation edit + //icon_variety = list("ointment","firefirstaid") //VOREStation Removal starts_with = list( /obj/item/device/healthanalyzer, /obj/item/weapon/reagent_containers/hypospray/autoinjector, @@ -57,7 +57,7 @@ desc = "Used to treat when one has a high amount of toxins in their body." icon_state = "antitoxin" item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin") -// icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") // VOREStation edit + //icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") //VOREStation Removal starts_with = list( /obj/item/weapon/reagent_containers/syringe/antitoxin, /obj/item/weapon/reagent_containers/syringe/antitoxin, @@ -135,7 +135,7 @@ /obj/item/weapon/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste, - ///obj/item/device/healthanalyzer/advanced, //VOREStation Removal, + /obj/item/device/healthanalyzer/advanced, /obj/item/weapon/autopsy_scanner ) @@ -150,7 +150,7 @@ /obj/item/weapon/surgical/bonegel, /obj/item/weapon/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, - ///obj/item/device/healthanalyzer/advanced, //VOREStation Removal, + /obj/item/device/healthanalyzer/advanced, /obj/item/weapon/autopsy_scanner ) diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 4693a3b07b..e972cac8b7 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -1,9 +1,148 @@ +/obj/item/weapon/storage/firstaid + icon = 'icons/obj/storage_vr.dmi' + +/obj/item/weapon/storage/firstaid/fire + starts_with = list( + /obj/item/weapon/storage/pill_bottle/kelotane, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn + ) + +/obj/item/weapon/storage/firstaid/regular + starts_with = list( + /obj/item/stack/medical/bruise_pack, + /obj/item/stack/medical/bruise_pack, + /obj/item/stack/medical/bruise_pack, + /obj/item/stack/medical/ointment, + /obj/item/stack/medical/ointment, + /obj/item/weapon/storage/pill_bottle/inaprovaline, + /obj/item/weapon/storage/pill_bottle/paracetamol + ) + +/obj/item/weapon/storage/firstaid/toxin + starts_with = list( + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, + /obj/item/weapon/storage/pill_bottle/antitox + ) + +/obj/item/weapon/storage/firstaid/o2 + starts_with = list( + /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/weapon/storage/pill_bottle/iron, + /obj/item/weapon/storage/pill_bottle/dexalin + ) + +/obj/item/weapon/storage/firstaid/adv + starts_with = list( + /obj/item/weapon/storage/pill_bottle/assorted, + /obj/item/stack/medical/advanced/bruise_pack, + /obj/item/stack/medical/advanced/bruise_pack, + /obj/item/stack/medical/advanced/bruise_pack, + /obj/item/stack/medical/advanced/ointment, + /obj/item/stack/medical/advanced/ointment, + /obj/item/stack/medical/splint + ) + +/obj/item/weapon/storage/firstaid/combat + starts_with = list( + /obj/item/weapon/storage/pill_bottle/vermicetol, + /obj/item/weapon/storage/pill_bottle/dermaline, + /obj/item/weapon/storage/pill_bottle/dexalin_plus, + /obj/item/weapon/storage/pill_bottle/carthatoline, + /obj/item/weapon/storage/pill_bottle/tramadol, + /obj/item/weapon/storage/pill_bottle/corophizine, + /obj/item/weapon/storage/pill_bottle/combat, + /obj/item/stack/medical/splint, + /obj/item/device/healthanalyzer/advanced + ) + +/obj/item/weapon/storage/firstaid/surgery + can_hold = list( + /obj/item/weapon/surgical/bonesetter, + /obj/item/weapon/surgical/cautery, + /obj/item/weapon/surgical/circular_saw, + /obj/item/weapon/surgical/hemostat, + /obj/item/weapon/surgical/retractor, + /obj/item/weapon/surgical/scalpel, + /obj/item/weapon/surgical/surgicaldrill, + /obj/item/weapon/surgical/bonegel, + /obj/item/weapon/surgical/FixOVein, + /obj/item/stack/medical/advanced/bruise_pack, + /obj/item/stack/nanopaste, + /obj/item/device/healthanalyzer, + /obj/item/weapon/autopsy_scanner + ) + + starts_with = list( + /obj/item/weapon/surgical/bonesetter, + /obj/item/weapon/surgical/cautery, + /obj/item/weapon/surgical/circular_saw, + /obj/item/weapon/surgical/hemostat, + /obj/item/weapon/surgical/retractor, + /obj/item/weapon/surgical/scalpel, + /obj/item/weapon/surgical/surgicaldrill, + /obj/item/weapon/surgical/bonegel, + /obj/item/weapon/surgical/FixOVein, + /obj/item/stack/medical/advanced/bruise_pack, + /obj/item/device/healthanalyzer, + /obj/item/weapon/autopsy_scanner + ) + /obj/item/weapon/storage/firstaid/clotting icon_state = "clottingkit" /obj/item/weapon/storage/firstaid/bonemed icon_state = "pinky" +/obj/item/weapon/storage/pill_bottle/antitox + starts_with = list(/obj/item/weapon/reagent_containers/pill/antitox = 14) + +/obj/item/weapon/storage/pill_bottle/bicaridine + starts_with = list(/obj/item/weapon/reagent_containers/pill/bicaridine = 14) + +/obj/item/weapon/storage/pill_bottle/dexalin_plus + starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin_plus = 14) + +/obj/item/weapon/storage/pill_bottle/dermaline + starts_with = list(/obj/item/weapon/reagent_containers/pill/dermaline = 14) + +/obj/item/weapon/storage/pill_bottle/dylovene + starts_with = list(/obj/item/weapon/reagent_containers/pill/dylovene = 14) + +/obj/item/weapon/storage/pill_bottle/inaprovaline + starts_with = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 14) + +/obj/item/weapon/storage/pill_bottle/kelotane + starts_with = list(/obj/item/weapon/reagent_containers/pill/kelotane = 14) + +/obj/item/weapon/storage/pill_bottle/spaceacillin + starts_with = list(/obj/item/weapon/reagent_containers/pill/spaceacillin = 14) + +/obj/item/weapon/storage/pill_bottle/tramadol + starts_with = list(/obj/item/weapon/reagent_containers/pill/tramadol = 14) + +/obj/item/weapon/storage/pill_bottle/citalopram + starts_with = list(/obj/item/weapon/reagent_containers/pill/citalopram = 14) + +/obj/item/weapon/storage/pill_bottle/carbon + starts_with = list(/obj/item/weapon/reagent_containers/pill/carbon = 14) + +/obj/item/weapon/storage/pill_bottle/iron + starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 14) + /obj/item/weapon/storage/pill_bottle/adminordrazine name = "pill bottle (Adminordrazine)" desc = "It's magic. We don't have to explain it." @@ -17,67 +156,73 @@ /obj/item/weapon/storage/pill_bottle/rezadone name = "pill bottle (Rezadone)" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." - starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 14) wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/peridaxon name = "pill bottle (Peridaxon)" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." - starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 14) wrapper_color = COLOR_PURPLE /obj/item/weapon/storage/pill_bottle/carthatoline name = "pill bottle (Carthatoline)" desc = "Carthatoline is strong evacuant used to treat severe poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 14) wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/alkysine name = "pill bottle (Alkysine)" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." - starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 14) wrapper_color = COLOR_YELLOW /obj/item/weapon/storage/pill_bottle/imidazoline name = "pill bottle (Imidazoline)" desc = "Heals eye damage." - starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 14) wrapper_color = COLOR_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/osteodaxon name = "pill bottle (Osteodaxon)" desc = "An experimental drug used to heal bone fractures." - starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 14) wrapper_color = COLOR_WHITE /obj/item/weapon/storage/pill_bottle/myelamine name = "pill bottle (Myelamine)" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." - starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 14) wrapper_color = COLOR_PALE_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/hyronalin name = "pill bottle (Hyronalin)" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 14) wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/arithrazine name = "pill bottle (Arithrazine)" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 14) wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/corophizine name = "pill bottle (Corophizine)" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." - starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 14) wrapper_color = COLOR_PALE_GREEN_GRAY +/obj/item/weapon/storage/pill_bottle/vermicetol + name = "pill bottle (Vermicetol)" + desc = "Contains pills used to stabilize the extremely injured." + starts_with = list(/obj/item/weapon/reagent_containers/pill/vermicetol = 14) + wrapper_color = COLOR_MAROON + /obj/item/weapon/storage/pill_bottle/healing_nanites name = "pill bottle (Healing nanites)" desc = "Miniature medical robots that swiftly restore bodily damage." - starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 14) /obj/item/weapon/storage/pill_bottle/sleevingcure name = "pill bottle (Kitsuhanan Cure)" @@ -87,23 +232,6 @@ /obj/item/weapon/storage/pill_bottle/sleevingcure/full starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure = 14) -/obj/item/weapon/storage/firstaid/insiderepair - name = "combat organ kit" - desc = "Contains advanced organ medical treatments." - icon_state = "bezerk" - item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced") - starts_with = list( - /obj/item/weapon/storage/pill_bottle/rezadone, - /obj/item/weapon/storage/pill_bottle/peridaxon, - /obj/item/weapon/storage/pill_bottle/carthatoline, - /obj/item/weapon/storage/pill_bottle/alkysine, - /obj/item/weapon/storage/pill_bottle/imidazoline, - /obj/item/weapon/storage/pill_bottle/osteodaxon, - /obj/item/weapon/storage/pill_bottle/myelamine, - /obj/item/weapon/storage/pill_bottle/arithrazine, - /obj/item/device/healthanalyzer/advanced - ) - /obj/item/weapon/storage/mrebag/pill name = "vacuum-sealed pill" desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." @@ -119,5 +247,39 @@ /obj/item/weapon/storage/pill_bottle/paracetamol name = "pill bottle (Paracetamol)" desc = "Contains over the counter medicine to treat pain." - starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 7) + starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 14) wrapper_color = COLOR_GRAY + +/obj/item/weapon/storage/pill_bottle/dexalin + name = "pill bottle (Dexalin)" + desc = "Contains pills used to treat oxygen deprivation." + starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin = 14) + wrapper_color = "#3366cc" + +/obj/item/weapon/storage/pill_bottle/assorted + name = "pill bottle (Assorted)" + desc = "Commonly found on paramedics, these assorted pill bottles contain basic treatments for nonstandard injuries." + starts_with = list( + /obj/item/weapon/reagent_containers/pill/inaprovaline = 3, + /obj/item/weapon/reagent_containers/pill/dylovene = 3, + /obj/item/weapon/reagent_containers/pill/iron = 2, + /obj/item/weapon/reagent_containers/pill/tramadol = 2, + /obj/item/weapon/reagent_containers/pill/hyronalin = 3, + /obj/item/weapon/reagent_containers/pill/spaceacillin + ) + wrapper_color = COLOR_BLACK + +/obj/item/weapon/storage/pill_bottle/combat + name = "pill bottle (Combat)" + desc = "A pill bottle filled with some of the rarest medical treatmeants to exist." + max_storage_space = ITEMSIZE_COST_TINY * 20 + starts_with = list( + /obj/item/weapon/reagent_containers/pill/peridaxon = 5, + /obj/item/weapon/reagent_containers/pill/rezadone = 5, + /obj/item/weapon/reagent_containers/pill/myelamine = 3, + /obj/item/weapon/reagent_containers/pill/osteodaxon = 3, + /obj/item/weapon/reagent_containers/pill/arithrazine = 2, + /obj/item/weapon/reagent_containers/pill/alkysine = 1, + /obj/item/weapon/reagent_containers/pill/imidazoline = 1 + ) + wrapper_color = COLOR_BLACK diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index b15f45d6fb..7c8d001403 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -21,32 +21,34 @@ /obj/structure/closet/emcloset/Initialize() switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10))) + //VOREStation Block Edit Start - Modified List if ("small") starts_with = list( /obj/item/weapon/tank/emergency/oxygen = 2, /obj/item/clothing/mask/breath = 2, - /obj/item/clothing/suit/space/emergency, - /obj/item/clothing/head/helmet/space/emergency) + /obj/item/clothing/suit/space/emergency = 2, + /obj/item/clothing/head/helmet/space/emergency = 2) if ("aid") starts_with = list( /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/toolbox/emergency, /obj/item/clothing/mask/breath, - /obj/item/weapon/storage/firstaid/o2, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency) if ("tank") starts_with = list( /obj/item/weapon/tank/emergency/oxygen/engi = 2, - /obj/item/clothing/mask/breath = 2) + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/suit/space/emergency = 2, + /obj/item/clothing/head/helmet/space/emergency = 2) if ("both") starts_with = list( /obj/item/weapon/storage/toolbox/emergency, - /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/clothing/mask/breath, - /obj/item/weapon/storage/firstaid/o2, + /obj/item/weapon/tank/emergency/oxygen/engi = 2, + /obj/item/clothing/mask/breath = 2, /obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/head/helmet/space/emergency = 2) + //VOREStation Block Edit End return ..() diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 5886b08af0..b9b11d988d 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -30,7 +30,10 @@ // TODO new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 200), new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), - new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 500), + new /datum/data/mining_equipment("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 250), + new /datum/data/mining_equipment("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 250), + new /datum/data/mining_equipment("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 250), + new /datum/data/mining_equipment("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 250), new /datum/data/mining_equipment("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200), // new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900), diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index a5afad7fab..916b1c57f3 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -26,7 +26,10 @@ new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 20), new /datum/data/mining_equipment("Shelter Capsule", /obj/item/device/survivalcapsule, 50), new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50), - new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 50), + new /datum/data/mining_equipment("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 25), + new /datum/data/mining_equipment("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 25), + new /datum/data/mining_equipment("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 25), + new /datum/data/mining_equipment("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 25), new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm index cee42fb31f..499862490d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm @@ -67,7 +67,7 @@ taste_description = "sparkles" taste_mult = 3 reagent_state = LIQUID - color = "#964e06" + color = "#750404" overdose = REAGENTS_OVERDOSE * 0.5 scannable = 1 diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm index 526ae77fba..749d1ba368 100644 --- a/code/modules/reagents/reagent_containers/hypospray_vr.dm +++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm @@ -1,27 +1,31 @@ -/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner - name = "Emergency trauma injector" - desc = "A rapid injector for emergency treatment of injuries. The warning label advises that it is not a substitute for proper medical treatment." - icon_state = "autoinjector" - item_state = "autoinjector" - amount_per_transfer_from_this = 10 - volume = 10 +/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn + name = "autoinjector (burn)" + icon_state = "purple" + filled_reagents = list("dermaline" = 4, "tramadol" = 1) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner/Initialize() - ..() - reagents.add_reagent("bicaridine", 5) - reagents.add_reagent("tricordrazine", 3) - reagents.add_reagent("tramadol", 2) - update_icon() +/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma + name = "autoinjector (trauma)" + icon_state = "black" + filled_reagents = list("bicaridine" = 4, "tramadol" = 1) + +/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy + name = "autoinjector (oxy)" + icon_state = "blue" + filled_reagents = list("dexalinp" = 5) /obj/item/weapon/storage/box/traumainjectors - name = "box of emergency trauma injectors" - desc = "Contains emergency trauma autoinjectors." + name = "box of emergency injectors" + desc = "Contains emergency autoinjectors." icon_state = "syringe" + max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 /obj/item/weapon/storage/box/traumainjectors/Initialize() ..() - for (var/i = 1 to 7) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src) + for (var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma(src) + for (var/i = 1 to 2) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox(src) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn(src) /obj/item/weapon/reagent_containers/hypospray var/prototype = 0 diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 82a6f7b97a..706469f645 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -96,13 +96,13 @@ //Pills /obj/item/weapon/reagent_containers/pill/antitox - name = "Dylovene (25u)" + name = "Dylovene (30u)" //VOREStation Edit desc = "Neutralizes many common toxins." icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/antitox/Initialize() . = ..() - reagents.add_reagent("anti_toxin", 25) + reagents.add_reagent("anti_toxin", 30) //VOREStation Edit color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/tox @@ -146,13 +146,13 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/kelotane - name = "Kelotane (15u)" + name = "Kelotane (20u)" //VOREStation Edit desc = "Used to treat burns." icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/kelotane/Initialize() . = ..() - reagents.add_reagent("kelotane", 15) + reagents.add_reagent("kelotane", 20) //VOREStation Edit color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/paracetamol @@ -196,13 +196,13 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/dexalin - name = "Dexalin (15u)" + name = "Dexalin (10u)" //VOREstation Edit desc = "Used to treat oxygen deprivation." icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/dexalin/Initialize() . = ..() - reagents.add_reagent("dexalin", 15) + reagents.add_reagent("dexalin", 10) //VOREStation Edit color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/dexalin_plus @@ -256,7 +256,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/spaceacillin - name = "Spaceacillin (10u)" + name = "Spaceacillin (15u)" //VOREStation Edit desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." icon_state = "pill3" @@ -266,23 +266,23 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/carbon - name = "Carbon (15u)" + name = "Carbon (30u)" //VOREStation Edit desc = "Used to neutralise chemicals in the stomach." icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/carbon/Initialize() . = ..() - reagents.add_reagent("carbon", 15) + reagents.add_reagent("carbon", 30) //VOREStation Edit color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/iron - name = "Iron (15u)" + name = "Iron (30u)" //VOREStation Edit desc = "Used to aid in blood regeneration after bleeding." icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/iron/Initialize() . = ..() - reagents.add_reagent("iron", 15) + reagents.add_reagent("iron", 30) //VOREStation Edit color = reagents.get_color() //Not-quite-medicine diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index 809af83d16..2fd339d5f9 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -1,5 +1,5 @@ /obj/item/weapon/reagent_containers/pill/nutriment - name = "Nutriment pill" + name = "Nutriment (30u)" desc = "Used to feed people on the field. Contains 30 units of Nutriment." icon_state = "pill10" @@ -8,7 +8,7 @@ reagents.add_reagent("nutriment", 30) /obj/item/weapon/reagent_containers/pill/protein - name = "Meat pill" + name = "Protein (30u)" desc = "Used to feed carnivores on the field. Contains 30 units of Protein." icon_state = "pill24" @@ -17,7 +17,7 @@ reagents.add_reagent("protein", 30) /obj/item/weapon/reagent_containers/pill/rezadone - name = "Rezadone pill" + name = "Rezadone (5u)" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." icon_state = "pill2" @@ -27,7 +27,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/peridaxon - name = "Peridaxon pill" + name = "Peridaxon (10u)" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." icon_state = "pill10" @@ -36,7 +36,7 @@ reagents.add_reagent("peridaxon", 10) /obj/item/weapon/reagent_containers/pill/carthatoline - name = "Carthatoline pill" + name = "Carthatoline (10u)" desc = "Carthatoline is strong evacuant used to treat severe poisoning." icon_state = "pill4" @@ -46,7 +46,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/alkysine - name = "Alkysine pill" + name = "Alkysine (10u)" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." icon_state = "pill3" @@ -56,7 +56,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/imidazoline - name = "Imidazoline pill" + name = "Imidazoline (15u)" desc = "Heals eye damage." icon_state = "pill3" @@ -66,27 +66,29 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/osteodaxon - name = "Osteodaxon pill" + name = "Osteodaxon (25u)" desc = "An experimental drug used to heal bone fractures." icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize() ..() - reagents.add_reagent("osteodaxon", 10) + reagents.add_reagent("osteodaxon", 15) + reagents.add_reagent("inaprovaline", 10) color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/myelamine - name = "Myelamine pill" + name = "Myelamine (25u)" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/myelamine/Initialize() ..() - reagents.add_reagent("myelamine", 10) + reagents.add_reagent("myelamine", 15) + reagents.add_reagent("inaprovaline", 10) color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/hyronalin - name = "Hyronalin pill" + name = "Hyronalin (15u)" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." icon_state = "pill4" @@ -96,7 +98,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/arithrazine - name = "Arithrazine pill" + name = "Arithrazine (5u)" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." icon_state = "pill2" @@ -106,7 +108,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/corophizine - name = "Corophizine pill" + name = "Corophizine (5u)" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." icon_state = "pill2" @@ -115,8 +117,18 @@ reagents.add_reagent("corophizine", 5) color = reagents.get_color() +/obj/item/weapon/reagent_containers/pill/vermicetol + name = "Vermicetol (15u)" + desc = "An extremely potent drug to treat physical injuries." + icon_state = "pill1" + +/obj/item/weapon/reagent_containers/pill/vermicetol/Initialize() + ..() + reagents.add_reagent("vermicetol", 15) + color = reagents.get_color() + /obj/item/weapon/reagent_containers/pill/healing_nanites - name = "Healing nanites capsule" + name = "Healing nanites (30u)" desc = "Miniature medical robots that swiftly restore bodily damage." icon_state = "pill1" @@ -126,7 +138,7 @@ color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/sleevingcure - name = "Kitsuhanan Cure pill" + name = "Kitsuhanan Cure (1u)" desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery." icon_state = "pill3" diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index e56f8095fe..bd438cb4c2 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -44,10 +44,11 @@ "h" = ( /obj/machinery/smartfridge/survival_pod, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/insiderepair, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, /obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, /obj/item/weapon/storage/mre/menu10, /obj/item/weapon/storage/mre/menu10, /obj/item/weapon/storage/mre/menu10, @@ -82,8 +83,6 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/insiderepair, /obj/item/weapon/storage/pill_bottle/nutriment, /obj/item/weapon/storage/pill_bottle/iron, /obj/item/weapon/storage/pill_bottle/arithrazine, diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index cad575a45f..372c5a551a 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -5018,7 +5018,7 @@ pixel_y = -32 }, /obj/item/weapon/storage/box/body_record_disk, -/obj/item/weapon/storage/firstaid/insiderepair, +/obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/firstaid/clotting, /obj/item/weapon/storage/firstaid/bonemed, /obj/item/weapon/storage/firstaid/adv{ diff --git a/maps/tether/submaps/om_ships/mercenarybase.dmm b/maps/tether/submaps/om_ships/mercenarybase.dmm index 8c7c0ac77b..4fcc289bb4 100644 --- a/maps/tether/submaps/om_ships/mercenarybase.dmm +++ b/maps/tether/submaps/om_ships/mercenarybase.dmm @@ -3686,7 +3686,7 @@ /area/mercbase/engineering) "ov" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/insiderepair, +/obj/item/weapon/storage/firstaid/combat, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "ow" = ( diff --git a/maps/tether/submaps/om_ships/mercship.dmm b/maps/tether/submaps/om_ships/mercship.dmm index 727b9250bd..9cc4a5c29b 100644 --- a/maps/tether/submaps/om_ships/mercship.dmm +++ b/maps/tether/submaps/om_ships/mercship.dmm @@ -3824,9 +3824,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/item/weapon/storage/firstaid/insiderepair, -/obj/item/weapon/storage/firstaid/insiderepair, -/obj/item/weapon/storage/firstaid/insiderepair, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "gK" = ( diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 59b011a273..f43e4e6724 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -1214,7 +1214,7 @@ default_material = "durasteel" }, /obj/item/clothing/accessory/holster/machete, -/obj/item/weapon/storage/firstaid/insiderepair, +/obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/toolbox/syndicate/powertools, /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{