New sprice

_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" = (

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

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

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'

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
 

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()

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

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(

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

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

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)
 	. = ..()
-	. += "<span class='notice'>There's a <b>small screw</b> that can <b>help</b> to adjust the pill size.</span>"
-	. += "<span class='notice'>There's a small dial you could <b>push</b> with a <b>screwdriver</b> to adjust the pill color.</span>"
+	. += span_notice("There's a <b>small screw</b> that can <b>help</b> to adjust the pill size.")
+	. += span_notice("There's a small dial you could <b>push</b> with a <b>screwdriver</b> to adjust the pill color.")
 	if(!bottle)
-		. += "<span class='notice'>The <b>pill bottle</b> slot is empty.</span>"
+		. += span_notice("The <b>pill bottle</b> slot is empty.")
 	if(!beaker)
-		. += "<span class='notice'>The <b>beaker</b> slot is empty.</span>"
+		. += span_notice("The <b>beaker</b> slot is empty.")
 
 /obj/machinery/chem_press/attack_hand(mob/user)
 	. = ..()

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

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

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

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

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)

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

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.

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

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'

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)

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()

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'

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'