Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

code/__HELPERS/unsorted.dm

@@ -542,57 +542,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	return key_name(whom, 1, include_name)
 
 
-// Registers the on-close verb for a browse window (client/verb/.windowclose)
-// this will be called when the close-button of a window is pressed.
-//
-// This is usually only needed for devices that regularly update the browse window,
-// e.g. canisters, timers, etc.
-//
-// windowid should be the specified window name
-// e.g. code is	: user << browse(text, "window=fred")
-// then use 	: onclose(user, "fred")
-//
-// Optionally, specify the "ref" parameter as the controlled atom (usually src)
-// to pass a "close=1" parameter to the atom's Topic() proc for special handling.
-// Otherwise, the user mob's machine var will be reset directly.
-//
-/proc/onclose(mob/user, windowid, var/atom/ref=null)
-	if(!user.client) return
-	var/param = "null"
-	if(ref)
-		param = "\ref[ref]"
-
-	winset(user, windowid, "on-close=\".windowclose [param]\"")
-
-	//world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]"
-
-
-// the on-close client verb
-// called when a browser popup window is closed after registering with proc/onclose()
-// if a valid atom reference is supplied, call the atom's Topic() with "close=1"
-// otherwise, just reset the client mob's machine var.
-//
-/client/verb/windowclose(var/atomref as text)
-	set hidden = 1						// hide this verb from the user's panel
-	set name = ".windowclose"			// no autocomplete on cmd line
-
-	//world << "windowclose: [atomref]"
-	if(atomref!="null")				// if passed a real atomref
-		var/hsrc = locate(atomref)	// find the reffed atom
-		var/href = "close=1"
-		if(hsrc)
-			//world << "[src] Topic [href] [hsrc]"
-			usr = src.mob
-			src.Topic(href, params2list(href), hsrc)	// this will direct to the atom's
-			return										// Topic() proc via client.Topic()
-
-	// no atomref specified (or not found)
-	// so just reset the user mob's machine var
-	if(src && src.mob)
-		//world << "[src] was [src.mob.machine], setting to null"
-		src.mob.unset_machine()
-	return
-
 //Will return the location of the turf an atom is ultimatly sitting on
 /proc/get_turf_loc(var/atom/movable/M) //gets the location of the turf that the atom is on, or what the atom is in is on, etc
 	//in case they're in a closet or sleeper or something
@@ -1423,3 +1372,6 @@ var/list/WALLITEMS = list(
 				if(O.pixel_x == 0 && O.pixel_y == 0)
 					return 1
 	return 0
+
+/proc/format_text(text)
+	return replacetext(replacetext(text,"\proper ",""),"\improper ","")

code/datums/browser.dm

@@ -0,0 +1,174 @@
+/datum/browser
+	var/mob/user
+	var/title
+	var/window_id // window_id is used as the window name for browse and onclose
+	var/width = 0
+	var/height = 0
+	var/atom/ref = null
+	var/window_options = "focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;" // window option is set using window_id
+	var/stylesheets[0]
+	var/scripts[0]
+	var/title_image
+	var/head_elements
+	var/body_elements
+	var/head_content = ""
+	var/content = ""
+
+
+/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null)
+
+	user = nuser
+	window_id = nwindow_id
+	if (ntitle)
+		title = format_text(ntitle)
+	if (nwidth)
+		width = nwidth
+	if (nheight)
+		height = nheight
+	if (nref)
+		ref = nref
+	add_stylesheet("common", 'html/browser/common.css') // this CSS sheet is common to all UIs
+
+/datum/browser/proc/add_head_content(nhead_content)
+	head_content = nhead_content
+
+/datum/browser/proc/set_window_options(nwindow_options)
+	window_options = nwindow_options
+
+/datum/browser/proc/set_title_image(ntitle_image)
+	//title_image = ntitle_image
+
+/datum/browser/proc/add_stylesheet(name, file)
+	stylesheets[name] = file
+
+/datum/browser/proc/add_script(name, file)
+	scripts[name] = file
+
+/datum/browser/proc/set_content(ncontent)
+	content = ncontent
+
+/datum/browser/proc/add_content(ncontent)
+	content += ncontent
+
+/datum/browser/proc/get_header()
+	var/key
+	var/filename
+	for (key in stylesheets)
+		filename = "[ckey(key)].css"
+		user << browse_rsc(stylesheets[key], filename)
+		head_content += "<link rel='stylesheet' type='text/css' href='[filename]'>"
+
+	for (key in scripts)
+		filename = "[ckey(key)].js"
+		user << browse_rsc(scripts[key], filename)
+		head_content += "<script type='text/javascript' src='[filename]'></script>"
+
+	var/title_attributes = "class='uiTitle'"
+	if (title_image)
+		title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'"
+
+	return {"<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+	<head>
+		[head_content]
+	</head>
+	<body scroll=auto>
+		<div class='uiWrapper'>
+			[title ? "<div class='uiTitleWrapper'><div [title_attributes]><tt>[title]</tt></div></div>" : ""]
+			<div class='uiContent'>
+	"}
+
+/datum/browser/proc/get_footer()
+	return {"
+			</div>
+		</div>
+	</body>
+</html>"}
+
+/datum/browser/proc/get_content()
+	return {"
+	[get_header()]
+	[content]
+	[get_footer()]
+	"}
+
+/datum/browser/proc/open(var/use_onclose = 1)
+	var/window_size = ""
+	if (width && height)
+		window_size = "size=[width]x[height];"
+	user << browse(get_content(), "window=[window_id];[window_size][window_options]")
+	if (use_onclose)
+		onclose(user, window_id, ref)
+
+/datum/browser/proc/close()
+	user << browse(null, "window=[window_id]")
+
+// This will allow you to show an icon in the browse window
+// This is added to mob so that it can be used without a reference to the browser object
+// There is probably a better place for this...
+/mob/proc/browse_rsc_icon(icon, icon_state, dir = -1)
+	/*
+	var/icon/I
+	if (dir >= 0)
+		I = new /icon(icon, icon_state, dir)
+	else
+		I = new /icon(icon, icon_state)
+		dir = "default"
+
+	var/filename = "[ckey("[icon]_[icon_state]_[dir]")].png"
+	src << browse_rsc(I, filename)
+	return filename
+	*/
+
+
+// Registers the on-close verb for a browse window (client/verb/.windowclose)
+// this will be called when the close-button of a window is pressed.
+//
+// This is usually only needed for devices that regularly update the browse window,
+// e.g. canisters, timers, etc.
+//
+// windowid should be the specified window name
+// e.g. code is	: user << browse(text, "window=fred")
+// then use 	: onclose(user, "fred")
+//
+// Optionally, specify the "ref" parameter as the controlled atom (usually src)
+// to pass a "close=1" parameter to the atom's Topic() proc for special handling.
+// Otherwise, the user mob's machine var will be reset directly.
+//
+/proc/onclose(mob/user, windowid, var/atom/ref=null)
+	if(!user.client) return
+	var/param = "null"
+	if(ref)
+		param = "\ref[ref]"
+
+	winset(user, windowid, "on-close=\".windowclose [param]\"")
+
+	//world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]"
+
+
+// the on-close client verb
+// called when a browser popup window is closed after registering with proc/onclose()
+// if a valid atom reference is supplied, call the atom's Topic() with "close=1"
+// otherwise, just reset the client mob's machine var.
+//
+/client/verb/windowclose(var/atomref as text)
+	set hidden = 1						// hide this verb from the user's panel
+	set name = ".windowclose"			// no autocomplete on cmd line
+
+	//world << "windowclose: [atomref]"
+	if(atomref!="null")				// if passed a real atomref
+		var/hsrc = locate(atomref)	// find the reffed atom
+		var/href = "close=1"
+		if(hsrc)
+			//world << "[src] Topic [href] [hsrc]"
+			usr = src.mob
+			src.Topic(href, params2list(href), hsrc)	// this will direct to the atom's
+			return										// Topic() proc via client.Topic()
+
+	// no atomref specified (or not found)
+	// so just reset the user mob's machine var
+	if(src && src.mob)
+		//world << "[src] was [src.mob.machine], setting to null"
+		src.mob.unset_machine()
+	return

code/game/jobs/job/civilian.dm

@@ -292,7 +292,6 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		H.equip_to_slot_or_del(new /obj/item/key(H), slot_l_store)
 		return 1
 
 

code/game/objects/effects/decals/misc.dm

@@ -16,3 +16,9 @@
 	density = 0
 	anchored = 1
 	layer = 50
+
+//Used by spraybottles.
+/obj/effect/decal/chempuff
+	name = "chemicals"
+	icon = 'icons/obj/chempuff.dmi'
+	pass_flags = PASSTABLE | PASSGRILLE

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -245,7 +245,7 @@
 		icon_state = "grenade"
 
 /obj/item/weapon/grenade/chem_grenade/cleaner
-	name = "Cleaner Grenade"
+	name = "cleaner grenade"
 	desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
 	stage = 2
 	path = 1

code/game/objects/items/weapons/mop.dm

@@ -15,40 +15,34 @@
 
 
 /obj/item/weapon/mop/New()
-	var/datum/reagents/R = new/datum/reagents(5)
+	create_reagents(5)
-	reagents = R
-	R.my_atom = src
 
 
-obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
+obj/item/weapon/mop/proc/clean(turf/simulated/A)
-	reagents.reaction(A,1,10)
+	if(reagents.has_reagent("water", 1))
 		A.clean_blood()
 		for(var/obj/effect/O in A)
-		if( istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) )
+			if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
 				del(O)
+	reagents.reaction(A, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
+	reagents.remove_any(1)			//reaction() doesn't use up the reagents
 
 
-/obj/effect/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/mop/afterattack(atom/A, mob/user)
-	if(istype(W, /obj/item/weapon/mop))
+	if(istype(A, /turf/simulated) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
-		return
+		if(reagents.total_volume < 1)
-	..()
-
-
-/obj/item/weapon/mop/afterattack(atom/A, mob/user as mob)
-	if(reagents.total_volume < 1 || mopcount >= 5)
 			user << "<span class='notice'>Your mop is dry!</span>"
 			return
 
-	if(istype(A, /turf/simulated) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
 		user.visible_message("<span class='warning'>[user] begins to clean \the [get_turf(A)].</span>")
+
 		if(do_after(user, 40))
 			if(A)
 				clean(get_turf(A))
 			user << "<span class='notice'>You have finished mopping!</span>"
-			mopcount++
 
-	if(mopcount >= 5) //Okay this stuff is an ugly hack and i feel bad about it.
+
-		spawn(5)
+/obj/effect/attackby(obj/item/I, mob/user)
-			reagents.clear_reagents()
+	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
-			mopcount = 0
 		return
+	..()

code/game/objects/items/weapons/storage/bags.dm

@@ -28,7 +28,7 @@
 /obj/item/weapon/storage/bag/trash
 	name = "trash bag"
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
-	icon = 'icons/obj/trash.dmi'
+	icon = 'icons/obj/janitor.dmi'
 	icon_state = "trashbag0"
 	item_state = "trashbag"
 

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -44,18 +44,16 @@
 	sleep(2)
 	new /obj/item/clothing/under/rank/janitor(src)
 	new /obj/item/weapon/cartridge/janitor(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/clothing/shoes/galoshes(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/storage/bag/trash(src)
-	new /obj/item/device/lightreplacer(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/device/lightreplacer(src)
+	new /obj/item/weapon/storage/bag/trash(src)
+	new /obj/item/clothing/shoes/galoshes(src)
 
 /*
  * Lawyer

code/game/objects/structures/janicart.dm

@@ -1,3 +1,162 @@
+/obj/structure/janitorialcart
+	name = "janitorial cart"
+	desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!"
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "cart"
+	anchored = 0
+	density = 1
+	flags = OPENCONTAINER
+	//copypaste sorry
+	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+	var/obj/item/weapon/storage/bag/trash/mybag	= null
+	var/obj/item/weapon/mop/mymop = null
+	var/obj/item/weapon/reagent_containers/spray/myspray = null
+	var/obj/item/device/lightreplacer/myreplacer = null
+	var/signs = 0	//maximum capacity hardcoded below
+
+
+/obj/structure/janitorialcart/New()
+	create_reagents(100)
+
+
+/obj/structure/janitorialcart/examine()
+	set src in usr
+	usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of liquid!"
+	..()
+	//everything else is visible, so doesn't need to be mentioned
+
+
+/obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/storage/bag/trash) && !mybag)
+		user.drop_item()
+		mybag = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/mop))
+		if(I.reagents.total_volume < I.reagents.maximum_volume)	//if it's not completely soaked we assume they want to wet it, otherwise store it
+			if(reagents.total_volume < 1)
+				user << "[src] is out of water!</span>"
+			else
+				reagents.trans_to(I, 5)	//
+				user << "<span class='notice'>You wet [I] in [src].</span>"
+				playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+				return
+		if(!mymop)
+			user.drop_item()
+			mymop = I
+			I.loc = src
+			update_icon()
+			updateUsrDialog()
+			user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/reagent_containers/spray) && !myspray)
+		user.drop_item()
+		myspray = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/device/lightreplacer) && !myreplacer)
+		user.drop_item()
+		myreplacer = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/caution))
+		if(signs < 4)
+			user.drop_item()
+			I.loc = src
+			signs++
+			update_icon()
+			updateUsrDialog()
+			user << "<span class='notice'>You put [I] into [src].</span>"
+		else
+			user << "<span class='notice'>[src] can't hold any more signs.</span>"
+
+	else if(mybag)
+		mybag.attackby(I, user)
+
+
+/obj/structure/janitorialcart/attack_hand(mob/user)
+	user.set_machine(src)
+	var/dat
+	if(mybag)
+		dat += "<a href='?src=\ref[src];garbage=1'>[mybag.name]</a><br>"
+	if(mymop)
+		dat += "<a href='?src=\ref[src];mop=1'>[mymop.name]</a><br>"
+	if(myspray)
+		dat += "<a href='?src=\ref[src];spray=1'>[myspray.name]</a><br>"
+	if(myreplacer)
+		dat += "<a href='?src=\ref[src];replacer=1'>[myreplacer.name]</a><br>"
+	if(signs)
+		dat += "<a href='?src=\ref[src];sign=1'>[signs] sign\s</a><br>"
+	var/datum/browser/popup = new(user, "janicart", name, 240, 160)
+	popup.set_content(dat)
+	popup.open()
+
+
+/obj/structure/janitorialcart/Topic(href, href_list)
+	if(!in_range(src, usr))
+		return
+	if(!isliving(usr))
+		return
+	var/mob/living/user = usr
+	if(href_list["garbage"])
+		if(mybag)
+			user.put_in_hands(mybag)
+			user << "<span class='notice'>You take [mybag] from [src].</span>"
+			mybag = null
+	if(href_list["mop"])
+		if(mymop)
+			user.put_in_hands(mymop)
+			user << "<span class='notice'>You take [mymop] from [src].</span>"
+			mymop = null
+	if(href_list["spray"])
+		if(myspray)
+			user.put_in_hands(myspray)
+			user << "<span class='notice'>You take [myspray] from [src].</span>"
+			myspray = null
+	if(href_list["replacer"])
+		if(myreplacer)
+			user.put_in_hands(myreplacer)
+			user << "<span class='notice'>You take [myreplacer] from [src].</span>"
+			myreplacer = null
+	if(href_list["sign"])
+		if(signs)
+			var/obj/item/weapon/caution/Sign = locate() in src
+			if(Sign)
+				user.put_in_hands(Sign)
+				user << "<span class='notice'>You take \a [Sign] from [src].</span>"
+				signs--
+			else
+				warning("[src] signs ([signs]) didn't match contents")
+				signs = 0
+
+	update_icon()
+	updateUsrDialog()
+
+
+/obj/structure/janitorialcart/update_icon()
+	overlays = null
+	if(mybag)
+		overlays += "cart_garbage"
+	if(mymop)
+		overlays += "cart_mop"
+	if(myspray)
+		overlays += "cart_spray"
+	if(myreplacer)
+		overlays += "cart_replacer"
+	if(signs)
+		overlays += "cart_sign[signs]"
+
+
+//old style retardo-cart
 /obj/structure/stool/bed/chair/janicart
 	name = "janicart"
 	icon = 'icons/obj/vehicles.dmi'
@@ -8,36 +167,36 @@
 	//copypaste sorry
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 	var/obj/item/weapon/storage/bag/trash/mybag	= null
+	var/callme = "pimpin' ride"	//how do people refer to it?
+
 
 /obj/structure/stool/bed/chair/janicart/New()
 	handle_rotation()
-
+	create_reagents(100)
-	var/datum/reagents/R = new/datum/reagents(100)
-	reagents = R
-	R.my_atom = src
 
 
 /obj/structure/stool/bed/chair/janicart/examine()
 	set src in usr
-	usr << "\icon[src] This pimpin' ride contains [reagents.total_volume] unit\s of water!"
+	usr << "\icon[src] This [callme] contains [reagents.total_volume] unit\s of water!"
 	if(mybag)
-		usr << "\A [mybag] is hanging on the pimpin' ride."
+		usr << "\A [mybag] is hanging on the [callme]."
 
-/obj/structure/stool/bed/chair/janicart/attackby(obj/item/W, mob/user)
+
-	if(istype(W, /obj/item/weapon/mop))
+/obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user)
-		if(reagents.total_volume >= 2)
+	if(istype(I, /obj/item/weapon/mop))
-			reagents.trans_to(W, 2)
+		if(reagents.total_volume > 1)
-			user << "<span class='notice'>You wet the mop in the pimpin' ride.</span>"
+			reagents.trans_to(I, 2)
-			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
+			user << "<span class='notice'>You wet [I] in the [callme].</span>"
-		if(reagents.total_volume < 1)
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-			user << "<span class='notice'>This pimpin' ride is out of water!</span>"
+		else
-	else if(istype(W, /obj/item/key))
+			user << "<span class='notice'>This [callme] is out of water!</span>"
-		user << "Hold [W] in one of your hands while you drive this pimpin' ride."
+	else if(istype(I, /obj/item/key))
-	else if(istype(W, /obj/item/weapon/storage/bag/trash))
+		user << "Hold [I] in one of your hands while you drive this [callme]."
-		user << "<span class='notice'>You hook the trashbag onto the pimpin' ride.</span>"
+	else if(istype(I, /obj/item/weapon/storage/bag/trash))
+		user << "<span class='notice'>You hook the trashbag onto the [callme].</span>"
 		user.drop_item()
-		W.loc = src
+		I.loc = src
-		mybag = W
+		mybag = I
 
 
 /obj/structure/stool/bed/chair/janicart/attack_hand(mob/user)
@@ -57,7 +216,8 @@
 		update_mob()
 		handle_rotation()
 	else
-		user << "<span class='notice'>You'll need the keys in one of your hands to drive this pimpin' ride.</span>"
+		user << "<span class='notice'>You'll need the keys in one of your hands to drive this [callme].</span>"
+
 
 /obj/structure/stool/bed/chair/janicart/Move()
 	..()
@@ -65,6 +225,7 @@
 		if(buckled_mob.buckled == src)
 			buckled_mob.loc = loc
 
+
 /obj/structure/stool/bed/chair/janicart/buckle_mob(mob/M, mob/user)
 	if(M != user || !ismob(M) || get_dist(src, user) > 1 || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon))
 		return
@@ -72,8 +233,8 @@
 	unbuckle()
 
 	M.visible_message(\
-		"<span class='notice'>[M] climbs onto the pimpin' ride!</span>",\
+		"<span class='notice'>[M] climbs onto the [callme]!</span>",\
-		"<span class='notice'>You climb onto the pimpin' ride!</span>")
+		"<span class='notice'>You climb onto the [callme]!</span>")
 	M.buckled = src
 	M.loc = loc
 	M.dir = dir
@@ -81,7 +242,7 @@
 	buckled_mob = M
 	update_mob()
 	add_fingerprint(user)
-	return
+
 
 /obj/structure/stool/bed/chair/janicart/unbuckle()
 	if(buckled_mob)
@@ -89,6 +250,7 @@
 		buckled_mob.pixel_y = 0
 	..()
 
+
 /obj/structure/stool/bed/chair/janicart/handle_rotation()
 	if(dir == SOUTH)
 		layer = FLY_LAYER
@@ -102,6 +264,7 @@
 
 	update_mob()
 
+
 /obj/structure/stool/bed/chair/janicart/proc/update_mob()
 	if(buckled_mob)
 		buckled_mob.dir = dir
@@ -119,11 +282,13 @@
 				buckled_mob.pixel_x = -13
 				buckled_mob.pixel_y = 7
 
+
 /obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
 	if(buckled_mob)
-		if(prob(65))
+		if(prob(85))
 			return buckled_mob.bullet_act(Proj)
-	visible_message("<span class='warning'>[Proj] ricochets off the pimpin' ride!</span>")
+	visible_message("<span class='warning'>[Proj] ricochets off the [callme]!</span>")
+
 
 /obj/item/key
 	name = "key"

code/game/objects/structures/mop_bucket.dm

@@ -1,6 +1,6 @@
 /obj/structure/mopbucket
-	desc = "Fill it with water, but don't forget a mop!"
 	name = "mop bucket"
+	desc = "Fill it with water, but don't forget a mop!"
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mopbucket"
 	density = 1
@@ -8,37 +8,21 @@
 	flags = FPRINT | TABLEPASS | OPENCONTAINER
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
+
 /obj/structure/mopbucket/New()
-	var/datum/reagents/R = new/datum/reagents(100)
+	create_reagents(100)
-	reagents = R
-	R.my_atom = src
 
 
 /obj/structure/mopbucket/examine()
 	set src in usr
-	usr << text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)
+	usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
 	..()
 
-/obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
-	if (istype(W, /obj/item/weapon/mop))
+	if(istype(I, /obj/item/weapon/mop))
-		if (src.reagents.total_volume >= 2)
+		if(reagents.total_volume < 1)
-			src.reagents.trans_to(W, 2)
+			user << "[src] is out of water!</span>"
-			user << "\blue You wet the mop"
+		else
-			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
+			reagents.trans_to(I, 5)
-		if (src.reagents.total_volume < 1)
+			user << "<span class='notice'>You wet [I] in [src].</span>"
-			user << "\blue Out of water!"
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-	return
-
-/obj/structure/mopbucket/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			del(src)
-			return
-		if(2.0)
-			if (prob(50))
-				del(src)
-				return
-		if(3.0)
-			if (prob(5))
-				del(src)
-				return

code/modules/reagents/reagent_containers/spray.dm

@@ -17,7 +17,7 @@
 
 /obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
 	if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \
-	|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink))
+	|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
 		return
 
 	if(istype(A, /obj/effect/proc_holder/spell))
@@ -40,16 +40,12 @@
 		user << "<span class='notice'>\The [src] is empty!</span>"
 		return
 
-	var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
+	var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
 	D.create_reagents(amount_per_transfer_from_this)
 	reagents.trans_to(D, amount_per_transfer_from_this, 1/3)
-
-	D.name = "chemicals"
-	D.icon = 'icons/obj/chempuff.dmi'
-
 	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
 
-	var/turf/A_turf = get_turf(A)
+	var/turf/A_turf = get_turf(A)//BS12
 
 	spawn(0)
 		for(var/i=0, i<3, i++)
@@ -59,7 +55,7 @@
 				D.reagents.reaction(T)
 
 				// When spraying against the wall, also react with the wall, but
-				// not its contents.
+				// not its contents. BS12
 				if(get_dist(D, A_turf) == 1 && A_turf.density)
 					D.reagents.reaction(A_turf)
 				sleep(2)
@@ -69,14 +65,14 @@
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 
 	if(reagents.has_reagent("sacid"))
-		message_admins("[key_name_admin(user)] fired sulphuric acid from a spray bottle.")
+		message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
-		log_game("[key_name(user)] fired sulphuric acid from a spray bottle.")
+		log_game("[key_name(user)] fired sulphuric acid from \a [src].")
 	if(reagents.has_reagent("pacid"))
-		message_admins("[key_name_admin(user)] fired Polyacid from a spray bottle.")
+		message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
-		log_game("[key_name(user)] fired Polyacid from a spray bottle.")
+		log_game("[key_name(user)] fired Polyacid from \a [src].")
 	if(reagents.has_reagent("lube"))
-		message_admins("[key_name_admin(user)] fired Space lube from a spray bottle.")
+		message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
-		log_game("[key_name(user)] fired Space lube from a spray bottle.")
+		log_game("[key_name(user)] fired Space lube from \a [src].")
 	return
 
 /obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user)
@@ -97,8 +93,10 @@
 	set category = "Object"
 	set src in usr
 
+	if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
+		return
 	if(isturf(usr.loc))
-		usr << "<span class='notice'>You empty the [src] onto the floor.</span>"
+		usr << "<span class='notice'>You empty \the [src] onto the floor.</span>"
 		reagents.reaction(usr.loc)
 		spawn(5) src.reagents.clear_reagents()
 
@@ -127,6 +125,22 @@
 	..()
 	reagents.add_reagent("condensedcapsaicin", 40)
 
+//water flower
+/obj/item/weapon/reagent_containers/spray/waterflower
+	name = "water flower"
+	desc = "A seemingly innocent sunflower...with a twist."
+	icon = 'icons/obj/harvest.dmi'
+	icon_state = "sunflower"
+	item_state = "sunflower"
+	amount_per_transfer_from_this = 1
+	volume = 10
+
+/obj/item/weapon/reagent_containers/spray/waterflower/New()
+	..()
+	reagents.add_reagent("water", 10)
+
+/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(var/mob/user) //Don't allow changing how much the flower sprays
+	return
 
 //chemsprayer
 /obj/item/weapon/reagent_containers/spray/chemsprayer
@@ -170,9 +184,7 @@
 	var/Sprays[3]
 	for(var/i=1, i<=3, i++) // intialize sprays
 		if(src.reagents.total_volume < 1) break
-		var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
+		var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
-		D.name = "chemicals"
-		D.icon = 'icons/obj/chempuff.dmi'
 		D.create_reagents(amount_per_transfer_from_this)
 		src.reagents.trans_to(D, amount_per_transfer_from_this)
 
@@ -188,7 +200,7 @@
 
 	for(var/i=1, i<=Sprays.len, i++)
 		spawn()
-			var/obj/effect/decal/D = Sprays[i]
+			var/obj/effect/decal/chempuff/D = Sprays[i]
 			if(!D) continue
 
 			// Spreads the sprays a little bit

html/browser/common.css

@@ -0,0 +1,293 @@
+body 
+{ 
+	padding: 0;
+	margin: 0;
+	background-color: #272727;
+	font-size: 12px;
+	color: #ffffff;
+	line-height: 170%;
+}
+
+hr
+{
+	background-color: #40628a;
+	height: 1px;
+}
+
+a, a:link, a:visited, a:active, .linkOn, .linkOff
+{ 
+	color: #ffffff; 
+	text-decoration: none;
+	background: #40628a;
+	border: 1px solid #161616;
+	padding: 1px 4px 1px 4px;
+	margin: 0 2px 0 0;
+	cursor:default;
+}
+
+a:hover 
+{ 
+	color: #40628a;
+	background: #ffffff;
+}
+
+a.white, a.white:link, a.white:visited, a.white:active
+{ 
+	color: #40628a; 
+	text-decoration: none;
+	background: #ffffff;
+	border: 1px solid #161616;
+	padding: 1px 4px 1px 4px;
+	margin: 0 2px 0 0;
+	cursor:default;
+}
+
+a.white:hover 
+{ 
+	color: #ffffff;
+	background: #40628a;
+}
+
+.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover
+{ 
+	color: #ffffff; 
+	background: #2f943c;
+	border-color: #24722e;
+}
+
+.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover
+{ 
+	color: #ffffff; 
+	background: #999999;
+	border-color: #666666;
+}
+
+a.icon, .linkOn.icon, .linkOff.icon
+{
+	position: relative;
+	padding: 1px 4px 2px 20px;
+}
+
+a.icon img, .linkOn.icon img
+{
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 18px;
+	height: 18px;
+}
+
+ul
+{
+	padding: 4px 0 0 10px;
+	margin: 0;
+	list-style-type: none;
+}
+
+li
+{
+	padding: 0 0 2px 0;
+}
+
+img, a img 
+{ 
+	border-style:none; 
+}
+
+h1, h2, h3, h4, h5, h6
+{
+	margin: 0;
+	padding: 16px 0 8px 0; 
+	color: #517087;
+}
+
+h1
+{
+	font-size: 15px;
+}
+
+h2
+{
+	font-size: 14px;
+}
+
+h3
+{
+	font-size: 13px;
+}
+
+h4
+{
+	font-size: 12px;
+}
+
+.uiWrapper
+{
+
+	width: 100%;
+	height: 100%;
+}
+
+.uiTitle
+{
+	clear: both;
+	padding: 6px 8px 6px 8px;
+	border-bottom: 2px solid #161616;
+	background: #383838;
+	color: #98B0C3;
+	font-size: 16px;
+}
+
+.uiTitle.icon
+{
+	padding: 6px 8px 6px 42px;
+	background-position: 2px 50%;
+	background-repeat: no-repeat;
+}
+
+.uiContent
+{	
+	clear: both;
+	padding: 8px;
+	font-family: Verdana, Geneva, sans-serif;
+}
+
+.good
+{
+	color: #00ff00;
+}
+
+.average
+{
+	color: #d09000;
+}
+
+.bad
+{
+	color: #ff0000;
+}
+
+.highlight
+{
+	color: #8BA5C4;
+}
+
+.dark
+{
+	color: #272727;
+}
+
+.notice
+{
+	position: relative;
+	background: #E9C183;
+	color: #15345A;
+	font-size: 10px;
+	font-style: italic;
+	padding: 2px 4px 0 4px;
+	margin: 4px;
+}
+
+.notice.icon
+{	
+	padding: 2px 4px 0 20px;
+}
+
+.notice img
+{
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 16px;
+}
+
+div.notice
+{
+	clear: both;
+}
+
+.statusDisplay
+{
+	background: #000000;
+	color: #ffffff;
+	border: 1px solid #40628a;
+	padding: 4px;
+	margin: 3px 0;
+}
+
+.block
+{
+	padding: 8px;
+	margin: 10px 4px 4px 4px;
+	border: 1px solid #40628a;
+	background-color: #202020;
+}
+
+.block h3
+{
+	padding: 0;
+}
+
+.progressBar
+{
+	width: 240px;
+	height: 14px;
+	border: 1px solid #666666;
+	float: left;
+	margin: 0 5px;
+	overflow: hidden;
+}
+
+.progressFill
+{
+	width: 100%;
+	height: 100%;
+	background: #40628a;
+	overflow: hidden;
+}
+
+.progressFill.good
+{
+	color: #ffffff;
+	background: #00ff00;
+}
+
+.progressFill.average
+{
+	color: #ffffff;
+	background: #d09000;
+}
+
+.progressFill.bad
+{
+	color: #ffffff;
+	background: #ff0000;
+}
+
+.progressFill.highlight
+{
+	color: #ffffff;
+	background: #8BA5C4;
+}
+
+.clearBoth
+{
+	clear: both;
+}
+
+.clearLeft
+{
+	clear: left;
+}
+
+.clearRight
+{
+	clear: right;
+}
+
+.line
+{
+	width: 100%;
+	clear: both;
+}

html/browser/cryo.css

@@ -0,0 +1,11 @@
+.statusLabel
+{
+	width: 128px;
+	float: left;
+	overflow: hidden;
+}
+
+.statusValue
+{
+	float: left;
+}

html/browser/scannernew.css

@@ -0,0 +1,25 @@
+.getblockstring
+{
+	font-family: Fixed, monospace;
+}
+
+.blockString
+{
+	width: 55px;
+	height: 19px;
+	padding: 0 8px 8px 0;
+	float: left;
+}
+
+.statusLabel
+{
+	width: 128px;
+	float: left;
+	overflow: hidden;
+}
+
+.statusValue
+{
+	float: left;
+}
+

html/browser/sleeper.css

@@ -0,0 +1,11 @@
+.statusLabel
+{
+	width: 128px;
+	float: left;
+	overflow: hidden;
+}
+
+.statusValue
+{
+	float: left;
+}