Merge pull request #3623 from Erthilo/dev

Tools reordering, string limit, janicart replacement, punches

baystation12.dme

@@ -56,6 +56,9 @@
 #define FILE_DIR "sound/voice/Serithi"
 #define FILE_DIR "sound/vox"
 #define FILE_DIR "sound/weapons"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/AddToChangelog"
+#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
 #define DEBUG
@@ -116,6 +119,7 @@
 #include "code\controllers\verbs.dm"
 #include "code\controllers\voting.dm"
 #include "code\datums\ai_laws.dm"
+#include "code\datums\browser.dm"
 #include "code\datums\computerfiles.dm"
 #include "code\datums\datacore.dm"
 #include "code\datums\datumvars.dm"
@@ -1288,8 +1292,6 @@
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\periodic_news.dm"
 #include "code\WorkInProgress\Apples\artifacts.dm"
-#include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
-#include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy_Events.dm"
@@ -1339,7 +1341,6 @@
 #include "code\WorkInProgress\Ported\policetape.dm"
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
-#include "code\WorkInProgress\Susan\susan_desert_turfs.dm"
 #include "code\ZAS\Airflow.dm"
 #include "code\ZAS\Connection.dm"
 #include "code\ZAS\Debug.dm"
@@ -1354,8 +1355,4 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\tgstation2.dmm"
-#include "maps\RandomZLevels\Academy.dm"
-#include "maps\RandomZLevels\challenge.dm"
-#include "maps\RandomZLevels\stationCollision.dm"
-#include "maps\RandomZLevels\wildwest.dm"
 // END_INCLUDE

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

@@ -15,4 +15,10 @@
 /obj/effect/decal/spraystill
 	density = 0
 	anchored = 1
-	layer = 50
+	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)
-	reagents = R
-	R.my_atom = src
+	create_reagents(5)
 
 
-obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
-	reagents.reaction(A,1,10)
-	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) )
-			del(O)
+obj/item/weapon/mop/proc/clean(turf/simulated/A)
+	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))
+				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)
-	if(istype(W, /obj/item/weapon/mop))
-		return
-	..()
-
-
-/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
-
+/obj/item/weapon/mop/afterattack(atom/A, mob/user)
 	if(istype(A, /turf/simulated) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
+		if(reagents.total_volume < 1)
+			user << "<span class='notice'>Your mop is dry!</span>"
+			return
+
 		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)
-			reagents.clear_reagents()
-			mopcount = 0
-	return
+
+/obj/effect/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
+		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()
-
-	var/datum/reagents/R = new/datum/reagents(100)
-	reagents = R
-	R.my_atom = src
+	create_reagents(100)
 
 
 /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))
-		if(reagents.total_volume >= 2)
-			reagents.trans_to(W, 2)
-			user << "<span class='notice'>You wet the mop in the pimpin' ride.</span>"
-			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
-		if(reagents.total_volume < 1)
-			user << "<span class='notice'>This pimpin' ride is out of water!</span>"
-	else if(istype(W, /obj/item/key))
-		user << "Hold [W] in one of your hands while you drive this pimpin' ride."
-	else if(istype(W, /obj/item/weapon/storage/bag/trash))
-		user << "<span class='notice'>You hook the trashbag onto the pimpin' ride.</span>"
+
+/obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/mop))
+		if(reagents.total_volume > 1)
+			reagents.trans_to(I, 2)
+			user << "<span class='notice'>You wet [I] in the [callme].</span>"
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+		else
+			user << "<span class='notice'>This [callme] is out of water!</span>"
+	else if(istype(I, /obj/item/key))
+		user << "Hold [I] in one of your hands while you drive this [callme]."
+	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
-		mybag = W
+		I.loc = src
+		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'>You climb onto the pimpin' ride!</span>")
+		"<span class='notice'>[M] climbs onto the [callme]!</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,44 +1,28 @@
 /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
 	pressure_resistance = 5
 	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+	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)
-	reagents = R
-	R.my_atom = src
+	create_reagents(100)
 
 
 /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)
-	if (istype(W, /obj/item/weapon/mop))
-		if (src.reagents.total_volume >= 2)
-			src.reagents.trans_to(W, 2)
-			user << "\blue You wet the mop"
-			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
-		if (src.reagents.total_volume < 1)
-			user << "\blue Out of water!"
-	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
+/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/mop))
+		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)

code/modules/DetectiveWork/detective_work.dm

@@ -107,8 +107,8 @@ obj/machinery/computer/forensic_scanning
 				dat += "<a href='?src=\ref[src];operation=logout'>{Log Out}</a><br><hr><br>"
 				if(scanning)
 					if(scan_process)
-						dat += "Scan Object: {[scanning.name]}<br>"
-						dat += "<a href='?src=\ref[src];operation=cancel'>{Cancel Scan}</a> {Print}<br>"
+						dat += {"Scan Object: {[scanning.name]}<br>
+						<a href='?src=\ref[src];operation=cancel'>{Cancel Scan}</a> {Print}<br>"}
 					else
 						if(isai) dat += "Scan Object: {[scanning.name]}<br>"
 						else dat += "Scan Object: <a href='?src=\ref[src];operation=eject'>{[scanning.name]}</a><br>"
@@ -117,8 +117,8 @@ obj/machinery/computer/forensic_scanning
 					if(isai) dat += "{No Object Inserted}<br>"
 					else dat += "<a href='?src=\ref[src];operation=insert'>{No Object Inserted}</a><br>"
 					dat += "{Scan} <a href='?src=\ref[src];operation=print'>{Print}</a><br>"
-				dat += "<a href='?src=\ref[src];operation=database'>{Access Database}</a><br><br>"
-				dat += "<tt>[scan_data]</tt>"
+				dat += {"<a href='?src=\ref[src];operation=database'>{Access Database}</a><br><br>"
+				<tt>[scan_data]</tt>"}
 				if(scan_data && !scan_process)
 					dat += "<br><a href='?src=\ref[src];operation=erase'>{Erase Data}</a>"
 		user << browse(dat,"window=scanner")
@@ -200,8 +200,8 @@ obj/machinery/computer/forensic_scanning
 					else
 						temp = ""
 					if(misc && misc.len)
-						temp += "<b>Auxiliary Evidence Database</b><br><br>"
-						temp += "This is where anything without fingerprints goes.<br><br>"
+						temp += {"<b>Auxiliary Evidence Database</b><br><br>
+						This is where anything without fingerprints goes.<br><br>"}
 						for(var/atom in misc)
 							var/list/data_entry = misc[atom]
 							temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[atom]'>{[data_entry[3]]}</a><br>"
@@ -215,8 +215,8 @@ obj/machinery/computer/forensic_scanning
 							dossier[2] = new_title
 						else
 							usr << "Illegal or blank name."
-					temp = "<b>Criminal Evidence Database</b><br><br>"
-					temp += "Consolidated data points: [dossier[2]]<br>"
+					temp = {"<b>Criminal Evidence Database</b><br><br>
+					Consolidated data points: [dossier[2]]<br>"}
 					var/print_string = "Fingerprints: Print not complete!<br>"
 					if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
 						print_string = "Fingerprints: (80% or higher completion reached)<br>[dossier[1]]<br>"

code/modules/clothing/head/collectable.dm

@@ -6,8 +6,8 @@
 	desc = "A rare collectable hat."
 
 /obj/item/clothing/head/collectable/petehat
-	name = "ultra rare Pete's hat!"
-	desc = "It smells faintly of plasma"
+	name = "ultra rare hat"
+	desc = "an ultra rare hat. It commands a certain respect."
 	icon_state = "petehat"
 
 /obj/item/clothing/head/collectable/slime

code/modules/library/lib_machines.dm

@@ -37,11 +37,11 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 	var/dat = "<HEAD><TITLE>Library Visitor</TITLE></HEAD><BODY>\n" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
 	switch(screenstate)
 		if(0)
-			dat += "<h2>Search Settings</h2><br>"
-			dat += "<A href='?src=\ref[src];settitle=1'>Filter by Title: [title]</A><BR>"
-			dat += "<A href='?src=\ref[src];setcategory=1'>Filter by Category: [category]</A><BR>"
-			dat += "<A href='?src=\ref[src];setauthor=1'>Filter by Author: [author]</A><BR>"
-			dat += "<A href='?src=\ref[src];search=1'>\[Start Search\]</A><BR>"
+			dat += {"<h2>Search Settings</h2><br>
+			<A href='?src=\ref[src];settitle=1'>Filter by Title: [title]</A><BR>
+			<A href='?src=\ref[src];setcategory=1'>Filter by Category: [category]</A><BR>
+			<A href='?src=\ref[src];setauthor=1'>Filter by Author: [author]</A><BR>
+			<A href='?src=\ref[src];search=1'>\[Start Search\]</A><BR>"}
 		if(1)
 			establish_old_db_connection()
 			if(!dbcon_old.IsConnected())
@@ -49,8 +49,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			else if(!SQLquery)
 				dat += "<font color=red><b>ERROR</b>: Malformed search request. Please contact your system administrator for assistance.</font><BR>"
 			else
-				dat += "<table>"
-				dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td>SS<sup>13</sup>BN</td></tr>"
+				dat += {"<table>
+				<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td>SS<sup>13</sup>BN</td></tr>"}
 
 				var/DBQuery/query = dbcon_old.NewQuery(SQLquery)
 				query.Execute()
@@ -138,12 +138,12 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 	switch(screenstate)
 		if(0)
 			// Main Menu
-			dat += "<A href='?src=\ref[src];switchscreen=1'>1. View General Inventory</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=2'>2. View Checked Out Inventory</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=3'>3. Check out a Book</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=4'>4. Connect to External Archive</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=5'>5. Upload New Title to Archive</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=6'>6. Print a Bible</A><BR>"
+			dat += {"<A href='?src=\ref[src];switchscreen=1'>1. View General Inventory</A><BR>
+			<A href='?src=\ref[src];switchscreen=2'>2. View Checked Out Inventory</A><BR>
+			<A href='?src=\ref[src];switchscreen=3'>3. Check out a Book</A><BR>
+			<A href='?src=\ref[src];switchscreen=4'>4. Connect to External Archive</A><BR>
+			<A href='?src=\ref[src];switchscreen=5'>5. Upload New Title to Archive</A><BR>
+			<A href='?src=\ref[src];switchscreen=6'>6. Print a Bible</A><BR>"}
 			if(src.emagged)
 				dat += "<A href='?src=\ref[src];switchscreen=7'>7. Access the Forbidden Lore Vault</A><BR>"
 			if(src.arcanecheckout)
@@ -172,30 +172,30 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 					timedue = "<font color=red><b>(OVERDUE)</b> [timedue]</font>"
 				else
 					timedue = round(timedue)
-				dat += "\"[b.bookname]\", Checked out to: [b.mobname]<BR>--- Taken: [timetaken] minutes ago, Due: in [timedue] minutes<BR>"
-				dat += "<A href='?src=\ref[src];checkin=\ref[b]'>(Check In)</A><BR><BR>"
+				dat += {"\"[b.bookname]\", Checked out to: [b.mobname]<BR>--- Taken: [timetaken] minutes ago, Due: in [timedue] minutes<BR>
+				<A href='?src=\ref[src];checkin=\ref[b]'>(Check In)</A><BR><BR>"}
 			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
 		if(3)
 			// Check Out a Book
-			dat += "<h3>Check Out a Book</h3><BR>"
-			dat += "Book: [src.buffer_book] "
-			dat += "<A href='?src=\ref[src];editbook=1'>\[Edit\]</A><BR>"
-			dat += "Recipient: [src.buffer_mob] "
-			dat += "<A href='?src=\ref[src];editmob=1'>\[Edit\]</A><BR>"
-			dat += "Checkout Date : [world.time/600]<BR>"
-			dat += "Due Date: [(world.time + checkoutperiod)/600]<BR>"
-			dat += "(Checkout Period: [checkoutperiod] minutes) (<A href='?src=\ref[src];increasetime=1'>+</A>/<A href='?src=\ref[src];decreasetime=1'>-</A>)"
-			dat += "<A href='?src=\ref[src];checkout=1'>(Commit Entry)</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
+			dat += {"<h3>Check Out a Book</h3><BR>
+			Book: [src.buffer_book]
+			<A href='?src=\ref[src];editbook=1'>\[Edit\]</A><BR>
+			Recipient: [src.buffer_mob]
+			<A href='?src=\ref[src];editmob=1'>\[Edit\]</A><BR>
+			Checkout Date : [world.time/600]<BR>
+			Due Date: [(world.time + checkoutperiod)/600]<BR>
+			(Checkout Period: [checkoutperiod] minutes) (<A href='?src=\ref[src];increasetime=1'>+</A>/<A href='?src=\ref[src];decreasetime=1'>-</A>)
+			<A href='?src=\ref[src];checkout=1'>(Commit Entry)</A><BR>
+			<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"}
 		if(4)
 			dat += "<h3>External Archive</h3>"
 			establish_old_db_connection()
 			if(!dbcon_old.IsConnected())
 				dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
 			else
-				dat += "<A href='?src=\ref[src];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>"
-				dat += "<table>"
-				dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td></td></tr>"
+				dat += {"<A href='?src=\ref[src];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>
+				<table>
+				<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td></td></tr>"}
 
 				var/DBQuery/query = dbcon_old.NewQuery("SELECT id, author, title, category FROM library")
 				query.Execute()
@@ -219,19 +219,19 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			else if(!scanner.cache)
 				dat += "<FONT color=red>No data found in scanner memory.</FONT><BR>"
 			else
-				dat += "<TT>Data marked for upload...</TT><BR>"
-				dat += "<TT>Title: </TT>[scanner.cache.name]<BR>"
+				dat += {"<TT>Data marked for upload...</TT><BR>
+				<TT>Title: </TT>[scanner.cache.name]<BR>"}
 				if(!scanner.cache.author)
 					scanner.cache.author = "Anonymous"
-				dat += "<TT>Author: </TT><A href='?src=\ref[src];setauthor=1'>[scanner.cache.author]</A><BR>"
-				dat += "<TT>Category: </TT><A href='?src=\ref[src];setcategory=1'>[upload_category]</A><BR>"
-				dat += "<A href='?src=\ref[src];upload=1'>\[Upload\]</A><BR>"
+				dat += {"<TT>Author: </TT><A href='?src=\ref[src];setauthor=1'>[scanner.cache.author]</A><BR>
+				<TT>Category: </TT><A href='?src=\ref[src];setcategory=1'>[upload_category]</A><BR>
+				<A href='?src=\ref[src];upload=1'>\[Upload\]</A><BR>"}
 			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
 		if(7)
-			dat += "<h3>Accessing Forbidden Lore Vault v 1.3</h3>"
-			dat += "Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.<p>"
-			dat += "<A href='?src=\ref[src];arccheckout=1'>Yes.</A><BR>"
-			dat += "<A href='?src=\ref[src];switchscreen=0'>No.</A><BR>"
+			dat += {"<h3>Accessing Forbidden Lore Vault v 1.3</h3>
+			Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.<p>
+			<A href='?src=\ref[src];arccheckout=1'>Yes.</A><BR>
+			<A href='?src=\ref[src];switchscreen=0'>No.</A><BR>"}
 
 	//dat += "<A HREF='?src=\ref[user];mach_close=library'>Close</A><br><br>"
 	user << browse(dat, "window=library")

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -105,7 +105,6 @@
 
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[M.species.attack_verb]ed [src.name] ([src.ckey])</font>")
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [M.species.attack_verb]ed by [M.name] ([M.ckey])</font>")
-
 			log_attack("[M.name] ([M.ckey]) [M.species.attack_verb]ed [src.name] ([src.ckey])")
 
 			var/damage = rand(0, 5)//BS12 EDIT
@@ -136,7 +135,8 @@
 				visible_message("\red <B>[M] has weakened [src]!</B>")
 				apply_effect(2, WEAKEN, armor_block)
 
-			if(M.species.attack_verb != "punch")	damage += 5
+			if(M.species.punch_damage)
+				damage += M.species.punch_damage
 			apply_damage(damage, BRUTE, affecting, armor_block)
 
 

code/modules/mob/living/carbon/species.dm

@@ -13,6 +13,7 @@
 	var/tail                     // Name of tail image in species effects icon file.
 	var/language                 // Default racial language, if any.
 	var/attack_verb = "punch"    // Empty hand hurt intent verb.
+	var/punch_damage = 0		 // Extra empty hand attack damage.
 	var/mutantrace               // Safeguard due to old code.
 
 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
@@ -49,9 +50,18 @@
 	language = "Sinta'unathi"
 	tail = "sogtail"
 	attack_verb = "scratch"
+	punch_damage = 5
 	primitive = /mob/living/carbon/monkey/unathi
 	darksight = 3
 
+	cold_level_1 = 280 //Default 260 - Lower is better
+	cold_level_2 = 220 //Default 200
+	cold_level_3 = 130 //Default 120
+
+	heat_level_1 = 420 //Default 360 - Higher is better
+	heat_level_2 = 480 //Default 400
+	heat_level_3 = 1100 //Default 1000
+
 	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
 
 /datum/species/tajaran
@@ -61,15 +71,16 @@
 	language = "Siik'tajr"
 	tail = "tajtail"
 	attack_verb = "scratch"
+	punch_damage = 5
 	darksight = 8
 
-	cold_level_1 = 200
-	cold_level_2 = 140
-	cold_level_3 = 80
+	cold_level_1 = 200 //Default 260
+	cold_level_2 = 140 //Default 200
+	cold_level_3 = 80 //Default 120
 
-	heat_level_1 = 330
-	heat_level_2 = 380
-	heat_level_3 = 800
+	heat_level_1 = 330 //Default 360
+	heat_level_2 = 380 //Default 400
+	heat_level_3 = 800 //Default 1000
 
 	primitive = /mob/living/carbon/monkey/tajara
 
@@ -108,6 +119,7 @@
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
 	language = "Rootspeak"
 	attack_verb = "slash"
+	punch_damage = 5
 	primitive = /mob/living/carbon/monkey/diona
 
 	warning_low_pressure = 50

code/modules/mob/living/silicon/pai/recruit.dm

@@ -120,26 +120,26 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 				</style>
 				"}
 
-		dat += "<p class=\"top\">Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!</p>"
-		dat += "<table>"
-		dat += "<tr class=\"d0\"><td>Name:</td><td>[candidate.name]</td></tr>"
-		dat += "<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=name;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td></tr>"
+		dat += {"<p class=\"top\">Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!</p>
+		<table>
+		<tr class=\"d0\"><td>Name:</td><td>[candidate.name]</td></tr>
+		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=name;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td></tr>
 
-		dat += "<tr class=\"d0\"><td>Description:</td><td>[candidate.description]</td></tr>"
-		dat += "<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=desc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td></tr>"
+		<tr class=\"d0\"><td>Description:</td><td>[candidate.description]</td></tr>
+		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=desc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td></tr>
 
-		dat += "<tr class=\"d0\"><td>Preferred Role:</td><td>[candidate.role]</td></tr>"
-		dat += "<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=role;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td></tr>"
+		<tr class=\"d0\"><td>Preferred Role:</td><td>[candidate.role]</td></tr>
+		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=role;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td></tr>
 
-		dat += "<tr class=\"d0\"><td>OOC Comments:</td><td>[candidate.comments]</td></tr>"
-		dat += "<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=ooc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want.</td></tr>"
+		<tr class=\"d0\"><td>OOC Comments:</td><td>[candidate.comments]</td></tr>
+		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=ooc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want.</td></tr>
 
-		dat += "</table>"
+		</table>"
 
-		dat += "<br>"
-		dat += "<h3><a href='byond://?src=\ref[src];option=submit;new=1;candidate=\ref[candidate]'>Submit Personality</a></h3><br>"
-		dat += "<a href='byond://?src=\ref[src];option=save;new=1;candidate=\ref[candidate]'>Save Personality</a><br>"
-		dat += "<a href='byond://?src=\ref[src];option=load;new=1;candidate=\ref[candidate]'>Load Personality</a><br>"
+		<br>
+		<h3><a href='byond://?src=\ref[src];option=submit;new=1;candidate=\ref[candidate]'>Submit Personality</a></h3><br>
+		<a href='byond://?src=\ref[src];option=save;new=1;candidate=\ref[candidate]'>Save Personality</a><br>
+		<a href='byond://?src=\ref[src];option=load;new=1;candidate=\ref[candidate]'>Load Personality</a><br>"}
 
 		M << browse(dat, "window=paiRecruit")
 
@@ -179,11 +179,11 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		dat += "<table>"
 
 		for(var/datum/paiCandidate/c in available)
-			dat += "<tr class=\"d0\"><td>Name:</td><td>[c.name]</td></tr>"
-			dat += "<tr class=\"d1\"><td>Description:</td><td>[c.description]</td></tr>"
-			dat += "<tr class=\"d0\"><td>Preferred Role:</td><td>[c.role]</td></tr>"
-			dat += "<tr class=\"d1\"><td>OOC Comments:</td><td>[c.comments]</td></tr>"
-			dat += "<tr class=\"d2\"><td><a href='byond://?src=\ref[src];download=1;candidate=\ref[c];device=\ref[p]'>\[Download [c.name]\]</a></td><td></td></tr>"
+			dat += {"<tr class=\"d0\"><td>Name:</td><td>[c.name]</td></tr>
+			<tr class=\"d1\"><td>Description:</td><td>[c.description]</td></tr>
+			<tr class=\"d0\"><td>Preferred Role:</td><td>[c.role]</td></tr>
+			<tr class=\"d1\"><td>OOC Comments:</td><td>[c.comments]</td></tr>
+			<tr class=\"d2\"><td><a href='byond://?src=\ref[src];download=1;candidate=\ref[c];device=\ref[p]'>\[Download [c.name]\]</a></td><td></td></tr>"}
 
 		dat += "</table>"
 

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.")
-		log_game("[key_name(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 [src].")
 	if(reagents.has_reagent("pacid"))
-		message_admins("[key_name_admin(user)] fired Polyacid from a spray bottle.")
-		log_game("[key_name(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 [src].")
 	if(reagents.has_reagent("lube"))
-		message_admins("[key_name_admin(user)] fired Space lube from a spray bottle.")
-		log_game("[key_name(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 [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))
-		D.name = "chemicals"
-		D.icon = 'icons/obj/chempuff.dmi'
+		var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
 		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
@@ -238,4 +250,4 @@
 	if (istype(A, /obj/effect/blob)) // blob damage in blob code
 		return
 
-	..()
+	..()

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;
+}

html/changelog.html

@@ -46,7 +46,6 @@ Header Section
 		</td>
 	</tr>
 </table>
-<!-- <font size='4' color='red'><b>Visit the bleeding-edge test server at <a href="byond://tekkit.fallemmc.com:8000">byond://tekkit.fallemmc.com:8000</a></b></font>--!>
 
 <!-- 
 Changelog Section 
@@ -56,6 +55,11 @@ Changelog Section
 Stuff which is in development and not yet visible to players or just code related 
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
+
+<!-- You can simply add changelogs using AddToChangelog.exe -->
+
+<!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
+
 <div class="commit sansserif">
 	<h2 class="date">August 26th, 2013</h2>
 	<h3 class="author">Giacom updated:</h3>

maptools/clean_map.bat

@@ -1 +0,0 @@
-java -jar MapPatcher.jar -clean ../maps/tgstation2.dmm.backup ../maps/tgstation2.dmm ../maps/tgstation2.dmm

maptools/new_clean.bat

@@ -1,96 +0,0 @@
-@setlocal enableextensions enabledelayedexpansion
-@echo off
-
-set /a count=0
-for /f "tokens=*" %%A in ('dir /b /a-d "../maps/*.dmm"') do (
-	set /a count+=1
-	set num.!count!=%%A
-)
-
-for /f "tokens=2* delims=.=" %%A in ('set num.') do echo %%A = %%B
-
-:choosemap
-echo ...
-set /p prompt="Which map # would you like to clean?: " || set prompt=_None
-
-if /i "%prompt%"=="exit" (
-	goto :quitmaybe
-)
-
-if "%prompt%"=="_None" (
-	goto :prom_error
-) else set mapnum=%prompt%
-
-for /f "tokens=2* delims=.=" %%A in ('set num.%mapnum%') do set map=%%B
-
-if "%map%"=="" (
-	echo That's not a valid map, donklorde.
-	goto :choosemap
-)
-
-if not exist "../maps/%map%.backup" (
-	goto :bckup_error
-)
-
-goto :printpath
-
-:prom_error
-echo You didn't choose anything!
-goto :choosemap
-
-:bckup_error
-echo ...
-echo WARNING: A .backup does not exist for %map% !
-echo ...
-goto :choosemap
-
-
-:printpath
-echo ...
-echo =============
-echo Map filepath (This should NOT be the .backup):
-echo:../maps/%map%
-echo =============
-goto :finalize
-
-
-:finalize
-echo ...
-set /p finalize="Is this filepath correct?: " || set finalize=None
-if "%finalize%"=="None" (goto :fin_error)
-if /i "%finalize%"=="y" (goto :java)
-if /i "%finalize%"=="yes" (goto :java)
-if /i "%finalize%"=="n" (goto :quitmaybe)
-if /i "%finalize%"=="no" (goto :quitmaybe)
-goto :fin_error
-
-:fin_error
-echo ...
-echo That wasn't a valid response you donk!
-echo Valid responses: y, n, yes, no
-goto :finalize
-
-:java
-echo Starting MapPatcher...
-java -jar MapPatcher.jar -clean ../maps/%map%.backup ../maps/%map% ../maps/%map%
-goto :exit
-
-:quitmaybe
-echo ...
-set /p exitmaybe="Exit the program?: " || set exitmaybe=_NothingChosen
-if "%exitmaybe%"=="_NothingChosen" (goto :qm_error)
-if /i "%exitmaybe%"=="y" (goto :exit)
-if /i "%exitmaybe%"=="yes" (goto :exit)
-if /i "%exitmaybe%"=="n" (goto :choosemap)
-if /i "%exitmaybe%"=="no" (goto :choosemap)
-goto :qm_error
-
-:qm_error
-echo ...
-echo That wasn't a valid response, or you didn't choose anything!
-echo Valid responses: y, n, yes, no
-goto :quitmaybe
-
-:exit
-pause
-exit

maptools/new_prepare.bat

@@ -1,73 +0,0 @@
-@setlocal enableextensions enabledelayedexpansion
-@echo off
-
-set /a count=0
-for /f "tokens=*" %%A in ('dir /b /a-d "../maps/*.dmm"') do (
-	set /a count+=1
-	set num.!count!=%%A
-)
-
-for /f "tokens=2* delims=.=" %%A in ('set num.') do echo %%A = %%B
-
-:choosemap
-echo ...
-set /p prompt="Which map # would you like to back up?: " || set prompt=_None
-
-if /i "%prompt%"=="exit" (
-	goto :quitmaybe
-)
-
-if "%prompt%"=="_None" (
-	goto :prom_error
-) else set mapnum=%prompt%
-
-for /f "tokens=2* delims=.=" %%A in ('set num.%mapnum%') do set map=%%B
-
-if "%map%"=="" (
-	echo That's not a valid map, donklorde.
-	goto :choosemap
-)
-
-goto :printpath
-
-:prom_error
-echo You didn't choose anything!
-goto :choosemap
-
-:printpath
-echo ...
-echo =============
-echo Backing up:
-echo:../maps/%map%
-echo Into:
-echo:../maps/%map%.backup
-echo =============
-goto :copymap
-
-:copymap
-echo Copying...
-cd ../maps
-copy %map% %map%.backup
-echo Done.
-goto :exit
-
-:quitmaybe
-echo ...
-set /p exitmaybe="Exit the program?: " || set exitmaybe=_NothingChosen
-if "%exitmaybe%"=="_NothingChosen" (goto :qm_error)
-if /i "%exitmaybe%"=="y" (goto :exit)
-if /i "%exitmaybe%"=="yes" (goto :exit)
-if /i "%exitmaybe%"=="n" (goto :choosemap)
-if /i "%exitmaybe%"=="no" (goto :choosemap)
-goto :qm_error
-
-:qm_error
-echo ...
-echo That wasn't a valid response, or you didn't choose anything!
-echo Valid responses: y, n, yes, no
-goto :quitmaybe
-
-:exit
-pause
-exit
-

maptools/prepare_map.bat

@@ -1,2 +0,0 @@
-cd ../maps
-copy tgstation2.dmm tgstation2.dmm.backup

tools/AddToChangelog/AddToChangelog.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddToChangelog", "AddToChangelog\AddToChangelog.csproj", "{838EA2DE-A108-4213-8409-7F562F1009BE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{838EA2DE-A108-4213-8409-7F562F1009BE}.Debug|x86.ActiveCfg = Debug|x86
+		{838EA2DE-A108-4213-8409-7F562F1009BE}.Debug|x86.Build.0 = Debug|x86
+		{838EA2DE-A108-4213-8409-7F562F1009BE}.Release|x86.ActiveCfg = Release|x86
+		{838EA2DE-A108-4213-8409-7F562F1009BE}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

tools/AddToChangelog/AddToChangelog/AddToChangelog.csproj

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{838EA2DE-A108-4213-8409-7F562F1009BE}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AddToChangelog</RootNamespace>
+    <AssemblyName>AddToChangelog</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>changelog.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="bugfix.png" />
+    <EmbeddedResource Include="experiment.png" />
+    <Content Include="changelog.ico" />
+    <EmbeddedResource Include="rscdel.png" />
+    <EmbeddedResource Include="wip.png" />
+    <EmbeddedResource Include="imagedel.png" />
+    <EmbeddedResource Include="imageadd.png" />
+    <EmbeddedResource Include="sounddel.png" />
+    <EmbeddedResource Include="soundadd.png" />
+    <EmbeddedResource Include="rscadd.png" />
+    <EmbeddedResource Include="tweak.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

tools/AddToChangelog/AddToChangelog/Form1.Designer.cs

@@ -0,0 +1,263 @@
+namespace AddToChangelog
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.authorBox = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.dateBox = new System.Windows.Forms.MaskedTextBox();
+            this.dropdownBox = new System.Windows.Forms.ComboBox();
+            this.getButton = new System.Windows.Forms.Button();
+            this.addButton = new System.Windows.Forms.Button();
+            this.resultsBox = new System.Windows.Forms.TextBox();
+            this.addLineButton = new System.Windows.Forms.Button();
+            this.addLineBox = new System.Windows.Forms.TextBox();
+            this.listBox = new System.Windows.Forms.TextBox();
+            this.saveButton = new System.Windows.Forms.Button();
+            this.editBox = new System.Windows.Forms.TextBox();
+            this.reloadButton = new System.Windows.Forms.Button();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(20, 46);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(33, 13);
+            this.label1.TabIndex = 10;
+            this.label1.Text = "Date:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(20, 21);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(41, 13);
+            this.label2.TabIndex = 11;
+            this.label2.Text = "Author:";
+            // 
+            // authorBox
+            // 
+            this.authorBox.Location = new System.Drawing.Point(67, 18);
+            this.authorBox.Name = "authorBox";
+            this.authorBox.Size = new System.Drawing.Size(154, 20);
+            this.authorBox.TabIndex = 1;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(330, 21);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(68, 13);
+            this.label3.TabIndex = 12;
+            this.label3.Text = "Add change:";
+            // 
+            // dateBox
+            // 
+            this.dateBox.Location = new System.Drawing.Point(67, 43);
+            this.dateBox.Mask = "00/00/0000";
+            this.dateBox.Name = "dateBox";
+            this.dateBox.Size = new System.Drawing.Size(79, 20);
+            this.dateBox.TabIndex = 2;
+            this.dateBox.ValidatingType = typeof(System.DateTime);
+            // 
+            // dropdownBox
+            // 
+            this.dropdownBox.DisplayMember = "\"";
+            this.dropdownBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.dropdownBox.FormattingEnabled = true;
+            this.dropdownBox.Items.AddRange(new object[] {
+            "Added feature",
+            "Removed feature",
+            "Bugfix",
+            "Work in progress",
+            "Tweak",
+            "Experimental feature",
+            "Added icon",
+            "Removed icon",
+            "Added sound",
+            "Removed sound"});
+            this.dropdownBox.Location = new System.Drawing.Point(856, 17);
+            this.dropdownBox.MaxDropDownItems = 10;
+            this.dropdownBox.Name = "dropdownBox";
+            this.dropdownBox.Size = new System.Drawing.Size(121, 21);
+            this.dropdownBox.TabIndex = 7;
+            this.dropdownBox.SelectedIndexChanged += new System.EventHandler(this.dropdownBox_SelectedIndexChanged);
+            // 
+            // getButton
+            // 
+            this.getButton.Location = new System.Drawing.Point(17, 70);
+            this.getButton.Name = "getButton";
+            this.getButton.Size = new System.Drawing.Size(69, 21);
+            this.getButton.TabIndex = 3;
+            this.getButton.Text = "Get HTML";
+            this.getButton.UseVisualStyleBackColor = true;
+            this.getButton.Click += new System.EventHandler(this.getButton_Click);
+            // 
+            // addButton
+            // 
+            this.addButton.Location = new System.Drawing.Point(92, 70);
+            this.addButton.Name = "addButton";
+            this.addButton.Size = new System.Drawing.Size(69, 21);
+            this.addButton.TabIndex = 4;
+            this.addButton.Text = "Lazy Add";
+            this.addButton.UseVisualStyleBackColor = true;
+            this.addButton.Click += new System.EventHandler(this.addButton_Click);
+            // 
+            // resultsBox
+            // 
+            this.resultsBox.Location = new System.Drawing.Point(11, 101);
+            this.resultsBox.Multiline = true;
+            this.resultsBox.Name = "resultsBox";
+            this.resultsBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.resultsBox.Size = new System.Drawing.Size(318, 356);
+            this.resultsBox.TabIndex = 10;
+            // 
+            // addLineButton
+            // 
+            this.addLineButton.Location = new System.Drawing.Point(983, 17);
+            this.addLineButton.Name = "addLineButton";
+            this.addLineButton.Size = new System.Drawing.Size(21, 21);
+            this.addLineButton.TabIndex = 8;
+            this.addLineButton.Text = "+";
+            this.addLineButton.UseVisualStyleBackColor = true;
+            this.addLineButton.Click += new System.EventHandler(this.addLineButton_Click);
+            // 
+            // addLineBox
+            // 
+            this.addLineBox.Location = new System.Drawing.Point(404, 18);
+            this.addLineBox.Name = "addLineBox";
+            this.addLineBox.Size = new System.Drawing.Size(415, 20);
+            this.addLineBox.TabIndex = 6;
+            // 
+            // listBox
+            // 
+            this.listBox.Location = new System.Drawing.Point(335, 46);
+            this.listBox.Multiline = true;
+            this.listBox.Name = "listBox";
+            this.listBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.listBox.Size = new System.Drawing.Size(669, 49);
+            this.listBox.TabIndex = 9;
+            // 
+            // saveButton
+            // 
+            this.saveButton.Location = new System.Drawing.Point(260, 70);
+            this.saveButton.Name = "saveButton";
+            this.saveButton.Size = new System.Drawing.Size(69, 21);
+            this.saveButton.TabIndex = 5;
+            this.saveButton.Text = "Save";
+            this.saveButton.UseVisualStyleBackColor = true;
+            this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
+            // 
+            // editBox
+            // 
+            this.editBox.Location = new System.Drawing.Point(335, 101);
+            this.editBox.MaxLength = 9999999;
+            this.editBox.Multiline = true;
+            this.editBox.Name = "editBox";
+            this.editBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.editBox.Size = new System.Drawing.Size(669, 356);
+            this.editBox.TabIndex = 13;
+            // 
+            // reloadButton
+            // 
+            this.reloadButton.Location = new System.Drawing.Point(185, 70);
+            this.reloadButton.Name = "reloadButton";
+            this.reloadButton.Size = new System.Drawing.Size(69, 21);
+            this.reloadButton.TabIndex = 14;
+            this.reloadButton.Text = "Reload";
+            this.reloadButton.UseVisualStyleBackColor = true;
+            this.reloadButton.Click += new System.EventHandler(this.reloadButton_Click);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Location = new System.Drawing.Point(834, 20);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(16, 16);
+            this.pictureBox.TabIndex = 15;
+            this.pictureBox.TabStop = false;
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.ControlLightLight;
+            this.ClientSize = new System.Drawing.Size(1016, 469);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.reloadButton);
+            this.Controls.Add(this.editBox);
+            this.Controls.Add(this.saveButton);
+            this.Controls.Add(this.listBox);
+            this.Controls.Add(this.addLineBox);
+            this.Controls.Add(this.addLineButton);
+            this.Controls.Add(this.resultsBox);
+            this.Controls.Add(this.addButton);
+            this.Controls.Add(this.getButton);
+            this.Controls.Add(this.dropdownBox);
+            this.Controls.Add(this.dateBox);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.authorBox);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "MainForm";
+            this.Text = "Add To Changelog";
+            this.Load += new System.EventHandler(this.MainForm_Load);
+            this.Shown += new System.EventHandler(this.MainForm_Shown);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox authorBox;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.MaskedTextBox dateBox;
+        private System.Windows.Forms.ComboBox dropdownBox;
+        private System.Windows.Forms.Button getButton;
+        private System.Windows.Forms.Button addButton;
+        private System.Windows.Forms.TextBox resultsBox;
+        private System.Windows.Forms.Button addLineButton;
+        private System.Windows.Forms.TextBox addLineBox;
+        private System.Windows.Forms.TextBox listBox;
+        private System.Windows.Forms.Button saveButton;
+        private System.Windows.Forms.TextBox editBox;
+        private System.Windows.Forms.Button reloadButton;
+        private System.Windows.Forms.PictureBox pictureBox;
+    }
+}
+

tools/AddToChangelog/AddToChangelog/Form1.cs

@@ -0,0 +1,268 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using System.IO;
+using System.Reflection;
+
+namespace AddToChangelog
+{
+    public partial class MainForm : Form
+    {
+
+        public string changelogPath = "changelog.html";
+        public string changelogMarker = "#ADDTOCHANGELOGMARKER#";
+        public string longDateFormat = "d MMMM yyyy";
+        public string shortDateFormat = "ddMMyyyy";
+
+        public Dictionary<string, string> ItemList = new Dictionary<string, string>()
+        {
+            { "Added feature", "rscadd" },
+            { "Removed feature", "rscdel" },
+            { "Bugfix", "bugfix" },
+            { "Work in progress", "wip" },
+            { "Tweak", "tweak" },
+            { "Experimental feature", "experiment" },
+            { "Added icon", "imageadd" },
+            { "Removed icon", "imagedel" },
+            { "Added sound", "soundadd" },
+            { "Removed sound", "sounddel" }
+        };
+
+        public Dictionary<string, Bitmap> ImageList = new Dictionary<string, Bitmap>();
+
+        public MainForm()
+        {
+            InitializeComponent();
+            this.dropdownBox.SelectedIndex = 0;
+            this.dateBox.Text = DateTime.Now.ToString(shortDateFormat);
+            this.listBox.Text = "# Enter your logs in the text box above and it'll be parsed into here. You can use 'Get HTML' to format it for the changelog. You can also use Lazy Add to automatically add the logs to the changelog, no effort needed (just remember to save)! Below is the changelog, you can edit and save it from here to easily fix mistakes. Save will save the changelog below, reload will undo any unsaved changes.";
+        }
+
+        public void SaveChangelog()
+        {
+            DialogResult dialogResult = MessageBox.Show("Are you sure?", "Confirm", MessageBoxButtons.YesNo);
+            if (dialogResult == DialogResult.Yes)
+            {
+                try
+                {
+                    File.WriteAllText(changelogPath, editBox.Text);
+                }
+                catch
+                {
+                    MessageBox.Show("Could not find '" + changelogPath + "'. Please place me on the same folder as " + changelogPath + ".");
+                }
+            }
+        }
+
+        public void ScrollToMarker()
+        {
+            int selection = editBox.Text.IndexOf(changelogMarker);
+            if (selection > 0)
+            {
+                // Hacky way to scroll the edit text box to the beginning of the changelog entries
+                this.ActiveControl = editBox;
+                this.Refresh();
+                editBox.SelectionStart = editBox.Text.Length - 1;
+                editBox.SelectionLength = 0;
+                editBox.ScrollToCaret();
+                editBox.SelectionStart = selection - 2;
+                editBox.ScrollToCaret();
+            }
+        }
+
+        // Load up the changelog
+
+        public void ReadChangelog()
+        {
+            try
+            {
+                string changelog = File.ReadAllText(changelogPath);
+                editBox.Text = changelog;
+                ScrollToMarker();
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("Could not find '" + changelogPath + "'. Please place me on the same folder as " + changelogPath + "." + e);
+            }
+        }
+
+        // Get the log notes
+
+        public string GetHTMLLines()
+        {
+            StringReader stringReader = new StringReader(listBox.Text);
+            string html = "";
+            string aLine = "";
+
+            do
+            {
+                aLine = stringReader.ReadLine();
+                if (aLine != null)
+                {
+                    // remove < and >
+                    if (aLine.StartsWith("<") && aLine.Contains(">"))
+                    {
+                        string tag = aLine.Substring(1, aLine.IndexOf(">") - 1); // extract the tag
+                        aLine = aLine.Substring(aLine.IndexOf(">") + 1); // now remove the tag from the line
+                        aLine = "\t\t<li class='" + tag + "'>" + aLine + "</li>\r\n"; // give html
+                    }
+                    else
+                    {
+                        aLine = "\t\t<li class='rscadd'>" + aLine + "</li>\r\n";
+                    }
+
+                    html += aLine;
+                }
+
+            } while (aLine != null);
+
+            return html;
+        }
+
+        private void addLineButton_Click(object sender, EventArgs e)
+        {
+            if (addLineBox.Text == "")
+            {
+                return;
+            }
+
+            string textAdd = this.addLineBox.Text;
+            string listItem = this.dropdownBox.SelectedItem.ToString();
+            string itemClass = ItemList[listItem];
+
+            if (itemClass == null)
+            {
+                return;
+            }
+
+            if (listBox.Text.StartsWith("#"))
+            {
+                listBox.Text = "";
+            }
+
+            listBox.Text += "<" + itemClass + ">" + textAdd + "\r\n";
+            addLineBox.Text = "";
+
+        }
+
+        private void getButton_Click(object sender, EventArgs e)
+        {
+            if (listBox.Text != "")
+            {
+                DateTime dateTime;
+                if (!DateTime.TryParse(dateBox.Text, out dateTime))
+                {
+                    MessageBox.Show("Invalid date time.");
+                    return;
+                }
+
+                resultsBox.Text = "<div class='commit sansserif'>\r\n";
+                resultsBox.Text += "\t<h2 class='date'>" + dateTime.ToString(longDateFormat) + "</h2>\r\n";
+                resultsBox.Text += "\t<h3 class='author'>" + authorBox.Text + " updated:</h3>\r\n";
+                resultsBox.Text += "\t<ul class='changes bgimages16'>\r\n";
+                resultsBox.Text += GetHTMLLines();
+                resultsBox.Text += "\t</ul>\r\n";
+                resultsBox.Text += "</div>";
+            }
+        }
+
+        // Automatically add to changelog
+
+        private void addButton_Click(object sender, EventArgs e)
+        {
+            if (resultsBox.Text == "")
+            {
+                getButton_Click(this, EventArgs.Empty);
+            }
+
+            if (resultsBox.Text == "")
+            {
+                return;
+            }
+
+            string html = resultsBox.Text;
+
+            string[] changelogFile = null;
+
+            changelogFile = editBox.Text.Split('\n');
+
+            if (changelogFile != null)
+            {
+                bool foundMarker = false;
+                for (int i = 0; i < changelogFile.Length; i++)
+                {
+                    if (foundMarker == false)
+                    {
+                        string line = changelogFile[i];
+                        if (line.Contains(changelogMarker))
+                        {
+                            line += "\r\n\r\n";
+                            line += resultsBox.Text;
+                            line += "\r\n";
+                            changelogFile[i] = line;
+                            foundMarker = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (foundMarker == false)
+                {
+                    MessageBox.Show("Could not find '#ADDTOCHANGELOGMARKER#' in '" + changelogPath + "'. Please place one above where the changelog entries start, inside a comment.");
+                }
+                else
+                {
+                    editBox.Text = String.Join("\n", changelogFile);
+                    ScrollToMarker();
+                }
+  
+            }
+        }
+
+        private void saveButton_Click(object sender, EventArgs e)
+        {
+            SaveChangelog();
+        }
+
+        private void reloadButton_Click(object sender, EventArgs e)
+        {
+            ReadChangelog();
+        }
+
+        private void MainForm_Shown(object sender, EventArgs e)
+        {
+            ReadChangelog();
+        }
+
+        private void dropdownBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // Change the image to reflect the drop down box selection
+            if (ImageList.Count > 0)
+            {
+                string value = ItemList[dropdownBox.SelectedItem.ToString()];
+                pictureBox.Image = ImageList[value];
+            }
+        }
+
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+            // Get our embedded images. Use our dictionaries to help.
+            foreach (string value in ItemList.Values)
+            {
+                Assembly myAssembly = Assembly.GetExecutingAssembly();
+                Stream myStream = myAssembly.GetManifestResourceStream("AddToChangelog." + value + ".png");
+                Bitmap image = new Bitmap(myStream);
+
+                ImageList.Add(value, image);
+            }
+
+            pictureBox.Image = ImageList["rscadd"];
+        }
+    }
+}

tools/AddToChangelog/AddToChangelog/Program.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace AddToChangelog
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+        }
+    }
+}

tools/AddToChangelog/AddToChangelog/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("AddToChangelog")]
+[assembly: AssemblyDescription("An open source application designed to allow the /tg/station open source project to easily add changelog notes to the changelog.html file.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Nanotrasen")]
+[assembly: AssemblyProduct("AddToChangelog")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3f069aeb-901f-4fc0-8104-29da028252dc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

tools/AddToChangelog/AddToChangelog/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.296
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AddToChangelog.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AddToChangelog.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

tools/AddToChangelog/AddToChangelog/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

tools/AddToChangelog/AddToChangelog/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.296
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AddToChangelog.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

tools/AddToChangelog/AddToChangelog/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

tools/mapmerge/clean_map.bat

@@ -0,0 +1,5 @@
+set MAPFILE=tgstation2.dmm
+
+java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE%
+
+pause

tools/mapmerge/install.txt

@@ -0,0 +1,17 @@
+1. Install java(http://www.java.com/en/download/index.jsp)
+2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable.
+
+Committing
+1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory.
+2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
+
+This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.
+
+Merging
+The easiest way to do merging is to install the merge driver. For this, open -tg-station/.git/config in a text editor, and paste the following lines to the end of it:
+
+[merge "merge-dmm"]
+	name = mapmerge driver
+	driver = ./tools/mapmerge/mapmerge.sh %O %A %B
+
+After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.

tools/mapmerge/mapmerge.sh

@@ -1,9 +1,9 @@
-java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2
+java -jar tools/mapmerge/MapPatcher.jar -merge $1 $2 $3 $2
 if [ "$?" -gt 0 ]
 then
     echo "Unable to automatically resolve map conflicts, please merge manually."
     exit 1
 fi
-java -jar maptools/MapPatcher.jar -clean $1 $2 $2
+java -jar tools/mapmerge/MapPatcher.jar -clean $1 $2 $2
 
 exit 0

tools/mapmerge/prepare_map.bat

@@ -0,0 +1,6 @@
+set MAPFILE=tgstation2.dmm
+
+cd ../../maps
+copy %MAPFILE% %MAPFILE%.backup
+
+pause

tools/midi2piano/midi2piano.sln

@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "midi2piano", "midi2piano\midi2piano.csproj", "{68C84B61-F710-491C-BEE8-5E362C167897}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Debug|x86.ActiveCfg = Debug|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Debug|x86.Build.0 = Debug|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Release|Any CPU.ActiveCfg = Release|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Release|Mixed Platforms.Build.0 = Release|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Release|x86.ActiveCfg = Release|x86
+		{68C84B61-F710-491C-BEE8-5E362C167897}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

tools/midi2piano/midi2piano/Form1.Designer.cs

@@ -0,0 +1,135 @@
+namespace midi2piano
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.OutputTxt = new System.Windows.Forms.TextBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.importMIDIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.importDlg = new System.Windows.Forms.OpenFileDialog();
+            this.halpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // OutputTxt
+            // 
+            this.OutputTxt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OutputTxt.Location = new System.Drawing.Point(0, 24);
+            this.OutputTxt.Multiline = true;
+            this.OutputTxt.Name = "OutputTxt";
+            this.OutputTxt.ReadOnly = true;
+            this.OutputTxt.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.OutputTxt.Size = new System.Drawing.Size(284, 240);
+            this.OutputTxt.TabIndex = 0;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.copyToolStripMenuItem,
+            this.halpToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(284, 24);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.importMIDIToolStripMenuItem,
+            this.exitToolStripMenuItem});
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Text = "&File";
+            // 
+            // importMIDIToolStripMenuItem
+            // 
+            this.importMIDIToolStripMenuItem.Name = "importMIDIToolStripMenuItem";
+            this.importMIDIToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
+            this.importMIDIToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+            this.importMIDIToolStripMenuItem.Text = "&Import MIDI...";
+            this.importMIDIToolStripMenuItem.Click += new System.EventHandler(this.importMIDIToolStripMenuItem_Click);
+            // 
+            // exitToolStripMenuItem
+            // 
+            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+            this.exitToolStripMenuItem.Text = "E&xit";
+            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+            // 
+            // copyToolStripMenuItem
+            // 
+            this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+            this.copyToolStripMenuItem.Text = "&Copy";
+            this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
+            // 
+            // importDlg
+            // 
+            this.importDlg.Filter = "MIDI File|*.midi;*.mid";
+            // 
+            // halpToolStripMenuItem
+            // 
+            this.halpToolStripMenuItem.Name = "halpToolStripMenuItem";
+            this.halpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.halpToolStripMenuItem.Text = "&Halp";
+            this.halpToolStripMenuItem.Click += new System.EventHandler(this.halpToolStripMenuItem_Click);
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(284, 264);
+            this.Controls.Add(this.OutputTxt);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "Form1";
+            this.Text = "MIDI2Piano";
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox OutputTxt;
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem importMIDIToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
+        private System.Windows.Forms.OpenFileDialog importDlg;
+        private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem halpToolStripMenuItem;
+    }
+}

tools/midi2piano/midi2piano/Form1.cs

@@ -0,0 +1,298 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+using Sanford.Multimedia;
+using Sanford.Multimedia.Midi;
+
+namespace midi2piano
+{
+    public partial class Form1 : Form
+    {
+        [STAThread]
+        public static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.Run(new Form1());
+        }
+
+        public Form1()
+        {
+            InitializeComponent();
+        }
+
+        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        struct PNote
+        {
+            public float Length;
+            public string Note;
+
+            public PNote(float length, string note)
+            {
+                Length = length;
+                Note = note;
+            }
+
+            public static readonly PNote Default = new PNote(0, "");
+        }
+
+        private void importMIDIToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (importDlg.ShowDialog(this)
+                == System.Windows.Forms.DialogResult.Cancel)
+                return;
+
+            List<PNote> notes = new List<PNote>();
+            PNote curNote = PNote.Default;
+            float tempo = 1;
+            float timeSig = 4f;
+
+            // first, we pull midi data
+            Sequence s = new Sequence(importDlg.FileName);
+
+            // quickly see if there's a piano track first
+            // and get the tempo as well
+            int piano = -1;
+            for (int it = 0; it < s.Count; it++)
+            {
+                Track t = s[it];
+                foreach (MidiEvent me in t.Iterator())
+                {
+                    switch (me.MidiMessage.MessageType)
+                    {
+                        case MessageType.Channel:
+                            {
+                                ChannelMessage m = (ChannelMessage)me.MidiMessage;
+                                if (m.Command == ChannelCommand.ProgramChange)
+                                    if ((GeneralMidiInstrument)m.Data1 == GeneralMidiInstrument.AcousticGrandPiano)
+                                    {
+                                        piano = it;
+                                    }
+                            }
+                            break;
+                        case MessageType.Meta:
+                            {
+                                MetaMessage m = (MetaMessage)me.MidiMessage;
+                                if (m.MetaType == MetaType.Tempo)
+                                    tempo = (new TempoChangeBuilder(m)).Tempo;
+                                else if (m.MetaType == MetaType.TimeSignature)
+                                    timeSig = new TimeSignatureBuilder(m).Denominator;
+                            }
+                            break;
+                    }
+                    if (piano >= 0)
+                        break;
+                }
+                if (piano >= 0)
+                    break;
+            }
+
+            // didn't find one, so just try 0th track anyway
+            if (piano == -1)
+                piano = 0;
+
+            // now, pull all notes (and tempo)
+            // and make sure it's a channel that has content
+            for (int it = piano; it < s.Count; it++)
+            {
+                Track t = s[it];
+
+                int delta = 0;
+                foreach (MidiEvent me in t.Iterator())
+                {
+                    delta += me.DeltaTicks;
+
+                    switch (me.MidiMessage.MessageType)
+                    {
+                        case MessageType.Channel:
+                            {
+                                ChannelMessage m = (ChannelMessage)me.MidiMessage;
+                                switch (m.Command)
+                                {
+                                    case ChannelCommand.NoteOn:
+                                        if (curNote.Note != "")
+                                        {
+                                            curNote.Length = delta / 1000F;
+                                            delta = 0;
+                                            notes.Add(curNote);
+                                        }
+
+                                        curNote.Note = note2Piano(m.Data1);
+                                        break;
+                                }
+                            }
+                            break;
+                        case MessageType.Meta:
+                            {
+                                MetaMessage m = (MetaMessage)me.MidiMessage;
+                                if (m.MetaType == MetaType.Tempo)
+                                    tempo = (new TempoChangeBuilder(m)).Tempo;
+                            }
+                            break;
+                    }
+                }
+
+                // make sure we get last note
+                if (curNote.Note != "")
+                {
+                    curNote.Length = delta / 1000F;
+                    notes.Add(curNote);
+                }
+
+                // we found a track with content!
+                if (notes.Count > 0)
+                    break;
+            }
+
+            // compress redundant accidentals/octaves
+            char[] notemods = new char[7];
+            int[] noteocts = new int[7];
+            for (int i = 0; i < 7; i++)
+            {
+                notemods[i] = 'n';
+                noteocts[i] = 3;
+            }
+            for (int i = 0; i < notes.Count; i++)
+            {
+                string noteStr = notes[i].Note;
+                int cur_note = noteStr[0] - 0x41;
+                char mod = noteStr[1];
+                int oct = int.Parse(noteStr.Substring(2));
+
+                noteStr = noteStr.Substring(0, 1);
+                if (mod != notemods[cur_note])
+                {
+                    noteStr += new string(mod, 1);
+                    notemods[cur_note] = mod;
+                }
+                if (oct != noteocts[cur_note])
+                {
+                    noteStr += oct.ToString();
+                    noteocts[cur_note] = oct;
+                }
+
+                notes[i] = new PNote(notes[i].Length, noteStr);
+            }
+
+            // now, we find what the "beat" length should be,
+            // by counting numbers of times for each length, and finding statistical mode
+            Dictionary<float, int> scores = new Dictionary<float, int>();
+            foreach (PNote n in notes)
+            {
+                if (n.Length != 0)
+                    if (scores.Keys.Contains(n.Length))
+                        scores[n.Length]++;
+                    else
+                        scores.Add(n.Length, 1);
+            }
+            float winner = 1;
+            int score = 0;
+            foreach (KeyValuePair<float, int> kv in scores)
+            {
+                if (kv.Value > score)
+                {
+                    winner = kv.Key;
+                    score = kv.Value;
+                }
+            }
+            // realign all of them to match beat length
+            for (int i = 0; i < notes.Count; i++)
+            {
+                notes[i] = new PNote(notes[i].Length / winner, notes[i].Note);
+            }
+
+            // compress chords down
+            for (int i = 0; i < notes.Count; i++)
+            {
+                if (notes[i].Length == 0 && i < notes.Count - 1)
+                {
+                    notes[i + 1] = new PNote(notes[i + 1].Length, notes[i].Note + "-" + notes[i + 1].Note);
+                    notes.RemoveAt(i);
+                    i--;
+                }
+            }
+
+            // add in time
+            for (int i = 0; i < notes.Count; i++)
+            {
+                float len = notes[i].Length;
+                notes[i] = new PNote(len, notes[i].Note + (len != 1 ? "/" + (1 / len).ToString("0.##") : ""));
+            }
+
+            // what is the bpm, anyway?
+            int rpm = (int)(28800000 / tempo / winner); // 60 * 1,000,000 * .48  the .48 is because note lengths for some reason midi makes the beat note be .48 long
+
+            // now, output!
+            string line = "";
+            string output = "";
+            int lineCount = 1;
+            foreach (PNote n in notes)
+            {
+                if (line.Length + n.Note.Length + 1 > 51)
+                {
+                    output += line.Substring(0, line.Length - 1) + "\r\n";
+                    line = "";
+                    if (lineCount == 50)
+                        break;
+                    lineCount++;
+                }
+                line += n.Note + ",";
+            }
+            if (line.Length > 0)
+                output += line.Substring(0, line.Length - 1);
+            OutputTxt.Text = "BPM: " + rpm.ToString() + "\r\n" + output;
+            OutputTxt.SelectAll();
+        }
+
+        public enum NoteNames
+        {
+            C = 0,
+            D = 2,
+            E = 4,
+            F = 5,
+            G = 7,
+            A = 9,
+            B = 11
+        }
+
+        string note2Piano(int n)
+        {
+            string name, arg, octave;
+            name = Enum.GetName(typeof(NoteNames), (NoteNames)(n % 12));
+            if (name == null)
+            {
+                name = Enum.GetName(typeof(NoteNames), (NoteNames)((n + 1) % 12));
+                arg = "b";
+            }
+            else
+            {
+                arg = "n";
+            }
+            octave = (n / 12 - 1).ToString();
+
+            return name + arg + octave;
+        }
+
+        private void copyToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            OutputTxt.SelectAll();
+            OutputTxt.Copy();
+        }
+
+        private void halpToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            MessageBox.Show(this,
+                "This program prefers MIDIs that have a single track, otherwise it picks the first piano track it finds, else the first track. Songs with odd tempos may have their BPM's calculated wrong.",
+                "Halp", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+    }
+}

tools/midi2piano/midi2piano/Form1.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="importDlg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+</root>

tools/midi2piano/midi2piano/Properties/AssemblyInfo.cs

@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("midi2piano")]
+[assembly: AssemblyProduct("midi2piano")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyCopyright("Copyright ©  2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type. Only Windows
+// assemblies support COM.
+[assembly: ComVisible(false)]
+
+// On Windows, the following GUID is for the ID of the typelib if this
+// project is exposed to COM. On other platforms, it unique identifies the
+// title storage container when deploying this assembly to the device.
+[assembly: Guid("9752c562-edc1-40da-8fa1-619df747e0f3")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]

tools/midi2piano/midi2piano/midi2piano.csproj

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>midi2piano</RootNamespace>
+    <AssemblyName>midi2piano</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Sanford.Multimedia.Midi, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\Sanford.Multimedia.Midi.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Net">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>