diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 012d661fa32..082fc0d930f 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -268,7 +268,7 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE) /datum/asset/chem_master/register() for(var/i = 1 to 20) assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]") - for(var/i in list("rounded_bottle")) + for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle")) assets["[i].png"] = icon('icons/obj/chemical.dmi', "[i]") for(var/asset_name in assets) register_asset(asset_name, assets[asset_name]) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6fcb2b2dc80..122f0985376 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -394,7 +394,7 @@ var/useramount = 30 // Last used amount var/pillamount = 10 var/patchamount = 10 - var/bottlesprite = "rounded_bottle" + var/bottlesprite = "bottle" var/pillsprite = "1" var/client/has_sprites = list() var/printing = null @@ -669,7 +669,7 @@ else if(href_list["change_bottle"]) var/dat = "" var/j = 0 - for(var/i in list("rounded_bottle")) + for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle")) j++ if(j == 1) dat += "" diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 919ea8029e4..9d6b00d3eff 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -16,7 +16,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/New() ..() if(!icon_state) - icon_state = pick("reagent_bottle","rounded_bottle") + icon_state = pick("bottle", "small_bottle", "wide_bottle", "round_bottle") update_icon() /obj/item/weapon/reagent_containers/glass/bottle/on_reagent_change() @@ -52,31 +52,37 @@ /obj/item/weapon/reagent_containers/glass/bottle/toxin name = "toxin bottle" desc = "A small bottle of toxins. Do not drink, it is poisonous." + icon_state = "small_bottle" list_reagents = list("toxin" = 30) /obj/item/weapon/reagent_containers/glass/bottle/cyanide name = "cyanide bottle" desc = "A small bottle of cyanide. Bitter almonds?" + icon_state = "small_bottle" list_reagents = list("cyanide" = 30) /obj/item/weapon/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." + icon_state = "bottle" list_reagents = list("mutagen" = 30) /obj/item/weapon/reagent_containers/glass/bottle/ammonia name = "ammonia bottle" desc = "A small bottle." + icon_state = "bottle" list_reagents = list("ammonia" = 30) /obj/item/weapon/reagent_containers/glass/bottle/diethylamine name = "diethylamine bottle" desc = "A small bottle." + icon_state = "round_bottle" list_reagents = list("diethylamine" = 30) /obj/item/weapon/reagent_containers/glass/bottle/facid name = "Fluorosulfuric Acid Bottle" desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid" + icon_state = "round_bottle" list_reagents = list("facid" = 30) /obj/item/weapon/reagent_containers/glass/bottle/adminordrazine @@ -89,41 +95,49 @@ /obj/item/weapon/reagent_containers/glass/bottle/capsaicin name = "Capsaicin Bottle" desc = "A small bottle. Contains hot sauce." + icon_state = "round_bottle" list_reagents = list("capsaicin" = 30) /obj/item/weapon/reagent_containers/glass/bottle/frostoil name = "Frost Oil Bottle" desc = "A small bottle. Contains cold sauce." + icon_state = "round_bottle" list_reagents = list("frostoil" = 30) /obj/item/weapon/reagent_containers/glass/bottle/morphine name = "Morphine Bottle" desc = "A small bottle. Contains morphine." + icon_state = "round_bottle" list_reagents = list("morphine" = 30) /obj/item/weapon/reagent_containers/glass/bottle/ether name = "Ether Bottle" desc = "A small bottle. Contains ether." + icon_state = "round_bottle" list_reagents = list("ether" = 30) /obj/item/weapon/reagent_containers/glass/bottle/charcoal name = "Charcoal Bottle" desc = "A small bottle. Contains charcoal." + icon_state = "round_bottle" list_reagents = list("charcoal" = 30) /obj/item/weapon/reagent_containers/glass/bottle/epinephrine name = "Epinephrine Bottle" desc = "A small bottle. Contains epinephrine." + icon_state = "round_bottle" list_reagents = list("epinephrine" = 30) /obj/item/weapon/reagent_containers/glass/bottle/pancuronium name = "Pancuronium Bottle" desc = "A small bottle of pancuronium." + icon_state = "round_bottle" list_reagents = list("pancuronium" = 30) /obj/item/weapon/reagent_containers/glass/bottle/sulfonal name = "Sulfonal Bottle" desc = "A small bottle of Sulfonal." + icon_state = "round_bottle" list_reagents = list("sulfonal" = 30) //Reagent bottles @@ -202,96 +216,115 @@ /obj/item/weapon/reagent_containers/glass/bottle/plasma name = "plasma dust bottle" - desc = "A small bottle of plasma in dust form. Extremely toxic and reacts with micro-organisms inside blood." + desc = "A small bottle of plasma in dust form. Extremely toxic and reacts with micro-organisms inside blood." + icon_state = "wide_bottle" list_reagents = list("plasma_dust" = 30) /obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine name = "diphenhydramine bottle" - desc = "A small bottle of diphenhydramine." + desc = "A small bottle of diphenhydramine." + icon_state = "bottle" list_reagents = list("diphenhydramine" = 30) /obj/item/weapon/reagent_containers/glass/bottle/flu_virion name = "Flu virion culture bottle" - desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium." + desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/advance/flu /obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion name = "Epiglottis virion culture bottle" - desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium." + desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/advance/voice_change /obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion name = "Liver enhancement virion culture bottle" - desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium." + desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/advance/heal /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion name = "Hullucigen virion culture bottle" - desc = "A small bottle. Contains hullucigen virion culture in synthblood medium." + desc = "A small bottle. Contains hullucigen virion culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/advance/hullucigen /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat name = "Pierrot's Throat culture bottle" - desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium." + desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/pierrot_throat /obj/item/weapon/reagent_containers/glass/bottle/cold name = "Rhinovirus culture bottle" - desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium." + desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/advance/cold /obj/item/weapon/reagent_containers/glass/bottle/retrovirus name = "Retrovirus culture bottle" - desc = "A small bottle. Contains a retrovirus culture in a synthblood medium." + desc = "A small bottle. Contains a retrovirus culture in a synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/dna_retrovirus /obj/item/weapon/reagent_containers/glass/bottle/gbs name = "GBS culture bottle" - desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit + desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit + icon_state = "round_bottle" amount_per_transfer_from_this = 5 spawned_disease = /datum/disease/gbs /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs name = "GBS culture bottle" - desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit + desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit + icon_state = "round_bottle" spawned_disease = /datum/disease/fake_gbs /obj/item/weapon/reagent_containers/glass/bottle/brainrot name = "Brainrot culture bottle" - desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium." + desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium." + icon_state = "round_bottle" spawned_disease = /datum/disease/brainrot /obj/item/weapon/reagent_containers/glass/bottle/magnitis name = "Magnitis culture bottle" - desc = "A small bottle. Contains a small dosage of Fukkos Miracos." + desc = "A small bottle. Contains a small dosage of Fukkos Miracos." + icon_state = "round_bottle" spawned_disease = /datum/disease/magnitis /obj/item/weapon/reagent_containers/glass/bottle/wizarditis name = "Wizarditis culture bottle" - desc = "A small bottle. Contains a sample of Rincewindus Vulgaris." + desc = "A small bottle. Contains a sample of Rincewindus Vulgaris." + icon_state = "round_bottle" spawned_disease = /datum/disease/wizarditis /obj/item/weapon/reagent_containers/glass/bottle/anxiety name = "Severe Anxiety culture bottle" - desc = "A small bottle. Contains a sample of Lepidopticides." + desc = "A small bottle. Contains a sample of Lepidopticides." + icon_state = "round_bottle" spawned_disease = /datum/disease/anxiety /obj/item/weapon/reagent_containers/glass/bottle/beesease name = "Beesease culture bottle" - desc = "A small bottle. Contains a sample of invasive Apidae." + desc = "A small bottle. Contains a sample of invasive Apidae." + icon_state = "round_bottle" spawned_disease = /datum/disease/beesease /obj/item/weapon/reagent_containers/glass/bottle/fluspanish name = "Spanish flu culture bottle" - desc = "A small bottle. Contains a sample of Inquisitius." + desc = "A small bottle. Contains a sample of Inquisitius." + icon_state = "round_bottle" spawned_disease = /datum/disease/fluspanish /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis name = "Fungal Tuberculosis culture bottle" - desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus." + desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus." + icon_state = "round_bottle" spawned_disease = /datum/disease/tuberculosis /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure name = "BVAK bottle" desc = "A small bottle containing Bio Virus Antidote Kit." + icon_state = "wide_bottle" list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10) diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 05286ed25c9..ee0bcc1a9c3 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 1f9cae3eaa3..10f78a146b5 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl index ea83dac9217..1ccfcadfe70 100644 --- a/nano/templates/chem_master.tmpl +++ b/nano/templates/chem_master.tmpl @@ -66,6 +66,12 @@ + +
{{:helper.link('Create bottle (30u max)', 'arrow-right', {'createbottle': 1})}} + {{:helper.link('Style', 'pencil', {'change_bottle': 1})}} + + +
{{/if}}