diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 5878f667db1e..5750c10d98ae 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -6100,10 +6100,6 @@
/obj/machinery/camera/autoname{
dir = 6
},
-/obj/item/reagent_containers/spray/syndicate{
- pixel_y = 11;
- pixel_x = -2
- },
/turf/open/floor/wood/walnut,
/area/ship/crew/janitor)
"IE" = (
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 6a36a0ee01d6..17e3fc0116b8 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -306,8 +306,8 @@
mechsyringe.forceMove(get_turf(chassis))
reagents.trans_to(mechsyringe, min(mechsyringe.volume, reagents.total_volume), transfered_by = chassis.occupant)
syringes -= mechsyringe
- mechsyringe.icon = 'icons/obj/chemical.dmi'
- mechsyringe.icon_state = "syringeproj"
+ mechsyringe.icon = 'icons/obj/chemical/misc.dmi'
+ mechsyringe.icon_state = "potgreen"
playsound(chassis, 'sound/items/syringeproj.ogg', 50, TRUE)
log_message("Launched [mechsyringe] from [src], targeting [target].", LOG_MECHA)
var/mob/originaloccupant = chassis.occupant
diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
index fa777fec1124..1964e2dbd04a 100644
--- a/code/game/objects/items/devices/portable_chem_mixer.dm
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -1,7 +1,7 @@
/obj/item/storage/portable_chem_mixer
name = "Portable Chemical Mixer"
desc = "A portable device that dispenses and mixes chemicals. Can be upgraded to hold more beakers by inserting a vortex anomaly core. All necessary reagents need to be supplied with beakers. A label indicates that a screwdriver is required to open it for refills. This device can be worn on a belt. The letters 'S&T' are imprinted on the side."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "portablechemicalmixer_open"
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BELT
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 4505f596907f..bac896c0b8d5 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -306,7 +306,7 @@
name = "pill bottle"
desc = "It's an airtight container for storing medication."
icon_state = "pill_canister"
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/medicine.dmi'
item_state = "contsolid"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 537afd8d4ff5..4b4ca9bd96ec 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -292,7 +292,7 @@
/obj/item/antag_spawner/syndi_borer
name = "syndicate brain-slug container"
desc = "Releases a modified cortical borer to assist the user."
- icon = 'icons/obj/chemical.dmi' //Temporary? //The most permanent type of solution lol
+ icon = 'icons/obj/chemical/hypovial.dmi'
icon_state = "hypoviallarge-b"
var/polling = FALSE
diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm
index d4af47670412..511bbbec1fd5 100644
--- a/code/modules/antagonists/borer/borer.dm
+++ b/code/modules/antagonists/borer/borer.dm
@@ -1053,7 +1053,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
/datum/action/innate/borer/make_chems
name = "Secrete Chemicals"
desc = "Push some chemicals into your host's bloodstream."
- icon_icon = 'icons/obj/chemical.dmi'
+ icon_icon = 'icons/obj/chemical/chem_machines.dmi'
button_icon_state = "minidispenser"
/datum/action/innate/borer/make_chems/Activate()
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 87736c3438e4..4e8f17cfc53a 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -1,7 +1,7 @@
/*********************Hivelord stabilizer****************/
/obj/item/hivelordstabilizer
name = "stabilizing serum"
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "bottle19"
desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 0985ce758976..290aec1f6c54 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -1,12 +1,12 @@
/proc/translate_legacy_chem_id(id)
- switch (id)
- if ("sacid")
+ switch(id)
+ if("sacid")
return "sulphuricacid"
- if ("facid")
+ if("facid")
return "fluorosulfuricacid"
- if ("co2")
+ if("co2")
return "carbondioxide"
- if ("mine_salve")
+ if("mine_salve")
return "minerssalve"
else
return ckey(id)
@@ -15,7 +15,7 @@
name = "chem dispenser"
desc = "Creates and dispenses chemicals."
density = TRUE
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "dispenser"
base_icon_state = "dispenser"
use_power = IDLE_POWER_USE
@@ -451,7 +451,7 @@
/obj/machinery/chem_dispenser/drinks
name = "soda dispenser"
desc = "Contains a large reservoir of soft drinks."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "soda_dispenser"
base_icon_state = "soda_dispenser"
has_panel_overlay = FALSE
@@ -509,7 +509,7 @@
name = "booze dispenser"
desc = "Contains a large reservoir of the good stuff."
base_icon_state = "booze_dispenser"
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "booze_dispenser"
circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer
dispensable_reagents = list(
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index b3a0cfee615d..e8892390e189 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -1,7 +1,7 @@
/obj/machinery/chem_heater
name = "chemical heater"
density = TRUE
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "mixer0b"
base_icon_state = "mixer"
use_power = IDLE_POWER_USE
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 602c37710a57..e53a7f20ae16 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -3,7 +3,7 @@
desc = "Used to separate chemicals and distribute them in a variety of forms."
density = TRUE
layer = BELOW_OBJ_LAYER
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "mixer0"
base_icon_state = "mixer"
use_power = IDLE_POWER_USE
diff --git a/code/modules/reagents/chemistry/machinery/chem_press.dm b/code/modules/reagents/chemistry/machinery/chem_press.dm
index 80500efc78bf..43cd01e63b65 100644
--- a/code/modules/reagents/chemistry/machinery/chem_press.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_press.dm
@@ -1,7 +1,7 @@
/obj/machinery/chem_press
name = "pill press"
desc = "A press operated by hand to produce pills in a variety of forms."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "press"
pass_flags = PASSTABLE
use_power = FALSE
@@ -26,17 +26,17 @@
/obj/machinery/chem_press/Initialize()
. = ..()
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
- beaker_overlay = image(icon = 'icons/obj/chemical.dmi', icon_state = "press_beaker")
- bottle_overlay = image(icon = 'icons/obj/chemical.dmi', icon_state = "press_bottle")
+ beaker_overlay = image(icon = 'icons/obj/chemical/chem_machines.dmi', icon_state = "press_beaker")
+ bottle_overlay = image(icon = 'icons/obj/chemical/chem_machines.dmi', icon_state = "press_bottle") //shouldn't this use mutable_appearance...?
/obj/machinery/chem_press/examine(mob/user)
. = ..()
- . += "There's a small screw that can help to adjust the pill size."
- . += "There's a small dial you could push with a screwdriver to adjust the pill color."
+ . += span_notice("There's a small screw that can help to adjust the pill size.")
+ . += span_notice("There's a small dial you could push with a screwdriver to adjust the pill color.")
if(!bottle)
- . += "The pill bottle slot is empty."
+ . += span_notice("The pill bottle slot is empty.")
if(!beaker)
- . += "The beaker slot is empty."
+ . += span_notice("The beaker slot is empty.")
/obj/machinery/chem_press/attack_hand(mob/user)
. = ..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 2c6f5ed38186..7b5656521209 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -1,7 +1,7 @@
/obj/machinery/chem_dispenser/chem_synthesizer //formerly SCP-294 made by mrty, but now only for testing purposes
name = "\improper debug chemical synthesizer"
desc = "If you see this, yell at adminbus."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "dispenser"
base_icon_state = "dispenser"
amount = 10
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 1fefd1d55031..65bcf56ef25c 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -5,7 +5,7 @@
name = "PanD.E.M.I.C 2200"
desc = "Used to work with viruses."
density = TRUE
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "pandemic0"
base_icon_state = "pandemic"
use_power = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 7c67609593d5..e93e6f3117ca 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -3,7 +3,7 @@
/obj/machinery/smoke_machine
name = "smoke machine"
desc = "A machine with a centrifuge installed into it. It produces smoke with any reagents you put into the machine."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/chem_machines.dmi'
icon_state = "smoke0"
base_icon_state = "smoke"
density = TRUE
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index d63debc16e41..bfecd046f977 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers
name = "Container"
desc = "..."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/beakers.dmi'
icon_state = null
w_class = WEIGHT_CLASS_TINY
var/amount_per_transfer_from_this = 5
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 63acf014b214..248586792679 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/dropper
name = "dropper"
desc = "A dropper. Holds up to 5 units."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/beakers.dmi'
icon_state = "dropper0"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1, 2, 3, 4, 5)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 6682a9ba7943..58e46dcb1048 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -118,7 +118,7 @@
/obj/item/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. It can hold up to 50 units."
- icon = 'icons/obj/chemical.dmi' //Should I modularize this? Yes. Will I do it?
+ icon = 'icons/obj/chemical/beakers.dmi'
icon_state = "beaker"
item_state = "beaker"
custom_materials = list(/datum/material/glass=500)
@@ -296,7 +296,6 @@
/obj/item/reagent_containers/glass/filter
name = "seperatory funnel"
desc = "A crude tool created by welding several beakers together. It would probably be useful for seperating reagents."
- icon = 'icons/obj/chemical.dmi'
icon_state = "beakerfilter"
item_state = "beaker"
volume = 100
diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm
index f16984cd7e5b..7696bf0d950a 100644
--- a/code/modules/reagents/reagent_containers/hypovial.dm
+++ b/code/modules/reagents/reagent_containers/hypovial.dm
@@ -2,7 +2,7 @@
/obj/item/reagent_containers/glass/bottle/vial
name = "broken hypovial"
desc = "A hypovial compatible with most hyposprays."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/hypovial.dmi'
icon_state = "hypovial"
spillable = FALSE
var/comes_with = list() //Easy way of doing this.
diff --git a/code/modules/reagents/reagent_containers/jug.dm b/code/modules/reagents/reagent_containers/jug.dm
index a863be707c48..80ebcbb4d5b3 100644
--- a/code/modules/reagents/reagent_containers/jug.dm
+++ b/code/modules/reagents/reagent_containers/jug.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/glass/chem_jug
name = "chemical jug"
desc = "A large jug used for storing bulk ammounts chemicals. Provided with a tamper seal which ensures that the contents are pure"
- icon = 'icons/obj/chem_jug.dmi'
+ icon = 'icons/obj/chemical/chem_jug.dmi'
icon_state = "chem_jug"
item_state = "sheet-plastic"
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm
index 7542f606a899..193d588bcbb5 100644
--- a/code/modules/reagents/reagent_containers/medigel.dm
+++ b/code/modules/reagents/reagent_containers/medigel.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/medigel
name = "medical gel"
desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "medigel"
item_state = "spraycan"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
diff --git a/code/modules/reagents/reagent_containers/mortar.dm b/code/modules/reagents/reagent_containers/mortar.dm
index 3c1443bfb9d2..c139a0b6fb09 100644
--- a/code/modules/reagents/reagent_containers/mortar.dm
+++ b/code/modules/reagents/reagent_containers/mortar.dm
@@ -10,14 +10,14 @@ to accommodate additional materials.
name = "pestle"
desc = "An ancient, simple tool used in conjunction with a mortar to grind or juice items."
w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/mortar.dmi'
icon_state = "pestle"
force = 7
/obj/item/reagent_containers/glass/mortar
name = "mortar"
desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/mortar.dmi'
icon_state = "mortar_wood"
fill_icon_state = "mortar"
fill_icon_thresholds = list(1, 20, 40, 80, 100)
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index c8187cd8843d..d244b05f55d3 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/pill/patch
name = "chemical patch"
desc = "A chemical patch for touch based applications."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "bandaid"
item_state = "bandaid"
possible_transfer_amounts = list()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 85853ba5096b..77b8bc8f318c 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/pill
name = "pill"
desc = "A tablet or capsule."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "pill"
item_state = "pill"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 8be0bea8a313..05f68682083c 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -213,16 +213,6 @@
/obj/item/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays
return
-///Subtype used for the lavaland clown ruin.
-/obj/item/reagent_containers/spray/waterflower/superlube
- name = "clown flower"
- desc = "A delightly devilish flower... you got a feeling where this is going."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "clownflower"
- amount_per_transfer_from_this = 3 // WS edit - superlube fix
- volume = 30
- list_reagents = list(/datum/reagent/lube/superlube = 30)
-
/obj/item/reagent_containers/spray/waterflower/cyborg
reagent_flags = NONE
volume = 100
@@ -345,26 +335,9 @@
volume = 100
list_reagents = list(/datum/reagent/toxin/plantbgone = 100)
-/obj/item/reagent_containers/spray/syndicate
- name = "suspicious spray bottle"
- desc = "A spray bottle, with a high performance plastic nozzle. The color scheme makes you feel slightly uneasy."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "sprayer_sus_8"
- item_state = "sprayer_sus"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- spray_range = 4
- stream_range = 2
- volume = 100
- custom_premium_price = 900
-
-/obj/item/reagent_containers/spray/syndicate/Initialize()
- . = ..()
- icon_state = pick("sprayer_sus_1", "sprayer_sus_2", "sprayer_sus_3", "sprayer_sus_4", "sprayer_sus_5","sprayer_sus_6", "sprayer_sus_7", "sprayer_sus_8")
-
/obj/item/reagent_containers/spray/medical
name = "medical spray bottle"
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "sprayer_med_red"
item_state = "sprayer_med_red"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm
index 1fb17ea4d1fd..fc9d9ef06c6a 100644
--- a/code/modules/research/xenobiology/crossbreeding/_potions.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm
@@ -8,7 +8,7 @@ Slimecrossing Potions
/obj/item/slimepotion/extract_cloner
name = "extract cloning potion"
desc = "An more powerful version of the extract enhancer potion, capable of cloning regular slime extracts."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potpurple"
/obj/item/slimepotion/extract_cloner/afterattack(obj/item/target, mob/user , proximity)
@@ -36,7 +36,7 @@ Slimecrossing Potions
/obj/item/slimepotion/peacepotion
name = "pacification potion"
desc = "A light pink solution of chemicals, smelling like liquid peace. And mercury salts."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potlightpink"
/obj/item/slimepotion/peacepotion/attack(mob/living/M, mob/user)
@@ -70,7 +70,7 @@ Slimecrossing Potions
/obj/item/slimepotion/lovepotion
name = "love potion"
desc = "A pink chemical mix thought to inspire feelings of love."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potpink"
/obj/item/slimepotion/lovepotion/attack(mob/living/M, mob/user)
@@ -104,7 +104,7 @@ Slimecrossing Potions
/obj/item/slimepotion/spaceproof
name = "slime pressurization potion"
desc = "A potent chemical sealant that will render any article of clothing airtight. Has two uses."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potblue"
var/uses = 2
@@ -136,14 +136,14 @@ Slimecrossing Potions
/obj/item/slimepotion/enhancer/max
name = "extract maximizer"
desc = "An extremely potent chemical mix that will maximize a slime extract's uses."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potpurple"
//Lavaproofing potion - Charged Red
/obj/item/slimepotion/lavaproof
name = "slime lavaproofing potion"
desc = "A strange, reddish goo said to repel lava as if it were water, without reducing flammability. Has two uses."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potred"
resistance_flags = LAVA_PROOF | FIRE_PROOF
var/uses = 2
@@ -174,7 +174,7 @@ Slimecrossing Potions
/obj/item/slimepotion/slime_reviver
name = "slime revival potion"
desc = "Infused with plasma and compressed gel, this brings dead slimes back to life."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potsilver"
/obj/item/slimepotion/slime_reviver/attack(mob/living/simple_animal/slime/M, mob/user)
@@ -198,7 +198,7 @@ Slimecrossing Potions
/obj/item/slimepotion/slime/chargedstabilizer
name = "slime omnistabilizer"
desc = "An extremely potent chemical mix that will stop a slime from mutating completely."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potcyan"
/obj/item/slimepotion/slime/chargedstabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 113f130562de..c907f11c1cfa 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -664,7 +664,7 @@
/obj/item/slimepotion/slime/docility
name = "docility potion"
desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potsilver"
/obj/item/slimepotion/slime/docility/attack(mob/living/simple_animal/slime/M, mob/user)
@@ -695,7 +695,7 @@
/obj/item/slimepotion/slime/sentience
name = "intelligence potion"
desc = "A miraculous chemical mix that grants human like intelligence to living beings."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potpink"
var/list/not_interested = list()
var/being_used = FALSE
@@ -754,7 +754,7 @@
/obj/item/slimepotion/transference
name = "consciousness transference potion"
desc = "A strange slime-based chemical that, when used, allows the user to transfer their consciousness to a lesser being."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potorange"
var/prompted = 0
var/animal_type = SENTIENCE_ORGANIC
@@ -802,7 +802,7 @@
/obj/item/slimepotion/slime/steroid
name = "slime steroid"
desc = "A potent chemical mix that will cause a baby slime to generate more extract."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potred"
/obj/item/slimepotion/slime/steroid/attack(mob/living/simple_animal/slime/M, mob/user)
@@ -826,13 +826,13 @@
/obj/item/slimepotion/enhancer
name = "extract enhancer"
desc = "A potent chemical mix that will give a slime extract an additional use."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potpurple"
/obj/item/slimepotion/slime/stabilizer
name = "slime stabilizer"
desc = "A potent chemical mix that will reduce the chance of a slime mutating."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potcyan"
/obj/item/slimepotion/slime/stabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
@@ -853,7 +853,7 @@
/obj/item/slimepotion/slime/mutator
name = "slime mutator"
desc = "A potent chemical mix that will increase the chance of a slime mutating."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potgreen"
/obj/item/slimepotion/slime/mutator/attack(mob/living/simple_animal/slime/M, mob/user)
@@ -878,7 +878,7 @@
/obj/item/slimepotion/speed
name = "slime speed potion"
desc = "A potent chemical mix that will reduce the slowdown from any item."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potyellow"
/obj/item/slimepotion/speed/afterattack(obj/C, mob/user, proximity)
@@ -913,7 +913,7 @@
/obj/item/slimepotion/fireproof
name = "slime chill potion"
desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potblue"
resistance_flags = FIRE_PROOF
var/uses = 3
@@ -945,7 +945,7 @@
/obj/item/slimepotion/genderchange
name = "gender change potion"
desc = "An interesting chemical mix that changes the biological gender of what its applied to. Cannot be used on things that lack gender entirely."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potlightpink"
/obj/item/slimepotion/genderchange/attack(mob/living/L, mob/user)
@@ -969,7 +969,7 @@
/obj/item/slimepotion/slime/renaming
name = "renaming potion"
desc = "A potion that allows a self-aware being to change what name it subconciously presents to the world."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potgreen"
var/being_used = FALSE
@@ -1002,7 +1002,7 @@
/obj/item/slimepotion/slime/slimeradio
name = "bluespace radio potion"
desc = "A strange chemical that grants those who ingest it the ability to broadcast and receive subscape radio waves."
- icon = 'icons/obj/chemical.dmi'
+ icon = 'icons/obj/chemical/misc.dmi'
icon_state = "potgrey"
/obj/item/slimepotion/slime/slimeradio/attack(mob/living/M, mob/user)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 933c54f64602..acc26ebe4ee9 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -417,7 +417,6 @@
/obj/item/storage/backpack/satchel/chem = 2,
/obj/item/clothing/accessory/armband/engine = 4,
/obj/item/storage/bag/chemistry = 2)
- contraband = list(/obj/item/reagent_containers/spray/syndicate = 2)
refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
/obj/item/vending_refill/wardrobe/chem_wardrobe
machine_name = "ChemDrobe"
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
deleted file mode 100644
index 2dd57cfc6237..000000000000
Binary files a/icons/obj/chemical.dmi and /dev/null differ
diff --git a/icons/obj/chemical/beakers.dmi b/icons/obj/chemical/beakers.dmi
new file mode 100644
index 000000000000..db43d392960d
Binary files /dev/null and b/icons/obj/chemical/beakers.dmi differ
diff --git a/icons/obj/Chem_jug.dmi b/icons/obj/chemical/chem_jug.dmi
similarity index 100%
rename from icons/obj/Chem_jug.dmi
rename to icons/obj/chemical/chem_jug.dmi
diff --git a/icons/obj/chemical/chem_machines.dmi b/icons/obj/chemical/chem_machines.dmi
new file mode 100644
index 000000000000..09e41e9f6ac4
Binary files /dev/null and b/icons/obj/chemical/chem_machines.dmi differ
diff --git a/icons/obj/chemical/grenade.dmi b/icons/obj/chemical/grenade.dmi
new file mode 100644
index 000000000000..af748c687089
Binary files /dev/null and b/icons/obj/chemical/grenade.dmi differ
diff --git a/icons/obj/chemical/hypovial.dmi b/icons/obj/chemical/hypovial.dmi
new file mode 100644
index 000000000000..608af9f77bb3
Binary files /dev/null and b/icons/obj/chemical/hypovial.dmi differ
diff --git a/icons/obj/chemical/medicine.dmi b/icons/obj/chemical/medicine.dmi
new file mode 100644
index 000000000000..34b332d0178f
Binary files /dev/null and b/icons/obj/chemical/medicine.dmi differ
diff --git a/icons/obj/chemical/misc.dmi b/icons/obj/chemical/misc.dmi
new file mode 100644
index 000000000000..4afacabfe286
Binary files /dev/null and b/icons/obj/chemical/misc.dmi differ
diff --git a/icons/obj/chemical/mortar.dmi b/icons/obj/chemical/mortar.dmi
new file mode 100644
index 000000000000..e47543454f9d
Binary files /dev/null and b/icons/obj/chemical/mortar.dmi differ
diff --git a/icons/obj/flora/snowflora.dmi b/icons/obj/flora/snowflora.dmi
index 002fd90c9fcd..74a1f6dabaf0 100644
Binary files a/icons/obj/flora/snowflora.dmi and b/icons/obj/flora/snowflora.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 40e1dfbabdd3..7c31b8ac45f9 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/machines/suit_storage.dmi b/icons/obj/machines/suit_storage.dmi
index cf0edd2e8fdc..a40d04f500c6 100644
Binary files a/icons/obj/machines/suit_storage.dmi and b/icons/obj/machines/suit_storage.dmi differ