mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
Fully adpots previously ported bottle sprite and fixes reagent overlays (#26962)
* test 1 * Bottles * quick fix * brighter reagent bottle * removes old lids * Update code/modules/reagents/reagent_containers/chemical_bottle.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Bmon <no@email.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Bm0n
co-authored by
Burzah
Bmon
DGamerL
Burzah
Bmon
DGamerL
parent
07dac1d537
commit
ea7295bc9b
@@ -633,7 +633,7 @@
|
||||
production_name = "Bottles"
|
||||
production_icon = "wine-bottle"
|
||||
item_type = /obj/item/reagent_containers/glass/bottle/reagent
|
||||
sprites = list("bottle", "small_bottle", "wide_bottle", "round_bottle", "reagent_bottle")
|
||||
sprites = list("bottle", "reagent_bottle")
|
||||
max_items_amount = 5
|
||||
max_units_per_item = 50
|
||||
name_suffix = " bottle"
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
/obj/machinery/computer/pandemic/proc/create_culture(name, bottle_type = "culture", cooldown = 50)
|
||||
var/obj/item/reagent_containers/glass/bottle/B = new/obj/item/reagent_containers/glass/bottle(loc)
|
||||
B.icon_state = "round_bottle"
|
||||
B.icon_state = "bottle"
|
||||
B.pixel_x = rand(-3, 3)
|
||||
B.pixel_y = rand(-3, 3)
|
||||
replicator_cooldown(cooldown)
|
||||
|
||||
@@ -5,37 +5,38 @@
|
||||
name = "bottle"
|
||||
desc = "A small bottle."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "round_bottle"
|
||||
icon_state = "bottle"
|
||||
item_state = "atoxinbottle"
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30)
|
||||
possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50)
|
||||
container_type = OPENCONTAINER
|
||||
volume = 30
|
||||
volume = 50
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/on_reagent_change()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/update_overlays()
|
||||
. = ..()
|
||||
underlays.Cut()
|
||||
if(reagents.total_volume)
|
||||
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
|
||||
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
|
||||
|
||||
var/percent = round((reagents.total_volume / volume) * 100)
|
||||
switch(percent)
|
||||
if(0 to 24)
|
||||
filling.icon_state = "[icon_state]10"
|
||||
if(25 to 49)
|
||||
filling.icon_state = "[icon_state]25"
|
||||
if(50 to 74)
|
||||
filling.icon_state = "[icon_state]50"
|
||||
if(75 to 90)
|
||||
filling.icon_state = "[icon_state]75"
|
||||
if(91 to INFINITY)
|
||||
if(1 to 19)
|
||||
filling.icon_state = "[icon_state]1"
|
||||
if(20 to 39)
|
||||
filling.icon_state = "[icon_state]20"
|
||||
if(40 to 59)
|
||||
filling.icon_state = "[icon_state]40"
|
||||
if(60 to 79)
|
||||
filling.icon_state = "[icon_state]60"
|
||||
if(80 to 99)
|
||||
filling.icon_state = "[icon_state]80"
|
||||
if(100 to INFINITY)
|
||||
filling.icon_state = "[icon_state]100"
|
||||
|
||||
filling.icon += mix_color_from_reagents(reagents.reagent_list)
|
||||
underlays += filling
|
||||
. += filling
|
||||
|
||||
if(!is_open_container())
|
||||
. += "lid_[icon_state]"
|
||||
@@ -50,67 +51,56 @@
|
||||
/obj/item/reagent_containers/glass/bottle/toxin
|
||||
name = "toxin bottle"
|
||||
desc = "A small bottle containing toxic compounds."
|
||||
icon_state = "small_bottle"
|
||||
list_reagents = list("toxin" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/atropine
|
||||
name = "atropine bottle"
|
||||
desc = "A small bottle containing atropine, used for cardiac emergencies."
|
||||
icon_state = "small_bottle"
|
||||
list_reagents = list("atropine" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/saline
|
||||
name = "saline-glucose bottle"
|
||||
desc = "A small bottle containing saline-glucose solution."
|
||||
icon_state = "small_bottle"
|
||||
list_reagents = list("salglu_solution" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/salicylic
|
||||
name = "salicylic acid bottle"
|
||||
desc = "A small bottle containing medicine for pain and fevers."
|
||||
icon_state = "small_bottle"
|
||||
list_reagents = list("sal_acid" = 30)
|
||||
|
||||
/obj/item/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/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/reagent_containers/glass/bottle/ash
|
||||
name = "ash bottle"
|
||||
desc = "A small bottle of ash. The substance, not the person."
|
||||
icon_state = "bottle"
|
||||
list_reagents = list("ash" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/ammonia
|
||||
name = "ammonia bottle"
|
||||
desc = "A small bottle of ammonia. Good for cleaning, but don't mix it with bleach."
|
||||
icon_state = "bottle"
|
||||
list_reagents = list("ammonia" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/diethylamine
|
||||
name = "diethylamine bottle"
|
||||
desc = "A small bottle of diethylamine. Good for plants, bad for people."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("diethylamine" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/saltpetre
|
||||
name = "saltpetre bottle"
|
||||
desc = "A small bottle of saltpetre. Used in botany and to make gunpowder."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("saltpetre" = 30)
|
||||
|
||||
/obj/item/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/reagent_containers/glass/bottle/adminordrazine
|
||||
@@ -123,55 +113,46 @@
|
||||
/obj/item/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/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/reagent_containers/glass/bottle/morphine
|
||||
name = "morphine bottle"
|
||||
desc = "A small bottle of morphine, a powerful painkiller."
|
||||
icon_state = "bottle"
|
||||
list_reagents = list("morphine" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/ether
|
||||
name = "ether bottle"
|
||||
desc = "A small bottle of an ether, a strong anesthetic and sedative."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("ether" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/charcoal
|
||||
name = "charcoal bottle"
|
||||
desc = "A small bottle. Contains charcoal."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("charcoal" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/epinephrine
|
||||
name = "epinephrine bottle"
|
||||
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("epinephrine" = 30)
|
||||
|
||||
/obj/item/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/reagent_containers/glass/bottle/sulfonal
|
||||
name = "sulfonal bottle"
|
||||
desc = "A small bottle of Sulfonal."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("sulfonal" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/love
|
||||
name = "love bottle"
|
||||
desc = "A small bottle of love."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("love" = 50)
|
||||
|
||||
//Reagent bottles
|
||||
@@ -180,8 +161,6 @@
|
||||
name = "reagent bottle"
|
||||
desc = "A bottle for storing reagents."
|
||||
icon_state = "reagent_bottle"
|
||||
possible_transfer_amounts = list(5, 10, 15, 25, 30, 50)
|
||||
volume = 50
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/reagent/oil
|
||||
name = "oil bottle"
|
||||
@@ -278,8 +257,6 @@
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/traitor
|
||||
desc = "It has a small skull and crossbones on it. Uh-oh!"
|
||||
possible_transfer_amounts = list(5,10,15,25,30,40)
|
||||
volume = 40
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -288,162 +265,135 @@
|
||||
/obj/item/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."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("plasma_dust" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/diphenhydramine
|
||||
name = "diphenhydramine bottle"
|
||||
desc = "A small bottle of diphenhydramine."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("diphenhydramine" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/oculine
|
||||
name = "oculine bottle"
|
||||
desc = "A small bottle of combined eye and ear medication."
|
||||
icon_state = "round_bottle"
|
||||
list_reagents = list("oculine" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/potassium_iodide
|
||||
name = "potassium iodide bottle"
|
||||
desc = "A small bottle of potassium iodide."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("potass_iodide" = 30)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/flu_virion
|
||||
name = "Flu virion culture bottle"
|
||||
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/flu
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/epiglottis_virion
|
||||
name = "Epiglottis virion culture bottle"
|
||||
desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/voice_change
|
||||
|
||||
/obj/item/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."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/heal
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/hullucigen_virion
|
||||
name = "Hullucigen virion culture bottle"
|
||||
desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/hullucigen
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/pierrot_throat
|
||||
name = "Pierrot's Throat culture bottle"
|
||||
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/pierrot_throat
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/cold
|
||||
name = "Rhinovirus culture bottle"
|
||||
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/cold
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/retrovirus
|
||||
name = "Retrovirus culture bottle"
|
||||
desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/dna_retrovirus
|
||||
|
||||
/obj/item/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
|
||||
icon_state = "round_bottle"
|
||||
amount_per_transfer_from_this = 5
|
||||
spawned_disease = /datum/disease/gbs
|
||||
|
||||
/obj/item/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
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/fake_gbs
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/brainrot
|
||||
name = "Brainrot culture bottle"
|
||||
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/brainrot
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/magnitis
|
||||
name = "Magnitis culture bottle"
|
||||
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/magnitis
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/wizarditis
|
||||
name = "Wizarditis culture bottle"
|
||||
desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/wizarditis
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/anxiety
|
||||
name = "Severe Anxiety culture bottle"
|
||||
desc = "A small bottle. Contains a sample of Lepidopticides."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/anxiety
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/beesease
|
||||
name = "Beesease culture bottle"
|
||||
desc = "A small bottle. Contains a sample of invasive Apidae."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/beesease
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/fluspanish
|
||||
name = "Spanish flu culture bottle"
|
||||
desc = "A small bottle. Contains a sample of Inquisitius."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/fluspanish
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/tuberculosis
|
||||
name = "Fungal Tuberculosis culture bottle"
|
||||
desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/tuberculosis
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/regeneration
|
||||
name = "Regeneration culture bottle"
|
||||
desc = "A small bottle. Contains a sample of a virus that heals toxin damage."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/heal
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/sensory_restoration
|
||||
name = "Sensory Restoration culture bottle"
|
||||
desc = "A small bottle. Contains a sample of a virus that heals sensory damage."
|
||||
icon_state = "round_bottle"
|
||||
spawned_disease = /datum/disease/advance/sensory_restoration
|
||||
|
||||
/obj/item/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)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/zombiecure1
|
||||
name = "\improper Anti-Plague Sequence Alpha bottle"
|
||||
desc = "A small bottle containing 50 units of Anti-Plague Sequence Alpha. Prevents infection, cures level 1 infection."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("zombiecure1" = 50)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/zombiecure2
|
||||
name = "\improper Anti-Plague Sequence Beta bottle"
|
||||
desc = "A small bottle containing 50 units of Anti-Plague Sequence Beta. Weakens zombies, heals low infections."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("zombiecure2" = 50)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/zombiecure3
|
||||
name = "\improper Anti-Plague Sequence Gamma bottle"
|
||||
desc = "A small bottle containing 50 units of Anti-Plague Sequence Gamma. Lowers zombies healing. Heals stage 5 and slows stage 6 infections."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("zombiecure3" = 50)
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/zombiecure4
|
||||
name = "\improper Anti-Plague Sequence Omega bottle"
|
||||
desc = "A small bottle containing 50 units of Anti-Plague Sequence Omega. Cures all cases of the Necrotizing Plague. Also heals dead limbs."
|
||||
icon_state = "wide_bottle"
|
||||
list_reagents = list("zombiecure4" = 50)
|
||||
|
||||
@@ -140,23 +140,21 @@
|
||||
/obj/item/reagent_containers/glass/beaker/update_overlays()
|
||||
. = ..()
|
||||
if(reagents.total_volume)
|
||||
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
|
||||
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
|
||||
|
||||
var/percent = round((reagents.total_volume / volume) * 100)
|
||||
switch(percent)
|
||||
if(0 to 9)
|
||||
filling.icon_state = "[icon_state]-10"
|
||||
if(10 to 24)
|
||||
filling.icon_state = "[icon_state]10"
|
||||
if(25 to 49)
|
||||
filling.icon_state = "[icon_state]25"
|
||||
if(50 to 74)
|
||||
filling.icon_state = "[icon_state]50"
|
||||
if(75 to 79)
|
||||
filling.icon_state = "[icon_state]75"
|
||||
if(80 to 90)
|
||||
if(1 to 19)
|
||||
filling.icon_state = "[icon_state]1"
|
||||
if(20 to 39)
|
||||
filling.icon_state = "[icon_state]20"
|
||||
if(40 to 59)
|
||||
filling.icon_state = "[icon_state]40"
|
||||
if(60 to 79)
|
||||
filling.icon_state = "[icon_state]60"
|
||||
if(80 to 99)
|
||||
filling.icon_state = "[icon_state]80"
|
||||
if(91 to INFINITY)
|
||||
if(100 to INFINITY)
|
||||
filling.icon_state = "[icon_state]100"
|
||||
|
||||
filling.icon += mix_color_from_reagents(reagents.reagent_list)
|
||||
|
||||
Reference in New Issue
Block a user