diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm index a7fd183f63..99ea9ece4e 100644 --- a/code/game/objects/items/reagent_containers/glass/bottle.dm +++ b/code/game/objects/items/reagent_containers/glass/bottle.dm @@ -7,9 +7,9 @@ icon_state = null item_state = "atoxinbottle" amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 60) + possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 180) flags_atom = FPRINT|OPENCONTAINER - volume = 60 + volume = 180 attack_speed = 4 /obj/item/reagent_container/glass/bottle/on_reagent_change() @@ -57,47 +57,105 @@ /obj/item/reagent_container/glass/bottle/inaprovaline name = "\improper Inaprovaline bottle" - desc = "A small bottle. Contains inaprovaline - used to stabilize patients." + desc = "A small glossy bottle of inaprovaline, a drug that artificially stimulates the respiratory reflex, reducing oxygen starvation during unconsciousness." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle19" - amount_per_transfer_from_this = 60 + volume = 135 + amount_per_transfer_from_this = 135 /obj/item/reagent_container/glass/bottle/inaprovaline/Initialize() . = ..() - reagents.add_reagent("inaprovaline", 60) + reagents.add_reagent("inaprovaline", 135) + +/obj/item/reagent_container/glass/bottle/bicaridine + name = "\improper Bicaridine bottle" + desc = "A small glossy bottle full of bicaridine, a substance that stimulates regeneration of tissue damage." + icon = 'icons/obj/items/chemistry.dmi' + icon_state = "bottle17" + amount_per_transfer_from_this = 180 + +/obj/item/reagent_container/glass/bottle/bicaridine/Initialize() + . = ..() + reagents.add_reagent("bicaridine", 180) + +/obj/item/reagent_container/glass/bottle/peridaxon + name = "\improper Peridaxon bottle" + desc = "A small glossy bottle full of Peridaxon, the novel blend of drugs that TEMPORARILY halts the symptoms of organ damage." + icon = 'icons/obj/items/chemistry.dmi' + icon_state = "bottle4" + volume = 135 + amount_per_transfer_from_this = 135 + +/obj/item/reagent_container/glass/bottle/peridaxon/Initialize() + . = ..() + reagents.add_reagent("peridaxon", 135) + +/obj/item/reagent_container/glass/bottle/tramadol + name = "\improper Tramadol bottle" + desc = "A small glossy bottle full of tramadol, an OTC synthetic analgesic." + icon = 'icons/obj/items/chemistry.dmi' + icon_state = "bottle1" + amount_per_transfer_from_this = 180 + +/obj/item/reagent_container/glass/bottle/tramadol/Initialize() + . = ..() + reagents.add_reagent("tramadol", 180) + +/obj/item/reagent_container/glass/bottle/oxycodone + name = "\improper Oxycodone bottle" + desc = "A small glossy bottle full of oxycodone, an aggressive analgesic. May be habit forming." + icon = 'icons/obj/items/chemistry.dmi' + icon_state = "bottle2" + volume = 135 + amount_per_transfer_from_this = 135 + +/obj/item/reagent_container/glass/bottle/oxycodone/Initialize() + . = ..() + reagents.add_reagent("oxycodone", 135) + +/obj/item/reagent_container/glass/bottle/tricordrazine + name = "\improper Tricordrazine bottle" + desc = "A small glossy bottle full of tricordrazine, a drug that slowly treats minor injuries of all kinds." + icon = 'icons/obj/items/chemistry.dmi' + icon_state = "bottle18" + volume = 180 + +/obj/item/reagent_container/glass/bottle/tricordrazine/Initialize() + . = ..() + reagents.add_reagent("tricordrazine", 180) /obj/item/reagent_container/glass/bottle/kelotane name = "\improper Kelotane bottle" - desc = "A small bottle. Contains kelotane - used to treat burned areas." + desc = "A small glossy bottle filled with kelotane, a burn regrowth drug." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle16" - amount_per_transfer_from_this = 60 + amount_per_transfer_from_this = 180 /obj/item/reagent_container/glass/bottle/kelotane/Initialize() . = ..() - reagents.add_reagent("kelotane", 60) + reagents.add_reagent("kelotane", 180) /obj/item/reagent_container/glass/bottle/dexalin name = "\improper Dexalin bottle" - desc = "A small bottle. Contains dexalin - used to treat oxygen deprivation." + desc = "A small glossy bottle filled with dexalin. Microcapsules slowly release oxygen into the bloodstream, offsetting the effects of O2 deprivation." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle10" - amount_per_transfer_from_this = 60 + amount_per_transfer_from_this = 180 /obj/item/reagent_container/glass/bottle/dexalin/Initialize() . = ..() - reagents.add_reagent("dexalin", 60) + reagents.add_reagent("dexalin", 180) /obj/item/reagent_container/glass/bottle/spaceacillin name = "\improper Spaceacillin bottle" desc = "A small bottle. Contains spaceacillin - used to treat infected wounds." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle8" - amount_per_transfer_from_this = 60 + amount_per_transfer_from_this = 180 /obj/item/reagent_container/glass/bottle/spaceacillin/Initialize() . = ..() - reagents.add_reagent("spaceacillin", 60) + reagents.add_reagent("spaceacillin", 180) /obj/item/reagent_container/glass/bottle/toxin name = "toxin bottle" @@ -107,7 +165,7 @@ /obj/item/reagent_container/glass/bottle/toxin/Initialize() . = ..() - reagents.add_reagent("toxin", 60) + reagents.add_reagent("toxin", 150) /obj/item/reagent_container/glass/bottle/cyanide name = "cyanide bottle" @@ -117,18 +175,18 @@ /obj/item/reagent_container/glass/bottle/cyanide/Initialize() . = ..() - reagents.add_reagent("cyanide", 60) + reagents.add_reagent("cyanide", 150) /obj/item/reagent_container/glass/bottle/stoxin name = "Soporific bottle" desc = "A small bottle of soporific. Just the fumes make you sleepy." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle20" - amount_per_transfer_from_this = 60 + amount_per_transfer_from_this = 150 /obj/item/reagent_container/glass/bottle/stoxin/Initialize() . = ..() - reagents.add_reagent("stoxin", 60) + reagents.add_reagent("stoxin", 150) /obj/item/reagent_container/glass/bottle/chloralhydrate name = "chloral hydrate bottle" @@ -142,14 +200,14 @@ /obj/item/reagent_container/glass/bottle/antitoxin name = "\improper Dylovene bottle" - desc = "A small bottle of dylovene. Counters poisons, and repairs toxin damage. A wonder drug." + desc = "A small glossy bottle of dylovene, the new broadspectrum antitoxic." icon = 'icons/obj/items/chemistry.dmi' icon_state = "bottle7" - amount_per_transfer_from_this = 60 + amount_per_transfer_from_this = 150 /obj/item/reagent_container/glass/bottle/antitoxin/Initialize() . = ..() - reagents.add_reagent("anti_toxin", 60) + reagents.add_reagent("anti_toxin", 150) /obj/item/reagent_container/glass/bottle/mutagen name = "unstable mutagen bottle" @@ -159,7 +217,7 @@ /obj/item/reagent_container/glass/bottle/mutagen/Initialize() . = ..() - reagents.add_reagent("mutagen", 60) + reagents.add_reagent("mutagen", 150) /obj/item/reagent_container/glass/bottle/ammonia name = "ammonia bottle" @@ -169,7 +227,7 @@ /obj/item/reagent_container/glass/bottle/ammonia/Initialize() . = ..() - reagents.add_reagent("ammonia", 60) + reagents.add_reagent("ammonia", 150) /obj/item/reagent_container/glass/bottle/diethylamine name = "diethylamine bottle" @@ -179,7 +237,7 @@ /obj/item/reagent_container/glass/bottle/diethylamine/Initialize() . = ..() - reagents.add_reagent("diethylamine", 60) + reagents.add_reagent("diethylamine", 150) /obj/item/reagent_container/glass/bottle/flu_virion name = "flu virion culture bottle" @@ -339,7 +397,7 @@ /obj/item/reagent_container/glass/bottle/pacid/Initialize() . = ..() - reagents.add_reagent("pacid", 60) + reagents.add_reagent("pacid", 150) /obj/item/reagent_container/glass/bottle/adminordrazine name = "\improper Adminordrazine bottle" @@ -349,7 +407,7 @@ /obj/item/reagent_container/glass/bottle/adminordrazine/Initialize() . = ..() - reagents.add_reagent("adminordrazine", 60) + reagents.add_reagent("adminordrazine", 150) /obj/item/reagent_container/glass/bottle/capsaicin name = "\improper Capsaicin bottle" @@ -359,7 +417,7 @@ /obj/item/reagent_container/glass/bottle/capsaicin/Initialize() . = ..() - reagents.add_reagent("capsaicin", 60) + reagents.add_reagent("capsaicin", 150) /obj/item/reagent_container/glass/bottle/frostoil name = "\improper Frost Oil bottle" @@ -369,72 +427,4 @@ /obj/item/reagent_container/glass/bottle/frostoil/Initialize() . = ..() - reagents.add_reagent("frostoil", 60) - -/obj/item/reagent_container/glass/bottle/bicaridine - name = "\improper Bicaridine bottle" - desc = "A small bottle. Contains Bicaridine - Used to treat brute damage." - icon = 'icons/obj/items/chemistry.dmi' - icon_state = "bottle17" - amount_per_transfer_from_this = 60 - -/obj/item/reagent_container/glass/bottle/bicaridine/Initialize() - . = ..() - reagents.add_reagent("bicaridine", 60) - -/obj/item/reagent_container/glass/bottle/peridaxon - name = "\improper Peridaxon bottle" - desc = "A small bottle. Contains Peridaxon - Used by lazy doctors to temporarily halt the effects of internal organ damage." - icon = 'icons/obj/items/chemistry.dmi' - icon_state = "bottle4" - volume = 60 - amount_per_transfer_from_this = 60 - -/obj/item/reagent_container/glass/bottle/peridaxon/Initialize() - . = ..() - reagents.add_reagent("peridaxon", 60) - -/obj/item/reagent_container/glass/bottle/tramadol - name = "\improper Tramadol bottle" - desc = "A small bottle. Contains Tramadol - Used as a basic painkiller." - icon = 'icons/obj/items/chemistry.dmi' - icon_state = "bottle1" - volume = 60 - amount_per_transfer_from_this = 60 - -/obj/item/reagent_container/glass/bottle/tramadol/Initialize() - . = ..() - reagents.add_reagent("tramadol", 60) - -/obj/item/reagent_container/glass/bottle/oxycodone - name = "\improper Oxycodone bottle" - desc = "A small bottle. Contains Oxycodone - Used as an Extreme Painkiller. ILLEGAL TO DISTRIBUTE." - icon = 'icons/obj/items/chemistry.dmi' - icon_state = "bottle2" - volume = 60 - amount_per_transfer_from_this = 60 - -/obj/item/reagent_container/glass/bottle/oxycodone/Initialize() - . = ..() - reagents.add_reagent("oxycodone", 60) - -/obj/item/reagent_container/glass/bottle/tricordrazine - name = "\improper Tricordrazine bottle" - desc = "A small bottle. Contains tricordrazine - A weak but catch-all medicine for treating all sorts of damage." - icon = 'icons/obj/items/chemistry.dmi' - icon_state = "bottle18" - volume = 60 - -/obj/item/reagent_container/glass/bottle/tricordrazine/Initialize() - . = ..() - reagents.add_reagent("tricordrazine", 60) - -/obj/item/reagent_container/glass/bottle/epinephrine - name = "\improper Epinephrine bottle" - desc = "A small bottle. Contains epinephrine - Used to increase a patients arterial blood pressure, amongst other actions, to assist in cardiopulmonary resuscitation." //"I can't lie to you about your odds of a successful resuscitation, but you have my sympathies" - volume = 60 - -/obj/item/reagent_container/glass/bottle/epinephrine/Initialize() - . = ..() - reagents.add_reagent("adrenaline", 60) - update_icon() + reagents.add_reagent("frostoil", 150) diff --git a/code/game/objects/items/reagent_containers/syringes.dm b/code/game/objects/items/reagent_containers/syringes.dm index 2bb121740c..32808dbbfd 100644 --- a/code/game/objects/items/reagent_containers/syringes.dm +++ b/code/game/objects/items/reagent_containers/syringes.dm @@ -82,13 +82,12 @@ syringestab(target, user) return - var/injection_time = 2 SECONDS + var/injection_time = 10 SECONDS if(user.skills) - if(!skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC)) - to_chat(user, SPAN_WARNING("You aren't trained to use syringes...")) - return + if(!skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_TRAINED)) + to_chat(user, SPAN_WARNING("You aren't trained to use syringes... better go slow.")) else - injection_time = (injection_time*user.get_skill_duration_multiplier(SKILL_MEDICAL)) + injection_time = ((injection_time/5)*user.get_skill_duration_multiplier(SKILL_MEDICAL)) switch(mode)