[READY]Refactors reagent container types

code/game/objects/structures/mop_bucket.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mopbucket"
 	density = TRUE
+<<<<<<< HEAD
 	container_type = OPENCONTAINER_1
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
@@ -21,4 +22,23 @@
 			to_chat(user, "<span class='notice'>You wet [I] in [src].</span>")
 			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 	else
+=======
+	container_type = OPENCONTAINER
+	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+
+
+/obj/structure/mopbucket/New()
+	create_reagents(100)
+	..()
+
+/obj/structure/mopbucket/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/mop))
+		if(reagents.total_volume < 1)
+			to_chat(user, "[src] is out of water!</span>")
+		else
+			reagents.trans_to(I, 5)
+			to_chat(user, "<span class='notice'>You wet [I] in [src].</span>")
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+	else
+>>>>>>> 40699a8... [READY]Refactors reagent container types (#33470)
 		return ..()