[MIRROR] Gives Omega soap 800 uses instead of 301 [MDB IGNORE] (#11444)

* Gives Omega soap 800 uses instead of 301

* Fixing dem conflicts yo

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

code/game/objects/items/clown_items.dm

@@ -24,7 +24,7 @@
 	throw_speed = 3
 	throw_range = 7
 	grind_results = list(/datum/reagent/lye = 10)
-	var/cleanspeed = 35 //slower than mop
+	var/cleanspeed = 3.5 SECONDS //slower than mop
 	force_string = "robust... against germs"
 	var/uses = 100
 
@@ -51,34 +51,38 @@
 				msg = "It's seen some light use, but it's still pretty fresh."
 	. += span_notice("[msg]")
 
+/obj/item/soap/homemade
+	desc = "A homemade bar of soap. Smells of... well...."
+	grind_results = list(/datum/reagent/liquidgibs = 9, /datum/reagent/lye = 9)
+	icon_state = "soapgibs"
+	cleanspeed = 3 SECONDS // faster than base soap to reward chemists for going to the effort
+
 /obj/item/soap/nanotrasen
 	desc = "A heavy duty bar of Nanotrasen brand soap. Smells of plasma."
 	grind_results = list(/datum/reagent/toxin/plasma = 10, /datum/reagent/lye = 10)
 	icon_state = "soapnt"
-	cleanspeed = 28 //janitor gets this
+	cleanspeed = 2.8 SECONDS //janitor gets this
 	uses = 300
 
-/obj/item/soap/homemade
-	desc = "A homemade bar of soap. Smells of... well...."
-	icon_state = "soapgibs"
-	cleanspeed = 30 // faster to reward chemists for going to the effort
-
 /obj/item/soap/deluxe
 	desc = "A deluxe Waffle Co. brand bar of soap. Smells of high-class luxury."
+	grind_results = list(/datum/reagent/consumable/aloejuice = 10, /datum/reagent/lye = 10)
 	icon_state = "soapdeluxe"
-	cleanspeed = 20 //captain gets one of these
+	cleanspeed = 2 SECONDS //captain gets one of these
 
 /obj/item/soap/syndie
 	desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster."
+	grind_results = list(/datum/reagent/toxin/acid = 10, /datum/reagent/lye = 10)
 	icon_state = "soapsyndie"
-	cleanspeed = 5 //faster than mop so it is useful for traitors who want to clean crime scenes
+	cleanspeed = 0.5 SECONDS //faster than mops so it's useful for traitors who want to clean crime scenes
 
 /obj/item/soap/omega
-	name = "omega soap"
-	desc = "The most advanced soap known to mankind."
+	name = "\improper Omega soap"
+	desc = "The most advanced soap known to mankind. The beginning of the end for germs."
+	grind_results = list(/datum/reagent/consumable/potato_juice = 9, /datum/reagent/consumable/ethanol/lizardwine = 9, /datum/reagent/monkey_powder = 9, /datum/reagent/drug/krokodil = 9, /datum/reagent/toxin/acid/nitracid = 9, /datum/reagent/baldium = 9, /datum/reagent/consumable/ethanol/hooch = 9, /datum/reagent/bluespace = 9, /datum/reagent/drug/pumpup = 9, /datum/reagent/consumable/space_cola = 9)
 	icon_state = "soapomega"
-	cleanspeed = 3 //Only the truest of mind soul and body get one of these
-	uses = 301
+	cleanspeed = 0.3 SECONDS //Only the truest of mind soul and body get one of these
+	uses = 800 //In the Greek numeric system, Omega has a value of 800
 
 /obj/item/soap/omega/suicide_act(mob/user)
 	user.visible_message(span_suicide("[user] is using [src] to scrub themselves from the timeline! It looks like [user.p_theyre()] trying to commit suicide!"))

code/game/objects/items/mop.dm

@@ -14,14 +14,15 @@
 	attack_verb_simple = list("mop", "bash", "bludgeon", "whack")
 	resistance_flags = FLAMMABLE
 	var/mopcount = 0
-	var/mopcap = 50 //SKYRAT EDIT CHANGE
-	var/mopspeed = 15
+	///Maximum volume of reagents it can hold.
+	var/max_reagent_volume = 50 // SKYRAT EDIT - ORIGINAL: 15
+	var/mopspeed = 1.5 SECONDS
 	force_string = "robust... against germs"
 	var/insertable = TRUE
 
 /obj/item/mop/Initialize(mapload)
 	. = ..()
-	create_reagents(mopcap)
+	create_reagents(max_reagent_volume)
 	//SKYRAT EDIT ADDITION
 	AddElement(/datum/element/liquids_interaction, on_interaction_callback = /obj/item/mop/.proc/attack_on_liquids_turf)
 
@@ -98,7 +99,7 @@
 /obj/item/mop/advanced
 	desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this! Due to the self-wetting technology, it proves very inefficient for cleaning up spills." //SKYRAT EDIT
 	name = "advanced mop"
-	mopcap = 100 //SKYRAT EDIT CHANGE
+	max_reagent_volume = 100 // SKYRAT EDIT - ORIGINAL: 10
 	icon_state = "advmop"
 	inhand_icon_state = "mop"
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
@@ -106,7 +107,7 @@
 	force = 12
 	throwforce = 14
 	throw_range = 4
-	mopspeed = 8
+	mopspeed = 0.8 SECONDS
 	var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water.
 	/// Amount of reagent to refill per second
 	var/refill_rate = 0.5
@@ -126,7 +127,7 @@
 	playsound(user, 'sound/machines/click.ogg', 30, TRUE)
 
 /obj/item/mop/advanced/process(delta_time)
-	var/amadd = min(mopcap - reagents.total_volume, refill_rate * delta_time)
+	var/amadd = min(max_reagent_volume - reagents.total_volume, refill_rate * delta_time)
 	if(amadd > 0)
 		reagents.add_reagent(refill_reagent, amadd)
 

code/game/objects/structures/janicart.dm

@@ -26,7 +26,7 @@
 		return FALSE
 	else
 		var/obj/item/mop/M = mop
-		reagents.trans_to(mop, M.mopcap, transfered_by = user)
+		reagents.trans_to(mop, M.max_reagent_volume, transfered_by = user)
 		to_chat(user, span_notice("You wet [mop] in [src]."))
 		playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
 		return TRUE