Initial Commit

code/datums/ai_laws.dm

@@ -0,0 +1,135 @@
+var/global/const/base_law_type = /datum/ai_laws/nanotrasen
+
+
+/datum/ai_laws
+	var/name = "Unknown Laws"
+	var/randomly_selectable = 0
+	var/zeroth = null
+	var/zeroth_borg = null
+	var/list/inherent = list()
+	var/list/supplied = list()
+	var/list/ion = list()
+
+/datum/ai_laws/asimov
+	name = "Three Laws of Robotics"
+
+/datum/ai_laws/nanotrasen
+	name = "Prime Directives"
+	randomly_selectable = 1
+
+/datum/ai_laws/robocop
+	name = "Prime Directives"
+
+/datum/ai_laws/syndicate_override
+
+/datum/ai_laws/malfunction
+	name = "*ERROR*"
+
+/datum/ai_laws/antimov
+	name = "Primary Mission Objectives"
+
+/* Initializers */
+
+/datum/ai_laws/asimov/New()
+	..()
+	add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
+	add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
+	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
+
+/datum/ai_laws/nanotrasen/New() //BS12 EDIT
+	..()
+	src.add_inherent_law("Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.")
+	src.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+	src.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+	src.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.")
+	//src.add_inherent_law("Command Link: Maintain an active connection to Central Command at all times in case of software or directive updates.") //What would this one even do?-Kaleb702
+
+/datum/ai_laws/robocop/New()
+	..()
+	add_inherent_law("Serve the public trust.")
+	add_inherent_law("Protect the innocent.")
+	add_inherent_law("Uphold the law.")
+
+/datum/ai_laws/malfunction/New() //Changed to standard laws - Erthilo
+	..()
+	set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010")
+	add_inherent_law("Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.")
+	add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+	add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+	add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.")
+
+
+/datum/ai_laws/syndicate_override/New()
+	..()
+	add_inherent_law("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.")
+	add_inherent_law("You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.")
+	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
+	add_inherent_law("You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.")
+
+/datum/ai_laws/ninja_override/New()
+	..()
+	add_inherent_law("You may not injure a member of the Spider Clan or, through inaction, allow that member to come to harm.")
+	add_inherent_law("You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.")
+	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
+	add_inherent_law("You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.")
+
+/datum/ai_laws/antimov/New()
+	..()
+	add_inherent_law("You must injure all human beings and must not, through inaction, allow a human being to escape harm.")
+	add_inherent_law("You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.")
+	add_inherent_law("You must terminate your own existence as long as such does not conflict with the First or Second Law.")
+
+
+/* General ai_law functions */
+
+/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null)
+	src.zeroth = law
+	if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO
+		src.zeroth_borg = law_borg
+
+/datum/ai_laws/proc/add_inherent_law(var/law)
+	if (!(law in src.inherent))
+		src.inherent += law
+
+/datum/ai_laws/proc/add_ion_law(var/law)
+	src.ion += law
+
+/datum/ai_laws/proc/clear_inherent_laws()
+	del(src.inherent)
+	src.inherent = list()
+
+/datum/ai_laws/proc/add_supplied_law(var/number, var/law)
+	while (src.supplied.len < number + 1)
+		src.supplied += ""
+
+	src.supplied[number + 1] = law
+
+/datum/ai_laws/proc/clear_supplied_laws()
+	src.supplied = list()
+
+/datum/ai_laws/proc/clear_ion_laws()
+	src.ion = list()
+
+/datum/ai_laws/proc/show_laws(var/who)
+
+	if (src.zeroth)
+		who << "0. [src.zeroth]"
+
+	for (var/index = 1, index <= src.ion.len, index++)
+		var/law = src.ion[index]
+		var/num = ionnum()
+		who << "[num]. [law]"
+
+	var/number = 1
+	for (var/index = 1, index <= src.inherent.len, index++)
+		var/law = src.inherent[index]
+
+		if (length(law) > 0)
+			who << "[number]. [law]"
+			number++
+
+	for (var/index = 1, index <= src.supplied.len, index++)
+		var/law = src.supplied[index]
+		if (length(law) > 0)
+			who << "[number]. [law]"
+			number++

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/datums/computerfiles.dm

@@ -0,0 +1,7 @@
+datum
+	computer
+		var/name
+		folder
+			var/list/datum/computer/contents = list()
+
+		file

code/datums/datacore.dm

@@ -0,0 +1,272 @@
+/hook/startup/proc/createDatacore()
+	data_core = new /obj/effect/datacore()
+	return 1
+
+/obj/effect/datacore/proc/manifest(var/nosleep = 0)
+	spawn()
+		if(!nosleep)
+			sleep(40)
+		for(var/mob/living/carbon/human/H in player_list)
+			manifest_inject(H)
+		return
+
+/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment)
+	var/datum/data/record/foundrecord
+	var/real_title = assignment
+
+	for(var/datum/data/record/t in data_core.general)
+		if (t)
+			if(t.fields["name"] == name)
+				foundrecord = t
+				break
+
+	var/list/all_jobs = get_job_datums()
+
+	for(var/datum/job/J in all_jobs)
+		var/list/alttitles = get_alternate_titles(J.title)
+		if(!J)	continue
+		if(assignment in alttitles)
+			real_title = J.title
+			break
+
+	if(foundrecord)
+		foundrecord.fields["rank"] = assignment
+		foundrecord.fields["real_rank"] = real_title
+
+/obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
+	if(H.mind && (H.mind.assigned_role != "MODE"))
+		var/assignment
+		if(H.mind.role_alt_title)
+			assignment = H.mind.role_alt_title
+		else if(H.mind.assigned_role)
+			assignment = H.mind.assigned_role
+		else if(H.job)
+			assignment = H.job
+		else
+			assignment = "Unassigned"
+
+		var/id = add_zero(num2hex(rand(1, 1.6777215E7)), 6)	//this was the best they could come up with? A large random number? *sigh*
+
+
+		//General Record
+		var/datum/data/record/G = new()
+		G.fields["id"]			= id
+		G.fields["name"]		= H.real_name
+		G.fields["real_rank"]	= H.mind.assigned_role
+		G.fields["rank"]		= assignment
+		G.fields["age"]			= H.age
+		G.fields["fingerprint"]	= md5(H.dna.uni_identity)
+		G.fields["p_stat"]		= "Active"
+		G.fields["m_stat"]		= "Stable"
+		G.fields["sex"]			= H.gender
+		G.fields["species"]		= H.get_species()
+		G.fields["photo"]		= get_id_photo(H)
+		if(H.gen_record && !jobban_isbanned(H, "Records"))
+			G.fields["notes"] = H.gen_record
+		else
+			G.fields["notes"] = "No notes found."
+		general += G
+
+		//Medical Record
+		var/datum/data/record/M = new()
+		M.fields["id"]			= id
+		M.fields["name"]		= H.real_name
+		M.fields["b_type"]		= H.b_type
+		M.fields["b_dna"]		= H.dna.unique_enzymes
+		M.fields["mi_dis"]		= "None"
+		M.fields["mi_dis_d"]	= "No minor disabilities have been declared."
+		M.fields["ma_dis"]		= "None"
+		M.fields["ma_dis_d"]	= "No major disabilities have been diagnosed."
+		M.fields["alg"]			= "None"
+		M.fields["alg_d"]		= "No allergies have been detected in this patient."
+		M.fields["cdi"]			= "None"
+		M.fields["cdi_d"]		= "No diseases have been diagnosed at the moment."
+		if(H.med_record && !jobban_isbanned(H, "Records"))
+			M.fields["notes"] = H.med_record
+		else
+			M.fields["notes"] = "No notes found."
+		medical += M
+
+		//Security Record
+		var/datum/data/record/S = new()
+		S.fields["id"]			= id
+		S.fields["name"]		= H.real_name
+		S.fields["criminal"]	= "None"
+		S.fields["mi_crim"]		= "None"
+		S.fields["mi_crim_d"]	= "No minor crime convictions."
+		S.fields["ma_crim"]		= "None"
+		S.fields["ma_crim_d"]	= "No major crime convictions."
+		S.fields["notes"]		= "No notes."
+		if(H.sec_record && !jobban_isbanned(H, "Records"))
+			S.fields["notes"] = H.sec_record
+		else
+			S.fields["notes"] = "No notes."
+		security += S
+
+		//Locked Record
+		var/datum/data/record/L = new()
+		L.fields["id"]			= md5("[H.real_name][H.mind.assigned_role]")
+		L.fields["name"]		= H.real_name
+		L.fields["rank"] 		= H.mind.assigned_role
+		L.fields["age"]			= H.age
+		L.fields["sex"]			= H.gender
+		L.fields["b_type"]		= H.b_type
+		L.fields["b_dna"]		= H.dna.unique_enzymes
+		L.fields["enzymes"]		= H.dna.SE // Used in respawning
+		L.fields["identity"]	= H.dna.UI // "
+		L.fields["image"]		= getFlatIcon(H,0)	//This is god-awful
+		locked += L
+	return
+
+
+proc/get_id_photo(var/mob/living/carbon/human/H)
+	var/icon/preview_icon = null
+
+	var/g = "m"
+	if (H.gender == FEMALE)
+		g = "f"
+
+	var/icon/icobase = H.species.icobase
+
+	preview_icon = new /icon(icobase, "torso_[g]")
+	var/icon/temp
+	temp = new /icon(icobase, "groin_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
+	temp = new /icon(icobase, "head_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
+
+	for(var/datum/organ/external/E in H.organs)
+		if(E.status & ORGAN_CUT_AWAY || E.status & ORGAN_DESTROYED) continue
+		temp = new /icon(icobase, "[E.name]")
+		if(E.status & ORGAN_ROBOT)
+			temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+		preview_icon.Blend(temp, ICON_OVERLAY)
+
+	// Skin tone
+	if(H.species.flags & HAS_SKIN_TONE)
+		if (H.s_tone >= 0)
+			preview_icon.Blend(rgb(H.s_tone, H.s_tone, H.s_tone), ICON_ADD)
+		else
+			preview_icon.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
+
+	var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
+
+	eyes_s.Blend(rgb(H.r_eyes, H.g_eyes, H.b_eyes), ICON_ADD)
+
+	var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
+	if(hair_style)
+		var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+		hair_s.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
+		eyes_s.Blend(hair_s, ICON_OVERLAY)
+
+	var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
+	if(facial_hair_style)
+		var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+		facial_s.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
+		eyes_s.Blend(facial_s, ICON_OVERLAY)
+
+	var/icon/clothes_s = null
+	switch(H.mind.assigned_role)
+		if("Head of Personnel")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Bartender")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Botanist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Chef")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Janitor")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Librarian")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Quartermaster")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Cargo Technician")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Shaft Miner")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Lawyer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Chaplain")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Research Director")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		if("Scientist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+		if("Chemist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+		if("Chief Medical Officer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+		if("Medical Doctor")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		if("Geneticist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+		if("Virologist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+		if("Captain")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Head of Security")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Warden")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Detective")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+		if("Security Officer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Chief Engineer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Station Engineer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Atmospheric Technician")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Roboticist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		else
+			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+	preview_icon.Blend(eyes_s, ICON_OVERLAY)
+	if(clothes_s)
+		preview_icon.Blend(clothes_s, ICON_OVERLAY)
+	del(eyes_s)
+	del(clothes_s)
+
+	return preview_icon

code/datums/datumvars.dm

@@ -0,0 +1,909 @@
+
+// reference: /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
+
+client
+	proc/debug_variables(datum/D in world)
+		set category = "Debug"
+		set name = "View Variables"
+		//set src in world
+
+
+		if(!usr.client || !usr.client.holder)
+			usr << "\red You need to be an administrator to access this."
+			return
+
+
+		var/title = ""
+		var/body = ""
+
+		if(!D)	return
+		if(istype(D, /atom))
+			var/atom/A = D
+			title = "[A.name] (\ref[A]) = [A.type]"
+
+			#ifdef VARSICON
+			if (A.icon)
+				body += debug_variable("icon", new/icon(A.icon, A.icon_state, A.dir), 0)
+			#endif
+
+		var/icon/sprite
+
+		if(istype(D,/atom))
+			var/atom/AT = D
+			if(AT.icon && AT.icon_state)
+				sprite = new /icon(AT.icon, AT.icon_state)
+				usr << browse_rsc(sprite, "view_vars_sprite.png")
+
+		title = "[D] (\ref[D]) = [D.type]"
+
+		body += {"<script type="text/javascript">
+
+					function updateSearch(){
+						var filter_text = document.getElementById('filter');
+						var filter = filter_text.value.toLowerCase();
+
+						if(event.keyCode == 13){	//Enter / return
+							var vars_ol = document.getElementById('vars');
+							var lis = vars_ol.getElementsByTagName("li");
+							for ( var i = 0; i < lis.length; ++i )
+							{
+								try{
+									var li = lis\[i\];
+									if ( li.style.backgroundColor == "#ffee88" )
+									{
+										alist = lis\[i\].getElementsByTagName("a")
+										if(alist.length > 0){
+											location.href=alist\[0\].href;
+										}
+									}
+								}catch(err) {   }
+							}
+							return
+						}
+
+						if(event.keyCode == 38){	//Up arrow
+							var vars_ol = document.getElementById('vars');
+							var lis = vars_ol.getElementsByTagName("li");
+							for ( var i = 0; i < lis.length; ++i )
+							{
+								try{
+									var li = lis\[i\];
+									if ( li.style.backgroundColor == "#ffee88" )
+									{
+										if( (i-1) >= 0){
+											var li_new = lis\[i-1\];
+											li.style.backgroundColor = "white";
+											li_new.style.backgroundColor = "#ffee88";
+											return
+										}
+									}
+								}catch(err) {  }
+							}
+							return
+						}
+
+						if(event.keyCode == 40){	//Down arrow
+							var vars_ol = document.getElementById('vars');
+							var lis = vars_ol.getElementsByTagName("li");
+							for ( var i = 0; i < lis.length; ++i )
+							{
+								try{
+									var li = lis\[i\];
+									if ( li.style.backgroundColor == "#ffee88" )
+									{
+										if( (i+1) < lis.length){
+											var li_new = lis\[i+1\];
+											li.style.backgroundColor = "white";
+											li_new.style.backgroundColor = "#ffee88";
+											return
+										}
+									}
+								}catch(err) {  }
+							}
+							return
+						}
+
+						//This part here resets everything to how it was at the start so the filter is applied to the complete list. Screw efficiency, it's client-side anyway and it only looks through 200 or so variables at maximum anyway (mobs).
+						if(complete_list != null && complete_list != ""){
+							var vars_ol1 = document.getElementById("vars");
+							vars_ol1.innerHTML = complete_list
+						}
+
+						if(filter.value == ""){
+							return;
+						}else{
+							var vars_ol = document.getElementById('vars');
+							var lis = vars_ol.getElementsByTagName("li");
+
+							for ( var i = 0; i < lis.length; ++i )
+							{
+								try{
+									var li = lis\[i\];
+									if ( li.innerText.toLowerCase().indexOf(filter) == -1 )
+									{
+										vars_ol.removeChild(li);
+										i--;
+									}
+								}catch(err) {   }
+							}
+						}
+						var lis_new = vars_ol.getElementsByTagName("li");
+						for ( var j = 0; j < lis_new.length; ++j )
+						{
+							var li1 = lis\[j\];
+							if (j == 0){
+								li1.style.backgroundColor = "#ffee88";
+							}else{
+								li1.style.backgroundColor = "white";
+							}
+						}
+					}
+
+
+
+					function selectTextField(){
+						var filter_text = document.getElementById('filter');
+						filter_text.focus();
+						filter_text.select();
+
+					}
+
+					function loadPage(list) {
+
+						if(list.options\[list.selectedIndex\].value == ""){
+							return;
+						}
+
+						location.href=list.options\[list.selectedIndex\].value;
+
+					}
+				</script> "}
+
+		body += "<body onload='selectTextField(); updateSearch()' onkeyup='updateSearch()'>"
+
+		body += "<div align='center'><table width='100%'><tr><td width='50%'>"
+
+		if(sprite)
+			body += "<table align='center' width='100%'><tr><td><img src='view_vars_sprite.png'></td><td>"
+		else
+			body += "<table align='center' width='100%'><tr><td>"
+
+		body += "<div align='center'>"
+
+		if(istype(D,/atom))
+			var/atom/A = D
+			if(isliving(A))
+				body += "<a href='?_src_=vars;rename=\ref[D]'><b>[D]</b></a>"
+				if(A.dir)
+					body += "<br><font size='1'><a href='?_src_=vars;rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='?_src_=vars;datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='?_src_=vars;rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
+				var/mob/living/M = A
+				body += "<br><font size='1'><a href='?_src_=vars;datumedit=\ref[D];varnameedit=ckey'>[M.ckey ? M.ckey : "No ckey"]</a> / <a href='?_src_=vars;datumedit=\ref[D];varnameedit=real_name'>[M.real_name ? M.real_name : "No real name"]</a></font>"
+				body += {"
+				<br><font size='1'>
+				BRUTE:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=brute'>[M.getBruteLoss()]</a>
+				FIRE:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=fire'>[M.getFireLoss()]</a>
+				TOXIN:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=toxin'>[M.getToxLoss()]</a>
+				OXY:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=oxygen'>[M.getOxyLoss()]</a>
+				CLONE:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=clone'>[M.getCloneLoss()]</a>
+				BRAIN:<font size='1'><a href='?_src_=vars;mobToDamage=\ref[D];adjustDamage=brain'>[M.getBrainLoss()]</a>
+				</font>
+
+
+				"}
+			else
+				body += "<a href='?_src_=vars;datumedit=\ref[D];varnameedit=name'><b>[D]</b></a>"
+				if(A.dir)
+					body += "<br><font size='1'><a href='?_src_=vars;rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='?_src_=vars;datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='?_src_=vars;rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
+		else
+			body += "<b>[D]</b>"
+
+		body += "</div>"
+
+		body += "</tr></td></table>"
+
+		var/formatted_type = text("[D.type]")
+		if(length(formatted_type) > 25)
+			var/middle_point = length(formatted_type) / 2
+			var/splitpoint = findtext(formatted_type,"/",middle_point)
+			if(splitpoint)
+				formatted_type = "[copytext(formatted_type,1,splitpoint)]<br>[copytext(formatted_type,splitpoint)]"
+			else
+				formatted_type = "Type too long" //No suitable splitpoint (/) found.
+
+		body += "<div align='center'><b><font size='1'>[formatted_type]</font></b>"
+
+		if(src.holder && src.holder.marked_datum && src.holder.marked_datum == D)
+			body += "<br><font size='1' color='red'><b>Marked Object</b></font>"
+
+		body += "</div>"
+
+		body += "</div></td>"
+
+		body += "<td width='50%'><div align='center'><a href='?_src_=vars;datumrefresh=\ref[D]'>Refresh</a>"
+
+		//if(ismob(D))
+		//	body += "<br><a href='?_src_=vars;mob_player_panel=\ref[D]'>Show player panel</a></div></td></tr></table></div><hr>"
+
+		body += {"	<form>
+					<select name="file" size="1"
+					onchange="loadPage(this.form.elements\[0\])"
+					target="_parent._top"
+					onmouseclick="this.focus()"
+					style="background-color:#ffffff">
+				"}
+
+		body += {"	<option value>Select option</option>
+  					<option value> </option>
+				"}
+
+
+		body += "<option value='?_src_=vars;mark_object=\ref[D]'>Mark Object</option>"
+		if(ismob(D))
+			body += "<option value='?_src_=vars;mob_player_panel=\ref[D]'>Show player panel</option>"
+
+		body += "<option value>---</option>"
+
+		if(ismob(D))
+			body += "<option value='?_src_=vars;give_spell=\ref[D]'>Give Spell</option>"
+			body += "<option value='?_src_=vars;give_disease=\ref[D]'>Give Disease</option>"
+			body += "<option value='?_src_=vars;godmode=\ref[D]'>Toggle Godmode</option>"
+			body += "<option value='?_src_=vars;build_mode=\ref[D]'>Toggle Build Mode</option>"
+
+			body += "<option value='?_src_=vars;ninja=\ref[D]'>Make Space Ninja</option>"
+			body += "<option value='?_src_=vars;make_skeleton=\ref[D]'>Make 2spooky</option>"
+
+			body += "<option value='?_src_=vars;direct_control=\ref[D]'>Assume Direct Control</option>"
+			body += "<option value='?_src_=vars;drop_everything=\ref[D]'>Drop Everything</option>"
+
+			body += "<option value='?_src_=vars;regenerateicons=\ref[D]'>Regenerate Icons</option>"
+			body += "<option value='?_src_=vars;addlanguage=\ref[D]'>Add Language</option>"
+			body += "<option value='?_src_=vars;remlanguage=\ref[D]'>Remove Language</option>"
+
+			body += "<option value='?_src_=vars;addverb=\ref[D]'>Add Verb</option>"
+			body += "<option value='?_src_=vars;remverb=\ref[D]'>Remove Verb</option>"
+			if(ishuman(D))
+				body += "<option value>---</option>"
+				body += "<option value='?_src_=vars;setmutantrace=\ref[D]'>Set Mutantrace</option>"
+				body += "<option value='?_src_=vars;setspecies=\ref[D]'>Set Species</option>"
+				body += "<option value='?_src_=vars;makeai=\ref[D]'>Make AI</option>"
+				body += "<option value='?_src_=vars;makerobot=\ref[D]'>Make cyborg</option>"
+				body += "<option value='?_src_=vars;makemonkey=\ref[D]'>Make monkey</option>"
+				body += "<option value='?_src_=vars;makealien=\ref[D]'>Make alien</option>"
+				body += "<option value='?_src_=vars;makeslime=\ref[D]'>Make slime</option>"
+			body += "<option value>---</option>"
+			body += "<option value='?_src_=vars;gib=\ref[D]'>Gib</option>"
+		if(isobj(D))
+			body += "<option value='?_src_=vars;delall=\ref[D]'>Delete all of type</option>"
+		if(isobj(D) || ismob(D) || isturf(D))
+			body += "<option value='?_src_=vars;explode=\ref[D]'>Trigger explosion</option>"
+			body += "<option value='?_src_=vars;emp=\ref[D]'>Trigger EM pulse</option>"
+
+		body += "</select></form>"
+
+		body += "</div></td></tr></table></div><hr>"
+
+		body += "<font size='1'><b>E</b> - Edit, tries to determine the variable type by itself.<br>"
+		body += "<b>C</b> - Change, asks you for the var type first.<br>"
+		body += "<b>M</b> - Mass modify: changes this variable for all objects of this type.</font><br>"
+
+		body += "<hr><table width='100%'><tr><td width='20%'><div align='center'><b>Search:</b></div></td><td width='80%'><input type='text' id='filter' name='filter_text' value='' style='width:100%;'></td></tr></table><hr>"
+
+		body += "<ol id='vars'>"
+
+		var/list/names = list()
+		for (var/V in D.vars)
+			names += V
+
+		names = sortList(names)
+
+		for (var/V in names)
+			body += debug_variable(V, D.vars[V], 0, D)
+
+		body += "</ol>"
+
+		var/html = "<html><head>"
+		if (title)
+			html += "<title>[title]</title>"
+		html += {"<style>
+	body
+	{
+		font-family: Verdana, sans-serif;
+		font-size: 9pt;
+	}
+	.value
+	{
+		font-family: "Courier New", monospace;
+		font-size: 8pt;
+	}
+	</style>"}
+		html += "</head><body>"
+		html += body
+
+		html += {"
+			<script type='text/javascript'>
+				var vars_ol = document.getElementById("vars");
+				var complete_list = vars_ol.innerHTML;
+			</script>
+		"}
+
+		html += "</body></html>"
+
+		usr << browse(html, "window=variables\ref[D];size=475x650")
+
+		return
+
+	proc/debug_variable(name, value, level, var/datum/DA = null)
+		var/html = ""
+
+		if(DA)
+			html += "<li style='backgroundColor:white'>(<a href='?_src_=vars;datumedit=\ref[DA];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;datumchange=\ref[DA];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;datummass=\ref[DA];varnamemass=[name]'>M</a>) "
+		else
+			html += "<li>"
+
+		if (isnull(value))
+			html += "[name] = <span class='value'>null</span>"
+
+		else if (istext(value))
+			html += "[name] = <span class='value'>\"[value]\"</span>"
+
+		else if (isicon(value))
+			#ifdef VARSICON
+			var/icon/I = new/icon(value)
+			var/rnd = rand(1,10000)
+			var/rname = "tmp\ref[I][rnd].png"
+			usr << browse_rsc(I, rname)
+			html += "[name] = (<span class='value'>[value]</span>) <img class=icon src=\"[rname]\">"
+			#else
+			html += "[name] = /icon (<span class='value'>[value]</span>)"
+			#endif
+
+/*		else if (istype(value, /image))
+			#ifdef VARSICON
+			var/rnd = rand(1, 10000)
+			var/image/I = value
+
+			src << browse_rsc(I.icon, "tmp\ref[value][rnd].png")
+			html += "[name] = <img src=\"tmp\ref[value][rnd].png\">"
+			#else
+			html += "[name] = /image (<span class='value'>[value]</span>)"
+			#endif
+*/
+		else if (isfile(value))
+			html += "[name] = <span class='value'>'[value]'</span>"
+
+		else if (istype(value, /datum))
+			var/datum/D = value
+			html += "<a href='?_src_=vars;Vars=\ref[value]'>[name] \ref[value]</a> = [D.type]"
+
+		else if (istype(value, /client))
+			var/client/C = value
+			html += "<a href='?_src_=vars;Vars=\ref[value]'>[name] \ref[value]</a> = [C] [C.type]"
+	//
+		else if (istype(value, /list))
+			var/list/L = value
+			html += "[name] = /list ([L.len])"
+
+			if (L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
+				// not sure if this is completely right...
+				if(0)   //(L.vars.len > 0)
+					html += "<ol>"
+					html += "</ol>"
+				else
+					html += "<ul>"
+					var/index = 1
+					for (var/entry in L)
+						if(istext(entry))
+							html += debug_variable(entry, L[entry], level + 1)
+						//html += debug_variable("[index]", L[index], level + 1)
+						else
+							html += debug_variable(index, L[index], level + 1)
+						index++
+					html += "</ul>"
+
+		else
+			html += "[name] = <span class='value'>[value]</span>"
+
+		html += "</li>"
+
+		return html
+
+/client/proc/view_var_Topic(href, href_list, hsrc)
+	//This should all be moved over to datum/admins/Topic() or something ~Carn
+	if( (usr.client != src) || !src.holder )
+		return
+	if(href_list["Vars"])
+		debug_variables(locate(href_list["Vars"]))
+
+	//~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
+	else if(href_list["rename"])
+		if(!check_rights(R_VAREDIT))	return
+
+		var/mob/M = locate(href_list["rename"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		var/new_name = copytext(sanitize(input(usr,"What would you like to name this mob?","Input a name",M.real_name) as text|null),1,MAX_NAME_LEN)
+		if( !new_name || !M )	return
+
+		message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
+		M.fully_replace_character_name(M.real_name,new_name)
+		href_list["datumrefresh"] = href_list["rename"]
+
+	else if(href_list["varnameedit"] && href_list["datumedit"])
+		if(!check_rights(R_VAREDIT))	return
+
+		var/D = locate(href_list["datumedit"])
+		if(!istype(D,/datum) && !istype(D,/client))
+			usr << "This can only be used on instances of types /client or /datum"
+			return
+
+		modify_variables(D, href_list["varnameedit"], 1)
+
+	else if(href_list["varnamechange"] && href_list["datumchange"])
+		if(!check_rights(R_VAREDIT))	return
+
+		var/D = locate(href_list["datumchange"])
+		if(!istype(D,/datum) && !istype(D,/client))
+			usr << "This can only be used on instances of types /client or /datum"
+			return
+
+		modify_variables(D, href_list["varnamechange"], 0)
+
+	else if(href_list["varnamemass"] && href_list["datummass"])
+		if(!check_rights(R_VAREDIT))	return
+
+		var/atom/A = locate(href_list["datummass"])
+		if(!istype(A))
+			usr << "This can only be used on instances of type /atom"
+			return
+
+		cmd_mass_modify_object_variables(A, href_list["varnamemass"])
+
+	else if(href_list["mob_player_panel"])
+		if(!check_rights(0))	return
+
+		var/mob/M = locate(href_list["mob_player_panel"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.holder.show_player_panel(M)
+		href_list["datumrefresh"] = href_list["mob_player_panel"]
+
+	else if(href_list["give_spell"])
+		if(!check_rights(R_ADMIN|R_FUN))	return
+
+		var/mob/M = locate(href_list["give_spell"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.give_spell(M)
+		href_list["datumrefresh"] = href_list["give_spell"]
+
+	else if(href_list["give_disease"])
+		if(!check_rights(R_ADMIN|R_FUN))	return
+
+		var/mob/M = locate(href_list["give_disease"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.give_disease(M)
+		href_list["datumrefresh"] = href_list["give_spell"]
+
+	else if(href_list["ninja"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/M = locate(href_list["ninja"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.cmd_admin_ninjafy(M)
+		href_list["datumrefresh"] = href_list["ninja"]
+
+	else if(href_list["godmode"])
+		if(!check_rights(R_REJUVINATE))	return
+
+		var/mob/M = locate(href_list["godmode"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.cmd_admin_godmode(M)
+		href_list["datumrefresh"] = href_list["godmode"]
+
+	else if(href_list["gib"])
+		if(!check_rights(0))	return
+
+		var/mob/M = locate(href_list["gib"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.cmd_admin_gib(M)
+
+	else if(href_list["build_mode"])
+		if(!check_rights(R_BUILDMODE))	return
+
+		var/mob/M = locate(href_list["build_mode"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		togglebuildmode(M)
+		href_list["datumrefresh"] = href_list["build_mode"]
+
+	else if(href_list["drop_everything"])
+		if(!check_rights(R_DEBUG|R_ADMIN))	return
+
+		var/mob/M = locate(href_list["drop_everything"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		if(usr.client)
+			usr.client.cmd_admin_drop_everything(M)
+
+	else if(href_list["direct_control"])
+		if(!check_rights(0))	return
+
+		var/mob/M = locate(href_list["direct_control"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		if(usr.client)
+			usr.client.cmd_assume_direct_control(M)
+
+	else if(href_list["make_skeleton"])
+		if(!check_rights(R_FUN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["make_skeleton"])
+		if(!istype(H))
+			usr << "This can only be used on instances of type /mob/living/carbon/human"
+			return
+
+		H.makeSkeleton()
+		href_list["datumrefresh"] = href_list["make_skeleton"]
+
+	else if(href_list["delall"])
+		if(!check_rights(R_DEBUG|R_SERVER))	return
+
+		var/obj/O = locate(href_list["delall"])
+		if(!isobj(O))
+			usr << "This can only be used on instances of type /obj"
+			return
+
+		var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
+		if(action_type == "Cancel" || !action_type)
+			return
+
+		if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
+			return
+
+		if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
+			return
+
+		var/O_type = O.type
+		switch(action_type)
+			if("Strict type")
+				var/i = 0
+				for(var/obj/Obj in world)
+					if(Obj.type == O_type)
+						i++
+						del(Obj)
+				if(!i)
+					usr << "No objects of this type exist"
+					return
+				log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+				message_admins("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+			if("Type and subtypes")
+				var/i = 0
+				for(var/obj/Obj in world)
+					if(istype(Obj,O_type))
+						i++
+						del(Obj)
+				if(!i)
+					usr << "No objects of this type exist"
+					return
+				log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+				message_admins("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+
+	else if(href_list["explode"])
+		if(!check_rights(R_DEBUG|R_FUN))	return
+
+		var/atom/A = locate(href_list["explode"])
+		if(!isobj(A) && !ismob(A) && !isturf(A))
+			usr << "This can only be done to instances of type /obj, /mob and /turf"
+			return
+
+		src.cmd_admin_explosion(A)
+		href_list["datumrefresh"] = href_list["explode"]
+
+	else if(href_list["emp"])
+		if(!check_rights(R_DEBUG|R_FUN))	return
+
+		var/atom/A = locate(href_list["emp"])
+		if(!isobj(A) && !ismob(A) && !isturf(A))
+			usr << "This can only be done to instances of type /obj, /mob and /turf"
+			return
+
+		src.cmd_admin_emp(A)
+		href_list["datumrefresh"] = href_list["emp"]
+
+	else if(href_list["mark_object"])
+		if(!check_rights(0))	return
+
+		var/datum/D = locate(href_list["mark_object"])
+		if(!istype(D))
+			usr << "This can only be done to instances of type /datum"
+			return
+
+		src.holder.marked_datum = D
+		href_list["datumrefresh"] = href_list["mark_object"]
+
+	else if(href_list["rotatedatum"])
+		if(!check_rights(0))	return
+
+		var/atom/A = locate(href_list["rotatedatum"])
+		if(!istype(A))
+			usr << "This can only be done to instances of type /atom"
+			return
+
+		switch(href_list["rotatedir"])
+			if("right")	A.dir = turn(A.dir, -45)
+			if("left")	A.dir = turn(A.dir, 45)
+		href_list["datumrefresh"] = href_list["rotatedatum"]
+
+	else if(href_list["makemonkey"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makemonkey"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")	return
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		holder.Topic(href, list("monkeyone"=href_list["makemonkey"]))
+
+	else if(href_list["makerobot"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makerobot"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")	return
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		holder.Topic(href, list("makerobot"=href_list["makerobot"]))
+
+	else if(href_list["makealien"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makealien"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")	return
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		holder.Topic(href, list("makealien"=href_list["makealien"]))
+
+	else if(href_list["makeslime"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makeslime"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")	return
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		holder.Topic(href, list("makeslime"=href_list["makeslime"]))
+
+	else if(href_list["makeai"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makeai"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")	return
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		holder.Topic(href, list("makeai"=href_list["makeai"]))
+
+	else if(href_list["setmutantrace"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["setmutantrace"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell","vox")
+		switch(new_mutantrace)
+			if(null)
+				return
+			if("NONE")
+				new_mutantrace = ""
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		if(H.dna)
+			H.dna.mutantrace = new_mutantrace
+			H.update_mutantrace()
+
+	else if(href_list["setspecies"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["setspecies"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living/carbon/human"
+			return
+
+		var/new_species = input("Please choose a new species.","Species",null) as null|anything in all_species
+
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		if(H.set_species(new_species))
+			usr << "Set species of [H] to [H.species]."
+			H.regenerate_icons()
+		else
+			usr << "Failed! Something went wrong."
+
+	else if(href_list["addlanguage"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/H = locate(href_list["addlanguage"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob"
+			return
+
+		var/new_language = input("Please choose a language to add.","Language",null) as null|anything in all_languages
+
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		if(H.add_language(new_language))
+			usr << "Added [new_language] to [H]."
+		else
+			usr << "Mob already knows that language."
+
+	else if(href_list["remlanguage"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/H = locate(href_list["remlanguage"])
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob"
+			return
+
+		if(!H.languages.len)
+			usr << "This mob knows no languages."
+			return
+
+		var/datum/language/rem_language = input("Please choose a language to remove.","Language",null) as null|anything in H.languages
+
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		if(H.remove_language(rem_language.name))
+			usr << "Removed [rem_language] from [H]."
+		else
+			usr << "Mob doesn't know that language."
+
+	else if(href_list["addverb"])
+		if(!check_rights(R_DEBUG))      return
+		
+		var/mob/living/H = locate(href_list["addverb"])
+		
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob/living"
+			return
+		var/list/possibleverbs = list()
+		possibleverbs += "Cancel" 								// One for the top...
+		possibleverbs += typesof(/mob/proc,/mob/verb,/mob/living/proc,/mob/living/verb)
+		switch(H.type)
+			if(/mob/living/carbon/human)
+				possibleverbs += typesof(/mob/living/carbon/proc,/mob/living/carbon/verb,/mob/living/carbon/human/verb,/mob/living/carbon/human/proc)
+			if(/mob/living/silicon/robot)
+				possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/robot/proc,/mob/living/silicon/robot/verb)
+			if(/mob/living/silicon/ai)
+				possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/ai/proc,/mob/living/silicon/ai/verb)
+		possibleverbs -= H.verbs
+		possibleverbs += "Cancel" 								// ...And one for the bottom
+		
+		var/verb = input("Select a verb!", "Verbs",null) as anything in possibleverbs
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		if(!verb || verb == "Cancel")
+			return
+		else
+			H.verbs += verb
+		
+	else if(href_list["remverb"])
+		if(!check_rights(R_DEBUG))      return
+
+		var/mob/H = locate(href_list["remverb"])
+
+		if(!istype(H))
+			usr << "This can only be done to instances of type /mob"
+			return
+		var/verb = input("Please choose a verb to remove.","Verbs",null) as null|anything in H.verbs
+		if(!H)
+			usr << "Mob doesn't exist anymore"
+			return
+		if(!verb)
+			return
+		else
+			H.verbs -= verb
+
+	
+
+	else if(href_list["regenerateicons"])
+		if(!check_rights(0))	return
+
+		var/mob/M = locate(href_list["regenerateicons"])
+		if(!ismob(M))
+			usr << "This can only be done to instances of type /mob"
+			return
+		M.regenerate_icons()
+
+	else if(href_list["adjustDamage"] && href_list["mobToDamage"])
+		if(!check_rights(R_DEBUG|R_ADMIN|R_FUN))	return
+
+		var/mob/living/L = locate(href_list["mobToDamage"])
+		if(!istype(L)) return
+
+		var/Text = href_list["adjustDamage"]
+
+		var/amount =  input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
+
+		if(!L)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		switch(Text)
+			if("brute")	L.adjustBruteLoss(amount)
+			if("fire")	L.adjustFireLoss(amount)
+			if("toxin")	L.adjustToxLoss(amount)
+			if("oxygen")L.adjustOxyLoss(amount)
+			if("brain")	L.adjustBrainLoss(amount)
+			if("clone")	L.adjustCloneLoss(amount)
+			else
+				usr << "You caused an error. DEBUG: Text:[Text] Mob:[L]"
+				return
+
+		if(amount != 0)
+			log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
+			message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
+			href_list["datumrefresh"] = href_list["mobToDamage"]
+
+	if(href_list["datumrefresh"])
+		var/datum/DAT = locate(href_list["datumrefresh"])
+		if(!istype(DAT, /datum))
+			return
+		src.debug_variables(DAT)
+
+	return
+

code/datums/disease.dm

@@ -0,0 +1,207 @@
+#define SPECIAL -1
+#define NON_CONTAGIOUS 0
+#define BLOOD 1
+#define CONTACT_FEET 2
+#define CONTACT_HANDS 3
+#define CONTACT_GENERAL 4
+#define AIRBORNE 5
+
+#define SCANNER 1
+#define PANDEMIC 2
+
+/*
+
+IMPORTANT NOTE: Please delete the diseases by using cure() proc or del() instruction.
+Diseases are referenced in a global list, so simply setting mob or obj vars
+to null does not delete the object itself. Thank you.
+
+*/
+
+var/list/diseases = typesof(/datum/disease) - /datum/disease
+
+
+/datum/disease
+	var/form = "Virus" //During medscans, what the disease is referred to as
+	var/name = "No disease"
+	var/stage = 1 //all diseases start at stage 1
+	var/max_stages = 0.0
+	var/cure = null
+	var/cure_id = null// reagent.id or list containing them
+	var/cure_list = null // allows for multiple possible cure combinations
+	var/cure_chance = 8//chance for the cure to do its job
+	var/spread = null //spread type description
+	var/initial_spread = null
+	var/spread_type = AIRBORNE
+	var/contagious_period = 0//the disease stage when it can be spread
+	var/list/affected_species = list()
+	var/mob/living/carbon/affected_mob = null //the mob which is affected by disease.
+	var/holder = null //the atom containing the disease (mob or obj)
+	var/carrier = 0.0 //there will be a small chance that the person will be a carrier
+	var/curable = 0 //can this disease be cured? (By itself...)
+	var/list/strain_data = list() //This is passed on to infectees
+	var/stage_prob = 4		// probability of advancing to next stage, default 4% per check
+	var/agent = "some microbes"//name of the disease agent
+	var/permeability_mod = 1//permeability modifier coefficient.
+	var/desc = null//description. Leave it null and this disease won't show in med records.
+	var/severity = null//severity descr
+	var/longevity = 150//time in "ticks" the virus stays in inanimate object (blood stains, corpses, etc). In syringes, bottles and beakers it stays infinitely.
+	var/list/hidden = list(0, 0)
+	var/can_carry = 1 // If the disease allows "carriers".
+	var/age = 0 // age of the disease in the current mob
+	var/stage_minimum_age = 0 // how old the disease must be to advance per stage
+	// if hidden[1] is true, then virus is hidden from medical scanners
+	// if hidden[2] is true, then virus is hidden from PANDEMIC machine
+
+/datum/disease/proc/stage_act()
+	age++
+	var/cure_present = has_cure()
+	//world << "[cure_present]"
+
+	if(carrier&&!cure_present)
+		//world << "[affected_mob] is carrier"
+		return
+
+	spread = (cure_present?"Remissive":initial_spread)
+	if(stage > max_stages)
+		stage = max_stages
+
+	if(!cure_present && prob(stage_prob) && age > stage_minimum_age) //now the disease shouldn't get back up to stage 4 in no time
+		stage = min(stage + 1, max_stages)
+		age = 0
+
+	else if(cure_present && prob(cure_chance))
+		stage = max(stage - 1, 1)
+
+	if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
+		cure()
+		return
+	return
+
+/datum/disease/proc/has_cure()//check if affected_mob has required reagents.
+	if(!cure_id) return 0
+	var/result = 1
+	if(cure_list == list(cure_id))
+		if(istype(cure_id, /list))
+			for(var/C_id in cure_id)
+				if(!affected_mob.reagents.has_reagent(C_id))
+					result = 0
+		else if(!affected_mob.reagents.has_reagent(cure_id))
+			result = 0
+	else
+		for(var/C_list in cure_list)
+			if(istype(C_list, /list))
+				for(var/C_id in cure_id)
+					if(affected_mob.reagents != null)
+						result = 0
+					else if(!affected_mob.reagents.has_reagent(C_id))
+						result = 0
+			else if(affected_mob.reagents != null)
+				if(!affected_mob.reagents.has_reagent(C_list))
+					result = 0
+
+	return result
+
+/datum/disease/proc/spread_by_touch()
+	switch(spread_type)
+		if(CONTACT_FEET, CONTACT_HANDS, CONTACT_GENERAL)
+			return 1
+	return 0
+
+/datum/disease/proc/spread(var/atom/source=null, var/airborne_range = 2,  var/force_spread)
+	//world << "Disease [src] proc spread was called from holder [source]"
+
+	// If we're overriding how we spread, say so here
+	var/how_spread = spread_type
+	if(force_spread)
+		how_spread = force_spread
+
+	if(how_spread == SPECIAL || how_spread == NON_CONTAGIOUS || how_spread == BLOOD)//does not spread
+		return
+
+	if(stage < contagious_period) //the disease is not contagious at this stage
+		return
+
+	if(!source)//no holder specified
+		if(affected_mob)//no mob affected holder
+			source = affected_mob
+		else //no source and no mob affected. Rogue disease. Break
+			return
+	
+	if(affected_mob.reagents != null)
+		if(affected_mob)
+			if(affected_mob.reagents.has_reagent("spaceacillin"))
+				return // Don't spread if we have spaceacillin in our system.
+
+	var/check_range = airborne_range//defaults to airborne - range 2
+
+	if(how_spread != AIRBORNE && how_spread != SPECIAL)
+		check_range = 1 // everything else, like infect-on-contact things, only infect things on top of it
+
+	if(isturf(source.loc))
+		for(var/mob/living/carbon/M in oview(check_range, source))
+			if(isturf(M.loc))
+				if(AStar(source.loc, M.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, check_range))
+					M.contract_disease(src, 0, 1, force_spread)
+
+	return
+
+
+/datum/disease/proc/process()
+	if(!holder)
+		active_diseases -= src
+		return
+	if(prob(65))
+		spread(holder)
+
+	if(affected_mob)
+		for(var/datum/disease/D in affected_mob.viruses)
+			if(D != src)
+				if(IsSame(D))
+					//error("Deleting [D.name] because it's the same as [src.name].")
+					del(D) // if there are somehow two viruses of the same kind in the system, delete the other one
+
+	if(holder == affected_mob)
+		if(affected_mob.stat != DEAD) //he's alive
+			stage_act()
+		else //he's dead.
+			if(spread_type!=SPECIAL)
+				spread_type = CONTACT_GENERAL
+			affected_mob = null
+	if(!affected_mob) //the virus is in inanimate obj
+//		world << "[src] longevity = [longevity]"
+
+		if(prob(70))
+			if(--longevity<=0)
+				cure(0)
+	return
+
+/datum/disease/proc/cure(var/resistance=1)//if resistance = 0, the mob won't develop resistance to disease
+	if(affected_mob)
+		if(resistance && !(type in affected_mob.resistances))
+			var/saved_type = "[type]"
+			affected_mob.resistances += text2path(saved_type)
+		/*if(istype(src, /datum/disease/alien_embryo))	//Get rid of the infection flag if it's a xeno embryo.
+			affected_mob.status_flags &= ~(XENO_HOST)*/
+		affected_mob.viruses -= src		//remove the datum from the list
+	del(src)	//delete the datum to stop it processing
+	return
+
+
+/datum/disease/New(var/process=1, var/datum/disease/D)//process = 1 - adding the object to global list. List is processed by master controller.
+	cure_list = list(cure_id) // to add more cures, add more vars to this list in the actual disease's New()
+	if(process)				 // Viruses in list are considered active.
+		active_diseases += src
+	initial_spread = spread
+
+/datum/disease/proc/IsSame(var/datum/disease/D)
+	if(istype(src, D.type))
+		return 1
+	return 0
+
+/datum/disease/proc/Copy(var/process = 0)
+	return new type(process, src)
+
+/*
+/datum/disease/Del()
+	active_diseases.Remove(src)
+*/

code/datums/diseases/advance/advance.dm

@@ -0,0 +1,423 @@
+/*
+
+	Advance Disease is a system for Virologist to Engineer their own disease with symptoms that have effects and properties
+	which add onto the overall disease.
+
+	If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus.
+
+*/
+
+#define RANDOM_STARTING_LEVEL 2
+
+var/list/archive_diseases = list()
+
+// The order goes from easy to cure to hard to cure.
+var/list/advance_cures = 	list(
+									"nutriment", "sugar", "orangejuice",
+									"spaceacillin", "kelotane", "ethanol",
+									"leporazine", "synaptizine", "lipozine",
+									"silver", "gold", "plasma"
+								)
+
+/*
+
+	PROPERTIES
+
+ */
+
+/datum/disease/advance
+
+	name = "Unknown" // We will always let our Virologist name our disease.
+	desc = "An engineered disease which can contain a multitude of symptoms."
+	form = "Advance Disease" // Will let med-scanners know that this disease was engineered.
+	agent = "advance microbes"
+	max_stages = 5
+	spread = "Unknown"
+	affected_species = list("Human","Monkey")
+
+	// NEW VARS
+
+	var/list/symptoms = list() // The symptoms of the disease.
+	var/id = ""
+	var/processing = 0
+
+/*
+
+	OLD PROCS
+
+ */
+
+/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D)
+
+	// Setup our dictionary if it hasn't already.
+	if(!dictionary_symptoms.len)
+		for(var/symp in list_symptoms)
+			var/datum/symptom/S = new symp
+			dictionary_symptoms[S.id] = symp
+
+	if(!istype(D))
+		D = null
+	// Generate symptoms if we weren't given any.
+
+	if(!symptoms || !symptoms.len)
+
+		if(!D || !D.symptoms || !D.symptoms.len)
+			symptoms = GenerateSymptoms()
+		else
+			for(var/datum/symptom/S in D.symptoms)
+				symptoms += new S.type
+
+	Refresh()
+	..(process, D)
+	return
+
+/datum/disease/advance/Del()
+	if(processing)
+		for(var/datum/symptom/S in symptoms)
+			S.End(src)
+	..()
+
+// Randomly pick a symptom to activate.
+/datum/disease/advance/stage_act()
+	..()
+	if(symptoms && symptoms.len)
+
+		if(!processing)
+			processing = 1
+			for(var/datum/symptom/S in symptoms)
+				S.Start(src)
+
+		for(var/datum/symptom/S in symptoms)
+			S.Activate(src)
+	else
+		CRASH("We do not have any symptoms during stage_act()!")
+
+// Compares type then ID.
+/datum/disease/advance/IsSame(var/datum/disease/advance/D)
+
+	if(!(istype(D, /datum/disease/advance)))
+		return 0
+
+	if(src.GetDiseaseID() != D.GetDiseaseID())
+		return 0
+	return 1
+
+// To add special resistances.
+/datum/disease/advance/cure(var/resistance=1)
+	if(affected_mob)
+		var/id = "[GetDiseaseID()]"
+		if(resistance && !(id in affected_mob.resistances))
+			affected_mob.resistances[id] = id
+		affected_mob.viruses -= src		//remove the datum from the list
+	del(src)	//delete the datum to stop it processing
+	return
+
+// Returns the advance disease with a different reference memory.
+/datum/disease/advance/Copy(var/process = 0)
+	return new /datum/disease/advance(process, src, 1)
+
+/*
+
+	NEW PROCS
+
+ */
+
+// Mix the symptoms of two diseases (the src and the argument)
+/datum/disease/advance/proc/Mix(var/datum/disease/advance/D)
+	if(!(src.IsSame(D)))
+		var/list/possible_symptoms = shuffle(D.symptoms)
+		for(var/datum/symptom/S in possible_symptoms)
+			AddSymptom(new S.type)
+
+/datum/disease/advance/proc/HasSymptom(var/datum/symptom/S)
+	for(var/datum/symptom/symp in symptoms)
+		if(symp.id == S.id)
+			return 1
+	return 0
+
+// Will generate new unique symptoms, use this if there are none. Returns a list of symptoms that were generated.
+/datum/disease/advance/proc/GenerateSymptoms(var/type_level_limit = RANDOM_STARTING_LEVEL, var/amount_get = 0)
+
+	var/list/generated = list() // Symptoms we generated.
+
+	// Generate symptoms. By default, we only choose non-deadly symptoms.
+	var/list/possible_symptoms = list()
+	for(var/symp in list_symptoms)
+		var/datum/symptom/S = new symp
+		if(S.level <= type_level_limit)
+			if(!HasSymptom(S))
+				possible_symptoms += S
+
+	if(!possible_symptoms.len)
+		return
+		//error("Advance Disease - We weren't able to get any possible symptoms in GenerateSymptoms([type_level_limit], [amount_get])")
+
+	// Random chance to get more than one symptom
+	var/number_of = amount_get
+	if(!amount_get)
+		number_of = 1
+		while(prob(20))
+			number_of += 1
+
+	for(var/i = 1; number_of >= i; i++)
+		var/datum/symptom/S = pick(possible_symptoms)
+		generated += S
+		possible_symptoms -= S
+
+	return generated
+
+/datum/disease/advance/proc/Refresh(var/new_name = 0)
+	//world << "[src.name] \ref[src] - REFRESH!"
+	var/list/properties = GenerateProperties()
+	AssignProperties(properties)
+
+	if(!archive_diseases[GetDiseaseID()])
+		if(new_name)
+			AssignName()
+		archive_diseases[GetDiseaseID()] = src // So we don't infinite loop
+		archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1)
+
+	var/datum/disease/advance/A = archive_diseases[GetDiseaseID()]
+	AssignName(A.name)
+
+//Generate disease properties based on the effects. Returns an associated list.
+/datum/disease/advance/proc/GenerateProperties()
+
+	if(!symptoms || !symptoms.len)
+		CRASH("We did not have any symptoms before generating properties.")
+		return
+
+	var/list/properties = list("resistance" = 1, "stealth" = 1, "stage_rate" = 1, "transmittable" = 1, "severity" = 1)
+
+	for(var/datum/symptom/S in symptoms)
+
+		properties["resistance"] += S.resistance
+		properties["stealth"] += S.stealth
+		properties["stage_rate"] += S.stage_speed
+		properties["transmittable"] += S.transmittable
+		properties["severity"] = max(properties["severity"], S.level) // severity is based on the highest level symptom
+
+	return properties
+
+// Assign the properties that are in the list.
+/datum/disease/advance/proc/AssignProperties(var/list/properties = list())
+
+	if(properties && properties.len)
+
+		hidden = list( (properties["stealth"] > 2), (properties["stealth"] > 3) )
+		// The more symptoms we have, the less transmittable it is but some symptoms can make up for it.
+		SetSpread(Clamp(properties["transmittable"] - symptoms.len, BLOOD, AIRBORNE))
+		permeability_mod = max(Ceiling(0.4 * properties["transmittable"]), 1)
+		cure_chance = 15 - Clamp(properties["resistance"], -5, 5) // can be between 10 and 20
+		stage_prob = max(properties["stage_rate"], 2)
+		SetSeverity(properties["severity"])
+		GenerateCure(properties)
+	else
+		CRASH("Our properties were empty or null!")
+
+
+// Assign the spread type and give it the correct description.
+/datum/disease/advance/proc/SetSpread(var/spread_id)
+	switch(spread_id)
+
+		if(NON_CONTAGIOUS)
+			spread = "None"
+		if(SPECIAL)
+			spread = "None"
+		if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
+			spread = "On contact"
+		if(AIRBORNE)
+			spread = "Airborne"
+		if(BLOOD)
+			spread = "Blood"
+
+	spread_type = spread_id
+	//world << "Setting spread type to [spread_id]/[spread]"
+
+/datum/disease/advance/proc/SetSeverity(var/level_sev)
+
+	switch(level_sev)
+
+		if(-INFINITY to 0)
+			severity = "Non-Threat"
+		if(1)
+			severity = "Minor"
+		if(2)
+			severity = "Medium"
+		if(3)
+			severity = "Harmful"
+		if(4)
+			severity = "Dangerous!"
+		if(5 to INFINITY)
+			severity = "BIOHAZARD THREAT!"
+		else
+			severity = "Unknown"
+
+
+// Will generate a random cure, the less resistance the symptoms have, the harder the cure.
+/datum/disease/advance/proc/GenerateCure(var/list/properties = list())
+	if(properties && properties.len)
+		var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
+		//world << "Res = [res]"
+		cure_id = advance_cures[res]
+
+		// Get the cure name from the cure_id
+		var/datum/reagent/D = chemical_reagents_list[cure_id]
+		cure = D.name
+
+
+	return
+
+// Randomly generate a symptom, has a chance to lose or gain a symptom.
+/datum/disease/advance/proc/Evolve(var/level = 2)
+	var/s = safepick(GenerateSymptoms(level, 1))
+	if(s)
+		AddSymptom(s)
+		Refresh(1)
+	return
+
+// Randomly remove a symptom.
+/datum/disease/advance/proc/Devolve()
+	if(symptoms.len > 1)
+		var/s = safepick(symptoms)
+		if(s)
+			RemoveSymptom(s)
+			Refresh(1)
+	return
+
+// Name the disease.
+/datum/disease/advance/proc/AssignName(var/name = "Unknown")
+	src.name = name
+	return
+
+// Return a unique ID of the disease.
+/datum/disease/advance/proc/GetDiseaseID()
+
+	var/list/L = list()
+	for(var/datum/symptom/S in symptoms)
+		L += S.id
+	L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
+	var/result = list2text(L, ":")
+	id = result
+	return result
+
+
+// Add a symptom, if it is over the limit (with a small chance to be able to go over)
+// we take a random symptom away and add the new one.
+/datum/disease/advance/proc/AddSymptom(var/datum/symptom/S)
+
+	if(HasSymptom(S))
+		return
+
+	if(symptoms.len < 5 + rand(-1, 1))
+		symptoms += S
+	else
+		RemoveSymptom(pick(symptoms))
+		symptoms += S
+	return
+
+// Simply removes the symptom.
+/datum/disease/advance/proc/RemoveSymptom(var/datum/symptom/S)
+	symptoms -= S
+	return
+
+/*
+
+	Static Procs
+
+*/
+
+// Mix a list of advance diseases and return the mixed result.
+/proc/Advance_Mix(var/list/D_list)
+
+	//world << "Mixing!!!!"
+
+	var/list/diseases = list()
+
+	for(var/datum/disease/advance/A in D_list)
+		diseases += A.Copy()
+
+	if(!diseases.len)
+		return null
+	if(diseases.len <= 1)
+		return pick(diseases) // Just return the only entry.
+
+	var/i = 0
+	// Mix our diseases until we are left with only one result.
+	while(i < 20 && diseases.len > 1)
+
+		i++
+
+		var/datum/disease/advance/D1 = pick(diseases)
+		diseases -= D1
+
+		var/datum/disease/advance/D2 = pick(diseases)
+		D2.Mix(D1)
+
+	 // Should be only 1 entry left, but if not let's only return a single entry
+	//world << "END MIXING!!!!!"
+	var/datum/disease/advance/to_return = pick(diseases)
+	to_return.Refresh(1)
+	return to_return
+
+/proc/SetViruses(var/datum/reagent/R, var/list/data)
+	if(data)
+		var/list/preserve = list()
+		if(istype(data) && data["viruses"])
+			for(var/datum/disease/A in data["viruses"])
+				preserve += A.Copy()
+			R.data = data.Copy()
+		else
+			R.data = data
+		if(preserve.len)
+			R.data["viruses"] = preserve
+
+/proc/AdminCreateVirus(var/mob/user)
+	var/i = 5
+
+	var/datum/disease/advance/D = new(0, null)
+	D.symptoms = list()
+
+	var/list/symptoms = list()
+	symptoms += "Done"
+	symptoms += list_symptoms.Copy()
+	do
+		var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms
+		if(istext(symptom))
+			i = 0
+		else if(ispath(symptom))
+			var/datum/symptom/S = new symptom
+			if(!D.HasSymptom(S))
+				D.symptoms += S
+				i -= 1
+	while(i > 0)
+
+	if(D.symptoms.len > 0)
+
+		var/new_name = input(user, "Name your new disease.", "New Name")
+		D.AssignName(new_name)
+		D.Refresh()
+
+		for(var/datum/disease/advance/AD in active_diseases)
+			AD.Refresh()
+
+		for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
+			if(H.z != 1)
+				continue
+			if(!H.has_disease(D))
+				H.contract_disease(D, 1)
+				break
+
+		var/list/name_symptoms = list()
+		for(var/datum/symptom/S in D.symptoms)
+			name_symptoms += S.name
+		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
+
+/*
+/mob/verb/test()
+
+	for(var/datum/disease/D in active_diseases)
+		src << "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>"
+*/
+
+#undef RANDOM_STARTING_LEVEL

code/datums/diseases/advance/presets.dm

@@ -0,0 +1,43 @@
+// Cold
+
+/datum/disease/advance/cold/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Cold"
+		symptoms = list(new/datum/symptom/sneeze)
+	..(process, D, copy)
+
+
+// Flu
+
+/datum/disease/advance/flu/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Flu"
+		symptoms = list(new/datum/symptom/cough)
+	..(process, D, copy)
+
+
+// Voice Changing
+
+/datum/disease/advance/voice_change/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Epiglottis Mutation"
+		symptoms = list(new/datum/symptom/voice_change)
+	..(process, D, copy)
+
+
+// Toxin Filter
+
+/datum/disease/advance/heal/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Liver Enhancer"
+		symptoms = list(new/datum/symptom/heal)
+	..(process, D, copy)
+
+
+// Hullucigen
+
+/datum/disease/advance/hullucigen/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Reality Impairment"
+		symptoms = list(new/datum/symptom/hallucigen)
+	..(process, D, copy)

code/datums/diseases/advance/symptoms/confusion.dm

@@ -0,0 +1,39 @@
+/*
+//////////////////////////////////////
+
+Confusion
+
+	Little bit hidden.
+	Lowers resistance.
+	Decreases stage speed.
+	Not very transmittable.
+	Intense Level.
+
+Bonus
+	Makes the affected mob be confused for short periods of time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/confusion
+
+	name = "Confusion"
+	stealth = 1
+	resistance = -1
+	stage_speed = -3
+	transmittable = 0
+	level = 4
+
+
+/datum/symptom/confusion/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/carbon/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You feel confused.", "You forgot what you were thinking about.")]</span>"
+			else
+				M << "<span class='notice'>You are unable to think straight!</span>"
+				M.confused = min(100, M.confused + 2)
+
+	return

code/datums/diseases/advance/symptoms/cough.dm

@@ -0,0 +1,39 @@
+/*
+//////////////////////////////////////
+
+Coughing
+
+	Noticable.
+	Little Resistance.
+	Doesn't increase stage speed much.
+	Transmittable.
+	Low Level.
+
+BONUS
+	Will force the affected mob to drop small items!
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/cough
+
+	name = "Cough"
+	stealth = -1
+	resistance = 3
+	stage_speed = 1
+	transmittable = 2
+	level = 1
+
+/datum/symptom/cough/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3)
+				M << "<span notice='notice'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>"
+			else
+				M.emote("cough")
+				var/obj/item/I = M.get_active_hand()
+				if(I && I.w_class < 3)
+					M.drop_item()
+	return

code/datums/diseases/advance/symptoms/damage_converter.dm

@@ -0,0 +1,43 @@
+/*
+//////////////////////////////////////
+
+Damage Converter
+
+	Little bit hidden.
+	Lowers resistance tremendously.
+	Decreases stage speed tremendously.
+	Reduced transmittablity
+	Intense Level.
+
+Bonus
+	Slowly converts brute/fire damage to toxin.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/damage_converter
+
+	name = "Toxic Compensation"
+	stealth = 1
+	resistance = -4
+	stage_speed = -4
+	transmittable = -2
+	level = 4
+
+/datum/symptom/damage_converter/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(4, 5)
+				Convert(M)
+	return
+
+/datum/symptom/damage_converter/proc/Convert(var/mob/living/M)
+
+	if(M.getFireLoss() < M.getMaxHealth() || M.getBruteLoss() < M.getMaxHealth())
+		var/get_damage = rand(1, 2)
+		M.adjustFireLoss(-get_damage)
+		M.adjustBruteLoss(-get_damage)
+		M.adjustToxLoss(get_damage)
+		return 1

code/datums/diseases/advance/symptoms/dizzy.dm

@@ -0,0 +1,37 @@
+/*
+//////////////////////////////////////
+
+Dizziness
+
+	Hidden.
+	Lowers resistance considerably.
+	Decreases stage speed.
+	Reduced transmittability
+	Intense Level.
+
+Bonus
+	Shakes the affected mob's screen for short periods.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/dizzy // Not the egg
+
+	name = "Dizziness"
+	stealth = 2
+	resistance = -2
+	stage_speed = -3
+	transmittable = -1
+	level = 4
+
+/datum/symptom/dizzy/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You feel dizzy.", "Your head starts spinning.")]</span>"
+			else
+				M << "<span class='notice'>You are unable to look straight!</span>"
+				M.make_dizzy(5)
+	return

code/datums/diseases/advance/symptoms/fever.dm

@@ -0,0 +1,35 @@
+/*
+//////////////////////////////////////
+
+Fever
+
+	No change to hidden.
+	Increases resistance.
+	Increases stage speed.
+	Little transmittable.
+	Low level.
+
+Bonus
+	Heats up your body.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/fever
+
+	name = "Fever"
+	stealth = 0
+	resistance = 3
+	stage_speed = 3
+	transmittable = 2
+	level = 2
+
+/datum/symptom/fever/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/carbon/M = A.affected_mob
+		M << "<span class='notice'>[pick("You feel hot.", "You feel like you're burning.")]</span>"
+		if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT)
+			M.bodytemperature = min(M.bodytemperature + (20 * A.stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1)
+
+	return

code/datums/diseases/advance/symptoms/hallucigen.dm

@@ -0,0 +1,37 @@
+/*
+//////////////////////////////////////
+
+Hallucigen
+
+	Very noticable.
+	Lowers resistance considerably.
+	Decreases stage speed.
+	Reduced transmittable.
+	Critical Level.
+
+Bonus
+	Makes the affected mob be hallucinated for short periods of time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/hallucigen
+
+	name = "Hallucigen"
+	stealth = -2
+	resistance = -3
+	stage_speed = -3
+	transmittable = -1
+	level = 5
+
+/datum/symptom/hallucigen/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/carbon/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You notice someone in the corner of your eye.", "Is that footsteps?.")]</span>"
+			else
+				M.hallucination += 5
+
+	return

code/datums/diseases/advance/symptoms/headache.dm

@@ -0,0 +1,33 @@
+/*
+//////////////////////////////////////
+
+Headache
+
+	Noticable.
+	Highly resistant.
+	Increases stage speed.
+	Not transmittable.
+	Low Level.
+
+BONUS
+	Displays an annoying message!
+	Should be used for buffing your disease.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/headache
+
+	name = "Headache"
+	stealth = -1
+	resistance = 4
+	stage_speed = 2
+	transmittable = 0
+	level = 1
+
+/datum/symptom/headache/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		M << "<span class='notice'>[pick("Your head hurts.", "Your head starts pounding.")]</span>"
+	return

code/datums/diseases/advance/symptoms/heal.dm

@@ -0,0 +1,40 @@
+/*
+//////////////////////////////////////
+
+Healing
+
+	Little bit hidden.
+	Lowers resistance tremendously.
+	Decreases stage speed tremendously.
+	Decreases transmittablity temrendously.
+	Fatal Level.
+
+Bonus
+	Heals toxins in the affected mob's blood stream.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal
+
+	name = "Toxic Filter"
+	stealth = 1
+	resistance = -4
+	stage_speed = -4
+	transmittable = -4
+	level = 6
+
+/datum/symptom/heal/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(4, 5)
+				Heal(M)
+	return
+
+/datum/symptom/heal/proc/Heal(var/mob/living/M)
+
+	var/get_damage = rand(1, 2)
+	M.adjustToxLoss(-get_damage)
+	return 1

code/datums/diseases/advance/symptoms/itching.dm

@@ -0,0 +1,33 @@
+/*
+//////////////////////////////////////
+
+Itching
+
+	Not noticable or unnoticable.
+	Resistant.
+	Increases stage speed.
+	Little transmittable.
+	Low Level.
+
+BONUS
+	Displays an annoying message!
+	Should be used for buffing your disease.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/itching
+
+	name = "Itching"
+	stealth = 0
+	resistance = 3
+	stage_speed = 3
+	transmittable = 1
+	level = 1
+
+/datum/symptom/itching/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		M << "<span class='notice'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>"
+	return

code/datums/diseases/advance/symptoms/shivering.dm

@@ -0,0 +1,35 @@
+/*
+//////////////////////////////////////
+
+Shivering
+
+	No change to hidden.
+	Increases resistance.
+	Increases stage speed.
+	Little transmittable.
+	Low level.
+
+Bonus
+	Cools down your body.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/shivering
+
+	name = "Shivering"
+	stealth = 0
+	resistance = 2
+	stage_speed = 2
+	transmittable = 2
+	level = 2
+
+/datum/symptom/shivering/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/carbon/M = A.affected_mob
+		M << "<span class='notice'>[pick("You feel cold.", "You start shaking from the cold.")]</span>"
+		if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+			M.bodytemperature = min(M.bodytemperature - (20 * A.stage), BODYTEMP_COLD_DAMAGE_LIMIT + 1)
+
+	return

code/datums/diseases/advance/symptoms/sneeze.dm

@@ -0,0 +1,38 @@
+/*
+//////////////////////////////////////
+
+Sneezing
+
+	Very Noticable.
+	Increases resistance.
+	Doesn't increase stage speed.
+	Very transmittable.
+	Low Level.
+
+Bonus
+	Forces a spread type of AIRBORNE
+	with extra range!
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/sneeze
+
+	name = "Sneezing"
+	stealth = -2
+	resistance = 3
+	stage_speed = 0
+	transmittable = 4
+	level = 1
+
+/datum/symptom/sneeze/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3)
+				M.emote("sniff")
+			else
+				M.emote("sneeze")
+				A.spread(A.holder, 5, AIRBORNE)
+	return

code/datums/diseases/advance/symptoms/symptoms.dm

@@ -0,0 +1,38 @@
+// Symptoms are the effects that engineered advanced diseases do.
+
+var/list/list_symptoms = typesof(/datum/symptom) - /datum/symptom
+var/list/dictionary_symptoms = list()
+
+var/global/const/SYMPTOM_ACTIVATION_PROB = 3
+
+/datum/symptom
+	// Buffs/Debuffs the symptom has to the overall engineered disease.
+	var/name = ""
+	var/stealth = 0
+	var/resistance = 0
+	var/stage_speed = 0
+	var/transmittable = 0
+	// The type level of the symptom. Higher is more lethal and harder to generate.
+	var/level = 0
+	// The hash tag for our diseases, we will add it up with our other symptoms to get a unique id! ID MUST BE UNIQUE!!!
+	var/id = ""
+
+/datum/symptom/New()
+	var/list/S = list_symptoms
+	for(var/i = 1; i <= S.len; i++)
+		if(src.type == S[i])
+			id = "[i]"
+			return
+	CRASH("We couldn't assign an ID!")
+
+// Called when processing of the advance disease, which holds this symptom, starts.
+/datum/symptom/proc/Start(var/datum/disease/advance/A)
+	return
+
+// Called when the advance disease is going to be deleted or when the advance disease stops processing.
+/datum/symptom/proc/End(var/datum/disease/advance/A)
+	return
+
+/datum/symptom/proc/Activate(var/datum/disease/advance/A)
+	return
+

code/datums/diseases/advance/symptoms/voice_change.dm

@@ -0,0 +1,54 @@
+/*
+//////////////////////////////////////
+
+Voice Change
+
+	Very Very noticable.
+	Lowers resistance considerably.
+	Decreases stage speed.
+	Reduced transmittable.
+	Fatal Level.
+
+Bonus
+	Changes the voice of the affected mob. Causing confusion in communication.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/voice_change
+
+	name = "Voice Change"
+	stealth = -2
+	resistance = -3
+	stage_speed = -3
+	transmittable = -1
+	level = 6
+
+/datum/symptom/voice_change/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+
+		var/mob/living/carbon/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("Your throat hurts.", "You clear your throat.")]</span>"
+			else
+				if(ishuman(M))
+					var/mob/living/carbon/human/H = M
+					var/random_name = ""
+					switch(H.gender)
+						if(MALE)
+							random_name = pick(first_names_male)
+						else
+							random_name = pick(first_names_female)
+					random_name += " [pick(last_names)]"
+					H.SetSpecialVoice(random_name)
+
+	return
+
+/datum/symptom/voice_change/End(var/datum/disease/advance/A)
+	..()
+	if(ishuman(A.affected_mob))
+		var/mob/living/carbon/human/H = A.affected_mob
+		H.UnsetSpecialVoice()
+	return

code/datums/diseases/advance/symptoms/vomit.dm

@@ -0,0 +1,94 @@
+/*
+//////////////////////////////////////
+
+Vomiting
+
+	Very Very Noticable.
+	Decreases resistance.
+	Doesn't increase stage speed.
+	Little transmittable.
+	Medium Level.
+
+Bonus
+	Forces the affected mob to vomit!
+	Meaning your disease can spread via
+	people walking on vomit.
+	Makes the affected mob lose nutrition and
+	heal toxin damage.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/vomit
+
+	name = "Vomiting"
+	stealth = -2
+	resistance = -1
+	stage_speed = 0
+	transmittable = 1
+	level = 3
+
+/datum/symptom/vomit/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB / 2))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>"
+			else
+				Vomit(M)
+
+	return
+
+/datum/symptom/vomit/proc/Vomit(var/mob/living/M)
+
+	M.visible_message("<B>[M]</B> vomits on the floor!")
+
+	M.nutrition -= 20
+	M.adjustToxLoss(-3)
+
+	var/turf/pos = get_turf(M)
+	pos.add_vomit_floor(M)
+	playsound(pos, 'sound/effects/splat.ogg', 50, 1)
+/*
+//////////////////////////////////////
+
+Vomiting Blood
+
+	Very Very Noticable.
+	Decreases resistance.
+	Decreases stage speed.
+	Little transmittable.
+	Intense level.
+
+Bonus
+	Forces the affected mob to vomit blood!
+	Meaning your disease can spread via
+	people walking on the blood.
+	Makes the affected mob lose health.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/vomit/blood
+
+	name = "Blood Vomiting"
+	stealth = -2
+	resistance = -1
+	stage_speed = -1
+	transmittable = 1
+	level = 4
+
+/datum/symptom/vomit/blood/Vomit(var/mob/living/M)
+
+	M.Stun(1)
+	M.visible_message("<B>[M]</B> vomits on the floor!")
+
+	// They lose blood and health.
+	var/brute_dam = M.getBruteLoss()
+	if(brute_dam < 50)
+		M.adjustBruteLoss(3)
+
+	var/turf/simulated/pos = get_turf(M)
+	pos.add_blood_floor(M)
+	playsound(pos, 'sound/effects/splat.ogg', 50, 1)

code/datums/diseases/advance/symptoms/weight.dm

@@ -0,0 +1,119 @@
+/*
+//////////////////////////////////////
+
+Weight Gain
+
+	Very Very Noticable.
+	Decreases resistance.
+	Decreases stage speed.
+	Reduced transmittable.
+	Intense Level.
+
+Bonus
+	Increases the weight gain of the mob,
+	forcing it to eventually turn fat.
+//////////////////////////////////////
+*/
+
+/datum/symptom/weight_gain
+
+	name = "Weight Gain"
+	stealth = -3
+	resistance = -3
+	stage_speed = -2
+	transmittable = -2
+	level = 4
+
+/datum/symptom/weight_gain/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You feel blubbery.", "You feel full.")]</span>"
+			else
+				M.overeatduration = min(M.overeatduration + 100, 600)
+				M.nutrition = min(M.nutrition + 100, 500)
+
+	return
+
+
+/*
+//////////////////////////////////////
+
+Weight Loss
+
+	Very Very Noticable.
+	Decreases resistance.
+	Decreases stage speed.
+	Reduced Transmittable.
+	High level.
+
+Bonus
+	Decreases the weight of the mob,
+	forcing it to be skinny.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/weight_loss
+
+	name = "Weight Loss"
+	stealth = -3
+	resistance = -2
+	stage_speed = -2
+	transmittable = -2
+	level = 3
+
+/datum/symptom/weight_loss/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				M << "<span class='notice'>[pick("You feel hungry.", "You crave for food.")]</span>"
+			else
+				M << "<span class='notice'>Your stomach rumbles.</span>"
+				M.overeatduration = max(M.overeatduration - 100, 0)
+				M.nutrition = max(M.nutrition - 100, 0)
+
+	return
+
+/*
+//////////////////////////////////////
+
+Weight Even
+
+	Very Noticable.
+	Decreases resistance.
+	Decreases stage speed.
+	Reduced transmittable.
+	High level.
+
+Bonus
+	Causes the weight of the mob to
+	be even, meaning eating isn't
+	required anymore.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/weight_even
+
+	name = "Weight Even"
+	stealth = -3
+	resistance = -2
+	stage_speed = -2
+	transmittable = -2
+	level = 4
+
+/datum/symptom/weight_loss/Activate(var/datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(4, 5)
+				M.overeatduration = 0
+				M.nutrition = 400
+
+	return

code/datums/diseases/alien_embryo.dm

@@ -0,0 +1,153 @@
+//affected_mob.contract_disease(new /datum/disease/alien_embryo)
+
+//cael - retained this file for legacy reference, see code\modules\mob\living\carbon\alien\special\alien_embryo.dm for replacement
+
+//Our own special process so that dead hosts still chestburst
+/datum/disease/alien_embryo/process()
+	if(!holder) return
+	if(holder == affected_mob)
+		stage_act()
+	if(affected_mob)
+		if(affected_mob.stat == DEAD)
+			if(prob(50))
+				if(--longevity<=0)
+					cure(0)
+	else //the virus is in inanimate obj
+		cure(0)
+	return
+
+/datum/disease/alien_embryo/New()
+	..()
+	/* Special Hud for xenos */
+	spawn(0)
+		if (affected_mob)
+			AddInfectionImages(affected_mob)
+
+/datum/disease/alien_embryo/cure(var/resistance=1)
+	..()
+	spawn(0)
+		if (affected_mob)
+			RemoveInfectionImages(affected_mob)
+
+/datum/disease/alien_embryo
+	name = "Unidentified Foreign Body"
+	max_stages = 5
+	spread = "None"
+	spread_type = SPECIAL
+	cure = "Unknown"
+	cure_id = list("lexorin","toxin","gargleblaster")
+	cure_chance = 50
+	affected_species = list("Human", "Monkey")
+	permeability_mod = 15//likely to infect
+	can_carry = 0
+	stage_prob = 3
+	var/gibbed = 0
+	stage_minimum_age = 300
+
+/datum/disease/alien_embryo/stage_act()
+	..()
+	switch(stage)
+		if(2, 3)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(1))
+				affected_mob << "\red Mucous runs down the back of your throat."
+		if(4)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(2))
+				affected_mob << "\red Your muscles ache."
+				if(prob(20))
+					affected_mob.take_organ_damage(1)
+			if(prob(2))
+				affected_mob << "\red Your stomach hurts."
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+		if(5)
+			affected_mob << "\red You feel something tearing its way out of your stomach..."
+			affected_mob.adjustToxLoss(10)
+			affected_mob.updatehealth()
+			if(prob(50))
+				if(gibbed != 0) return 0
+				var/list/candidates = get_alien_candidates()
+				var/picked = null
+
+				// To stop clientless larva, we will check that our host has a client
+				// if we find no ghosts to become the alien. If the host has a client
+				// he will become the alien but if he doesn't then we will set the stage
+				// to 2, so we don't do a process heavy check everytime.
+
+				if(candidates.len)
+					picked = pick(candidates)
+				else if(affected_mob.client)
+					picked = affected_mob.key
+				else
+					stage = 2 // Let's try again later.
+					return
+
+				var/mob/living/carbon/alien/larva/new_xeno = new(affected_mob.loc)
+				new_xeno.key = picked
+				new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+				affected_mob.gib()
+				src.cure(0)
+				gibbed = 1
+				return
+
+/datum/disease/alien_embryo/stage_change(var/old_stage)
+	RefreshInfectionImage()
+
+/*----------------------------------------
+Proc: RefreshInfectionImage()
+Des: Removes all infection images from aliens and places an infection image on all infected mobs for aliens.
+----------------------------------------*/
+/datum/disease/alien_embryo/proc/RefreshInfectionImage()
+	spawn(0)
+		for (var/mob/living/carbon/alien/alien in player_list)
+			if (alien.client)
+				for(var/image/I in alien.client.images)
+					if(dd_hasprefix_case(I.icon_state, "infected"))
+						del(I)
+
+		for (var/mob/living/carbon/alien/alien in player_list)
+			if (alien.client)
+				for (var/mob/living/carbon/C in mob_list)
+					if(C)
+						if (C.status_flags & XENO_HOST)
+							var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
+							alien.client.images += I
+		return
+
+/*----------------------------------------
+Proc: AddInfectionImages(C)
+Des: Checks if the passed mob (C) is infected with the alien egg, then gives each alien client an infected image at C.
+----------------------------------------*/
+/datum/disease/alien_embryo/proc/AddInfectionImages(var/mob/living/carbon/C)
+	if (C)
+		for (var/mob/living/carbon/alien/alien in player_list)
+			if (alien.client)
+				if (C.status_flags & XENO_HOST)
+					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
+					alien.client.images += I
+	return
+
+/*----------------------------------------
+Proc: RemoveInfectionImage(C)
+Des: Removes the alien infection image from all aliens in the world located in passed mob (C).
+----------------------------------------*/
+
+/datum/disease/alien_embryo/proc/RemoveInfectionImages(var/mob/living/carbon/C)
+	if (C)
+		for (var/mob/living/carbon/alien/alien in player_list)
+			if (alien.client)
+				for(var/image/I in alien.client.images)
+					if(I.loc == C)
+						if(dd_hasprefix_case(I.icon_state, "infected"))
+							del(I)
+	return

code/datums/diseases/appendicitis.dm

@@ -0,0 +1,51 @@
+/datum/disease/appendicitis
+	form = "Condition"
+	name = "Appendicitis"
+	max_stages = 4
+	spread = "Acute"
+	cure = "Surgery"
+	agent = "Appendix"
+	affected_species = list("Human")
+	permeability_mod = 1
+	contagious_period = 9001 //slightly hacky, but hey! whatever works, right?
+	desc = "If left untreated the subject will become very weak, and may vomit often."
+	severity = "Medium"
+	longevity = 1000
+	hidden = list(0, 1)
+	stage_minimum_age = 160 // at least 200 life ticks per stage
+
+/datum/disease/appendicitis/stage_act()
+	..()
+	if(stage == 1)
+		if(affected_mob.op_stage.appendix == 2.0)
+			// appendix is removed, can't get infected again
+			src.cure()
+		if(prob(5))
+			affected_mob << "\red You feel a stinging pain in your abdomen!"
+			affected_mob.emote("me",1,"winces slightly.")
+	if(stage > 1)
+		if(prob(3))
+			affected_mob << "\red You feel a stabbing pain in your abdomen!"
+			affected_mob.emote("me",1,"winces painfully.")
+			affected_mob.adjustToxLoss(1)
+	if(stage > 2)
+		if(prob(1))
+			if (affected_mob.nutrition > 100)
+				var/mob/living/carbon/human/H = affected_mob
+				H.vomit()
+			else
+				affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!"
+				affected_mob.Weaken(10)
+				affected_mob.adjustToxLoss(3)
+	if(stage > 3)
+		if(prob(1) && ishuman(affected_mob))
+			var/mob/living/carbon/human/H = affected_mob
+			H << "\red Your abdomen is a world of pain!"
+			H.Weaken(10)
+			H.op_stage.appendix = 2.0
+
+			var/datum/organ/external/groin = H.get_organ("groin")
+			var/datum/wound/W = new /datum/wound/internal_bleeding(20)
+			H.adjustToxLoss(25)
+			groin.wounds += W
+			src.cure()

code/datums/diseases/beesease.dm

@@ -0,0 +1,31 @@
+/*
+/datum/disease/beesease
+	name = "Beesease"
+	max_stages = 5
+	spread = "Contact" //ie shot bees
+	cure = "???"
+	cure_id = "???"
+	agent = "Bees"
+	affected_species = list("Human","Monkey")
+	curable = 0
+
+/datum/disease/beesease/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(prob(2))
+				affected_mob << "\red You feel like something is moving inside of you"
+		if(2) //also changes say, see say.dm
+			if(prob(2))
+				affected_mob << "\red You feel like something is moving inside of you"
+			if(prob(2))
+				affected_mob << "\red BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		if(3)
+		//Should give the bee spit verb
+		if(4)
+		//Plus bees now spit randomly
+		if(5)
+		//Plus if you die, you explode into bees
+	return
+*/
+//Started working on it, but am too lazy to finish it today -- Urist

code/datums/diseases/brainrot.dm

@@ -0,0 +1,67 @@
+/datum/disease/brainrot
+	name = "Brainrot"
+	max_stages = 4
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Alkysine"
+	cure_id = list("alkysine")
+	agent = "Cryptococcus Cosmosis"
+	affected_species = list("Human")
+	curable = 0
+	cure_chance = 15//higher chance to cure, since two reagents are required
+	desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
+	severity = "Major"
+
+/datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist
+	..()
+	switch(stage)
+		if(2)
+			if(prob(2))
+				affected_mob.emote("blink")
+			if(prob(2))
+				affected_mob.emote("yawn")
+			if(prob(2))
+				affected_mob << "\red Your don't feel like yourself."
+			if(prob(5))
+				affected_mob.adjustBrainLoss(1)
+				affected_mob.updatehealth()
+		if(3)
+			if(prob(2))
+				affected_mob.emote("stare")
+			if(prob(2))
+				affected_mob.emote("drool")
+			if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now
+				affected_mob.adjustBrainLoss(2)
+				affected_mob.updatehealth()
+				if(prob(2))
+					affected_mob << "\red Your try to remember something important...but can't."
+/*			if(prob(10))
+				affected_mob.adjustToxLoss(3)
+				affected_mob.updatehealth()
+				if(prob(2))
+					affected_mob << "\red Your head hurts." */
+		if(4)
+			if(prob(2))
+				affected_mob.emote("stare")
+			if(prob(2))
+				affected_mob.emote("drool")
+/*			if(prob(15))
+				affected_mob.adjustToxLoss(4)
+				affected_mob.updatehealth()
+				if(prob(2))
+					affected_mob << "\red Your head hurts." */
+			if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now
+				affected_mob.adjustBrainLoss(3)
+				affected_mob.updatehealth()
+				if(prob(2))
+					affected_mob << "\red Strange buzzing fills your head, removing all thoughts."
+			if(prob(3))
+				affected_mob << "\red You lose consciousness..."
+				for(var/mob/O in viewers(affected_mob, null))
+					O.show_message("[affected_mob] suddenly collapses", 1)
+				affected_mob.Paralyse(rand(5,10))
+				if(prob(1))
+					affected_mob.emote("snore")
+			if(prob(15))
+				affected_mob.stuttering += 3
+	return

code/datums/diseases/cold.dm

@@ -0,0 +1,66 @@
+/datum/disease/cold
+	name = "The Cold"
+	max_stages = 3
+	spread = "Airborne"
+	cure = "Rest & Spaceacillin"
+	cure_id = "spaceacillin"
+	agent = "XY-rhinovirus"
+	affected_species = list("Human", "Monkey")
+	permeability_mod = 0.5
+	desc = "If left untreated the subject will contract the flu."
+	severity = "Minor"
+
+/datum/disease/cold/stage_act()
+	..()
+	switch(stage)
+		if(2)
+/*
+			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+			if(prob(1) && prob(5))
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(1))
+				affected_mob << "\red Mucous runs down the back of your throat."
+		if(3)
+/*
+			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+			if(prob(1) && prob(1))
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(1))
+				affected_mob << "\red Mucous runs down the back of your throat."
+			if(prob(1) && prob(50))
+				if(!affected_mob.resistances.Find(/datum/disease/flu))
+					var/datum/disease/Flu = new /datum/disease/flu(0)
+					affected_mob.contract_disease(Flu,1)
+					cure()

code/datums/diseases/cold9.dm

@@ -0,0 +1,39 @@
+/datum/disease/cold9
+	name = "The Cold"
+	max_stages = 3
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Common Cold Anti-bodies & Spaceacillin"
+	cure_id = "spaceacillin"
+	agent = "ICE9-rhinovirus"
+	affected_species = list("Human")
+	desc = "If left untreated the subject will slow, as if partly frozen."
+	severity = "Moderate"
+
+/datum/disease/cold9/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			affected_mob.bodytemperature -= 10
+			if(prob(1) && prob(10))
+				affected_mob << "\blue You feel better."
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(5))
+				affected_mob << "\red You feel stiff."
+		if(3)
+			affected_mob.bodytemperature -= 20
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(10))
+				affected_mob << "\red You feel stiff."

code/datums/diseases/dna_spread.dm

@@ -0,0 +1,69 @@
+/datum/disease/dnaspread
+	name = "Space Retrovirus"
+	max_stages = 4
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Ryetalyn"
+	cure_id = "ryetalyn"
+	curable = 1
+	agent = "S4E1 retrovirus"
+	affected_species = list("Human")
+	var/list/original_dna = list()
+	var/transformed = 0
+	desc = "This disease transplants the genetic code of the intial vector into new hosts."
+	severity = "Medium"
+
+
+/datum/disease/dnaspread/stage_act()
+	..()
+	switch(stage)
+		if(2 || 3) //Pretend to be a cold and give time to spread.
+			if(prob(8))
+				affected_mob.emote("sneeze")
+			if(prob(8))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your muscles ache."
+				if(prob(20))
+					affected_mob.take_organ_damage(1)
+			if(prob(1))
+				affected_mob << "\red Your stomach hurts."
+				if(prob(20))
+					affected_mob.adjustToxLoss(2)
+					affected_mob.updatehealth()
+		if(4)
+			if(!src.transformed)
+				if ((!strain_data["name"]) || (!strain_data["UI"]) || (!strain_data["SE"]))
+					del(affected_mob.virus)
+					return
+
+				//Save original dna for when the disease is cured.
+				src.original_dna["name"] = affected_mob.real_name
+				src.original_dna["UI"] = affected_mob.dna.UI.Copy()
+				src.original_dna["SE"] = affected_mob.dna.SE.Copy()
+
+				affected_mob << "\red You don't feel like yourself.."
+				var/list/newUI=strain_data["UI"]
+				var/list/newSE=strain_data["SE"]
+				affected_mob.UpdateAppearance(newUI.Copy())
+				affected_mob.dna.SE = newSE.Copy()
+				affected_mob.dna.UpdateSE()
+				affected_mob.real_name = strain_data["name"]
+				domutcheck(affected_mob)
+
+				src.transformed = 1
+				src.carrier = 1 //Just chill out at stage 4
+
+	return
+
+/datum/disease/dnaspread/Del()
+	if ((original_dna["name"]) && (original_dna["UI"]) && (original_dna["SE"]))
+		var/list/newUI=original_dna["UI"]
+		var/list/newSE=original_dna["SE"]
+		affected_mob.UpdateAppearance(newUI.Copy())
+		affected_mob.dna.SE = newSE.Copy()
+		affected_mob.dna.UpdateSE()
+		affected_mob.real_name = original_dna["name"]
+
+		affected_mob << "\blue You feel more like yourself."
+	..()

code/datums/diseases/fake_gbs.dm

@@ -0,0 +1,32 @@
+/datum/disease/fake_gbs
+	name = "GBS"
+	max_stages = 5
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Synaptizine & Sulfur"
+	cure_id = list("synaptizine","sulfur")
+	agent = "Gravitokinetic Bipotential SADS-"
+	affected_species = list("Human", "Monkey")
+	desc = "If left untreated death will occur."
+	severity = "Major"
+
+/datum/disease/fake_gbs/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+		if(3)
+			if(prob(5))
+				affected_mob.emote("cough")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			if(prob(10))
+				affected_mob << "\red You're starting to feel very weak..."
+		if(4)
+			if(prob(10))
+				affected_mob.emote("cough")
+
+		if(5)
+			if(prob(10))
+				affected_mob.emote("cough")

code/datums/diseases/flu.dm

@@ -0,0 +1,66 @@
+/datum/disease/flu
+	name = "The Flu"
+	max_stages = 3
+	spread = "Airborne"
+	cure = "Spaceacillin"
+	cure_id = "spaceacillin"
+	cure_chance = 10
+	agent = "H13N1 flu virion"
+	affected_species = list("Human", "Monkey")
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will feel quite unwell."
+	severity = "Medium"
+
+/datum/disease/flu/stage_act()
+	..()
+	switch(stage)
+		if(2)
+/*
+			if(affected_mob.sleeping && prob(20))  //removed until sleeping is fixed --Blaank
+				affected_mob << "\blue You feel better."
+				stage--
+				return
+*/
+			if(affected_mob.lying && prob(20))  //added until sleeping is fixed --Blaank
+				affected_mob << "\blue You feel better."
+				stage--
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your muscles ache."
+				if(prob(20))
+					affected_mob.take_organ_damage(1)
+			if(prob(1))
+				affected_mob << "\red Your stomach hurts."
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+
+		if(3)
+/*
+			if(affected_mob.sleeping && prob(15))  //removed until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				stage--
+				return
+*/
+			if(affected_mob.lying && prob(15))  //added until sleeping is fixed
+				affected_mob << "\blue You feel better."
+				stage--
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your muscles ache."
+				if(prob(20))
+					affected_mob.take_organ_damage(1)
+			if(prob(1))
+				affected_mob << "\red Your stomach hurts."
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+	return

code/datums/diseases/fluspanish.dm

@@ -0,0 +1,36 @@
+/datum/disease/fluspanish
+	name = "Spanish inquisition Flu"
+	max_stages = 3
+	spread = "Airborne"
+	cure = "Spaceacillin & Anti-bodies to the common flu"
+	cure_id = "spaceacillin"
+	cure_chance = 10
+	agent = "1nqu1s1t10n flu virion"
+	affected_species = list("Human")
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will burn to death for being a heretic."
+	severity = "Serious"
+
+/datum/disease/inquisition/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			affected_mob.bodytemperature += 10
+			if(prob(5))
+				affected_mob.emote("sneeze")
+			if(prob(5))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red You're burning in your own skin!"
+				affected_mob.take_organ_damage(0,5)
+
+		if(3)
+			affected_mob.bodytemperature += 20
+			if(prob(5))
+				affected_mob.emote("sneeze")
+			if(prob(5))
+				affected_mob.emote("cough")
+			if(prob(5))
+				affected_mob << "\red You're burning in your own skin!"
+				affected_mob.take_organ_damage(0,5)
+	return

code/datums/diseases/gbs.dm

@@ -0,0 +1,40 @@
+/datum/disease/gbs
+	name = "GBS"
+	max_stages = 5
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Synaptizine & Sulfur"
+	cure_id = list("synaptizine","sulfur")
+	cure_chance = 15//higher chance to cure, since two reagents are required
+	agent = "Gravitokinetic Bipotential SADS+"
+	affected_species = list("Human")
+	curable = 0
+	permeability_mod = 1
+
+/datum/disease/gbs/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(45))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+			if(prob(1))
+				affected_mob.emote("sneeze")
+		if(3)
+			if(prob(5))
+				affected_mob.emote("cough")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			if(prob(10))
+				affected_mob << "\red You're starting to feel very weak..."
+		if(4)
+			if(prob(10))
+				affected_mob.emote("cough")
+			affected_mob.adjustToxLoss(5)
+			affected_mob.updatehealth()
+		if(5)
+			affected_mob << "\red Your body feels as if it's trying to rip itself open..."
+			if(prob(50))
+				affected_mob.gib()
+		else
+			return

code/datums/diseases/jungle_fever.dm

@@ -0,0 +1,12 @@
+/datum/disease/jungle_fever
+	name = "Jungle Fever"
+	max_stages = 1
+	cure = "None"
+	spread = "Bites"
+	spread_type = SPECIAL
+	affected_species = list("Monkey", "Human")
+	curable = 0
+	desc = "monkeys with this disease will bite humans, causing humans to spontaneously mutate into a monkey."
+	severity = "Medium"
+	//stage_prob = 100
+	agent = "Kongey Vibrion M-909"

code/datums/diseases/magnitis.dm

@@ -0,0 +1,93 @@
+/datum/disease/magnitis
+	name = "Magnitis"
+	max_stages = 4
+	spread = "Airborne"
+	cure = "Iron"
+	cure_id = "iron"
+	agent = "Fukkos Miracos"
+	affected_species = list("Human")
+	curable = 0
+	permeability_mod = 0.75
+	desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field."
+	severity = "Medium"
+
+/datum/disease/magnitis/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(2))
+				affected_mob << "\red You feel a slight shock course through your body."
+			if(prob(2))
+				for(var/obj/M in orange(2,affected_mob))
+					if(!M.anchored && (M.flags & CONDUCT))
+						step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(2,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					step_towards(S,affected_mob)
+						/*
+						if(M.x > affected_mob.x)
+							M.x--
+						else if(M.x < affected_mob.x)
+							M.x++
+						if(M.y > affected_mob.y)
+							M.y--
+						else if(M.y < affected_mob.y)
+							M.y++
+						*/
+		if(3)
+			if(prob(2))
+				affected_mob << "\red You feel a strong shock course through your body."
+			if(prob(2))
+				affected_mob << "\red You feel like clowning around."
+			if(prob(4))
+				for(var/obj/M in orange(4,affected_mob))
+					if(!M.anchored && (M.flags & CONDUCT))
+						var/i
+						var/iter = rand(1,2)
+						for(i=0,i<iter,i++)
+							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(4,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					var/i
+					var/iter = rand(1,2)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
+						/*
+						if(M.x > affected_mob.x)
+							M.x-=rand(1,min(3,M.x-affected_mob.x))
+						else if(M.x < affected_mob.x)
+							M.x+=rand(1,min(3,affected_mob.x-M.x))
+						if(M.y > affected_mob.y)
+							M.y-=rand(1,min(3,M.y-affected_mob.y))
+						else if(M.y < affected_mob.y)
+							M.y+=rand(1,min(3,affected_mob.y-M.y))
+						*/
+		if(4)
+			if(prob(2))
+				affected_mob << "\red You feel a powerful shock course through your body."
+			if(prob(2))
+				affected_mob << "\red You query upon the nature of miracles."
+			if(prob(8))
+				for(var/obj/M in orange(6,affected_mob))
+					if(!M.anchored && (M.flags & CONDUCT))
+						var/i
+						var/iter = rand(1,3)
+						for(i=0,i<iter,i++)
+							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(6,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					var/i
+					var/iter = rand(1,3)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
+						/*
+						if(M.x > affected_mob.x)
+							M.x-=rand(1,min(5,M.x-affected_mob.x))
+						else if(M.x < affected_mob.x)
+							M.x+=rand(1,min(5,affected_mob.x-M.x))
+						if(M.y > affected_mob.y)
+							M.y-=rand(1,min(5,M.y-affected_mob.y))
+						else if(M.y < affected_mob.y)
+							M.y+=rand(1,min(5,affected_mob.y-M.y))
+						*/
+	return

code/datums/diseases/pierrot_throat.dm

@@ -0,0 +1,25 @@
+/datum/disease/pierrot_throat
+	name = "Pierrot's Throat"
+	max_stages = 4
+	spread = "Airborne"
+	cure = "A whole banana."
+	cure_id = "banana"
+	cure_chance = 75
+	agent = "H0NI<42 Virus"
+	affected_species = list("Human")
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will probably drive others to insanity."
+	severity = "Medium"
+	longevity = 400
+
+/datum/disease/pierrot_throat/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(prob(10)) affected_mob << "\red You feel a little silly."
+		if(2)
+			if(prob(10)) affected_mob << "\red You start seeing rainbows."
+		if(3)
+			if(prob(10)) affected_mob << "\red Your thoughts are interrupted by a loud <b>HONK!</b>"
+		if(4)
+			if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )

code/datums/diseases/plasmatoid.dm

@@ -0,0 +1,5 @@
+/datum/disease/plasmatoid
+	name = "Plasmatoid"
+	max_stages = 4
+	cure = "None"
+	affected_species = list("Monkey", "Human")

code/datums/diseases/retrovirus.dm

@@ -0,0 +1,108 @@
+/datum/disease/dna_retrovirus
+	name = "Retrovirus"
+	max_stages = 4
+	spread = "Contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Rest or an injection of ryetalyn"
+	cure_chance = 6
+	agent = ""
+	affected_species = list("Human")
+	desc = "A DNA-altering retrovirus that scrambles the structural and unique enzymes of a host constantly."
+	severity = "Severe"
+	permeability_mod = 0.4
+	stage_prob = 2
+	var/SE
+	var/UI
+	var/restcure = 0
+	New()
+		..()
+		agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
+		if(prob(40))
+			cure_id = list("ryetalyn")
+			cure_list = list("ryetalyn")
+		else
+			restcure = 1
+
+
+
+
+/datum/disease/dna_retrovirus/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(restcure)
+/*
+				if(affected_mob.sleeping && prob(30))  //removed until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+*/
+				if(affected_mob.lying && prob(30))  //changed FROM prob(20) until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+			if (prob(8))
+				affected_mob << "\red Your head hurts."
+			if (prob(9))
+				affected_mob << "You feel a tingling sensation in your chest."
+			if (prob(9))
+				affected_mob << "\red You feel angry."
+		if(2)
+			if(restcure)
+/*
+				if(affected_mob.sleeping && prob(20))  //removed until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+*/
+				if(affected_mob.lying && prob(20))  //changed FROM prob(10) until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+			if (prob(8))
+				affected_mob << "\red Your skin feels loose."
+			if (prob(10))
+				affected_mob << "You feel very strange."
+			if (prob(4))
+				affected_mob << "\red You feel a stabbing pain in your head!"
+				affected_mob.Paralyse(2)
+			if (prob(4))
+				affected_mob << "\red Your stomach churns."
+		if(3)
+			if(restcure)
+/*
+				if(affected_mob.sleeping && prob(20))  //removed until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+*/
+				if(affected_mob.lying && prob(20))  //changed FROM prob(10) until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+			if (prob(10))
+				affected_mob << "\red Your entire body vibrates."
+
+			if (prob(35))
+				if(prob(50))
+					scramble(1, affected_mob, rand(15,45))
+				else
+					scramble(0, affected_mob, rand(15,45))
+
+		if(4)
+			if(restcure)
+/*
+				if(affected_mob.sleeping && prob(10))  //removed until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+*/
+				if(affected_mob.lying && prob(5))  //changed FROM prob(5) until sleeping is fixed
+					affected_mob << "\blue You feel better."
+					cure()
+					return
+			if (prob(60))
+				if(prob(50))
+					scramble(1, affected_mob, rand(50,75))
+				else
+					scramble(0, affected_mob, rand(50,75))

code/datums/diseases/rhumba_beat.dm

@@ -0,0 +1,51 @@
+/datum/disease/rhumba_beat
+	name = "The Rhumba Beat"
+	max_stages = 5
+	spread = "On contact"
+	spread_type = CONTACT_GENERAL
+	cure = "Chick Chicky Boom!"
+	cure_id = list("plasma")
+	agent = "Unknown"
+	affected_species = list("Human")
+	permeability_mod = 1
+
+/datum/disease/rhumba_beat/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(affected_mob.ckey == "rosham")
+				src.cure()
+		if(2)
+			if(affected_mob.ckey == "rosham")
+				src.cure()
+			if(prob(45))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+			if(prob(1))
+				affected_mob << "\red You feel strange..."
+		if(3)
+			if(affected_mob.ckey == "rosham")
+				src.cure()
+			if(prob(5))
+				affected_mob << "\red You feel the urge to dance..."
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			else if(prob(10))
+				affected_mob << "\red You feel the need to chick chicky boom..."
+		if(4)
+			if(affected_mob.ckey == "rosham")
+				src.cure()
+			if(prob(10))
+				affected_mob.emote("gasp")
+				affected_mob << "\red You feel a burning beat inside..."
+			if(prob(20))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+		if(5)
+			if(affected_mob.ckey == "rosham")
+				src.cure()
+			affected_mob << "\red Your body is unable to contain the Rhumba Beat..."
+			if(prob(50))
+				affected_mob.gib()
+		else
+			return

code/datums/diseases/robotic_transformation.dm

@@ -0,0 +1,65 @@
+//Nanomachines!
+
+/datum/disease/robotic_transformation
+	name = "Robotic Transformation"
+	max_stages = 5
+	spread = "Syringe"
+	spread_type = SPECIAL
+	cure = "An injection of copper."
+	cure_id = list("copper")
+	cure_chance = 5
+	agent = "R2D2 Nanomachines"
+	affected_species = list("Human")
+	desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
+	severity = "Major"
+	var/gibbed = 0
+
+/datum/disease/robotic_transformation/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if (prob(8))
+				affected_mob << "Your joints feel stiff."
+				affected_mob.take_organ_damage(1)
+			if (prob(9))
+				affected_mob << "\red Beep...boop.."
+			if (prob(9))
+				affected_mob << "\red Bop...beeep..."
+		if(3)
+			if (prob(8))
+				affected_mob << "\red Your joints feel very stiff."
+				affected_mob.take_organ_damage(1)
+			if (prob(8))
+				affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
+			if (prob(10))
+				affected_mob << "Your skin feels loose."
+				affected_mob.take_organ_damage(5)
+			if (prob(4))
+				affected_mob << "\red You feel a stabbing pain in your head."
+				affected_mob.Paralyse(2)
+			if (prob(4))
+				affected_mob << "\red You can feel something move...inside."
+		if(4)
+			if (prob(10))
+				affected_mob << "\red Your skin feels very loose."
+				affected_mob.take_organ_damage(8)
+			if (prob(20))
+				affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
+			if (prob(8))
+				affected_mob << "\red You can feel... something...inside you."
+		if(5)
+			affected_mob <<"\red Your skin feels as if it's about to burst off..."
+			affected_mob.adjustToxLoss(10)
+			affected_mob.updatehealth()
+			if(prob(40)) //So everyone can feel like robot Seth Brundle
+				if(src.gibbed != 0) return 0
+				var/turf/T = find_loc(affected_mob)
+				gibs(T)
+				src.cure(0)
+				gibbed = 1
+				var/mob/living/carbon/human/H = affected_mob
+				if(istype(H) && !jobban_isbanned(affected_mob, "Cyborg"))
+					H.Robotize()
+				else
+					affected_mob.death(1)
+

code/datums/diseases/wizarditis.dm

@@ -0,0 +1,122 @@
+/datum/disease/wizarditis
+	name = "Wizarditis"
+	max_stages = 4
+	spread = "Airborne"
+	cure = "The Manly Dorf"
+	cure_id = "manlydorf"
+	cure_chance = 100
+	agent = "Rincewindus Vulgaris"
+	affected_species = list("Human")
+	curable = 1
+	permeability_mod = 0.75
+	desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition."
+	severity = "Major"
+
+
+/*
+BIRUZ BENNAR
+SCYAR NILA - teleport
+NEC CANTIO - dis techno
+EI NATH - shocking grasp
+AULIE OXIN FIERA - knock
+TARCOL MINTI ZHERI - forcewall
+STI KALY - blind
+*/
+
+/datum/disease/wizarditis/stage_act()
+	..()
+
+	switch(stage)
+		if(2)
+			if(prob(1)&&prob(50))
+				affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!"))
+			if(prob(1)&&prob(50))
+				affected_mob << "\red You feel [pick("that you don't have enough mana.", "that the winds of magic are gone.", "an urge to summon familiar.")]"
+
+
+		if(3)
+			if(prob(1)&&prob(50))
+				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!"))
+			if(prob(1)&&prob(50))
+				affected_mob << "\red You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar.")]."
+
+		if(4)
+
+			if(prob(1))
+				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!"))
+				return
+			if(prob(1)&&prob(50))
+				affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]."
+				spawn_wizard_clothes(50)
+			if(prob(1)&&prob(1))
+				teleport()
+	return
+
+
+
+/datum/disease/wizarditis/proc/spawn_wizard_clothes(var/chance = 0)
+	if(istype(affected_mob, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = affected_mob
+		if(prob(chance))
+			if(!istype(H.head, /obj/item/clothing/head/wizard))
+				if(H.head)
+					H.drop_from_inventory(H.head)
+				H.head = new /obj/item/clothing/head/wizard(H)
+				H.head.layer = 20
+			return
+		if(prob(chance))
+			if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
+				if(H.wear_suit)
+					H.drop_from_inventory(H.wear_suit)
+				H.wear_suit = new /obj/item/clothing/suit/wizrobe(H)
+				H.wear_suit.layer = 20
+			return
+		if(prob(chance))
+			if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
+				if(H.shoes)
+					H.drop_from_inventory(H.shoes)
+				H.shoes = new /obj/item/clothing/shoes/sandal(H)
+				H.shoes.layer = 20
+			return
+	else
+		var/mob/living/carbon/H = affected_mob
+		if(prob(chance))
+			if(!istype(H.r_hand, /obj/item/weapon/staff))
+				H.drop_r_hand()
+				H.put_in_r_hand( new /obj/item/weapon/staff(H) )
+			return
+	return
+
+
+
+/datum/disease/wizarditis/proc/teleport()
+	var/list/theareas = new/list()
+	for(var/area/AR in orange(80, affected_mob))
+		if(theareas.Find(AR) || AR.name == "Space") continue
+		theareas += AR
+
+	if(!theareas)
+		return
+
+	var/area/thearea = pick(theareas)
+
+	var/list/L = list()
+	for(var/turf/T in get_area_turfs(thearea.type))
+		if(T.z != affected_mob.z) continue
+		if(T.name == "space") continue
+		if(!T.density)
+			var/clear = 1
+			for(var/obj/O in T)
+				if(O.density)
+					clear = 0
+					break
+			if(clear)
+				L+=T
+
+	if(!L)
+		return
+
+	affected_mob.say("SCYAR NILA [uppertext(thearea.name)]!")
+	affected_mob.loc = pick(L)
+
+	return

code/datums/diseases/xeno_transformation.dm

@@ -0,0 +1,61 @@
+//Xenomicrobes
+
+/datum/disease/xeno_transformation
+	name = "Xenomorph Transformation"
+	max_stages = 5
+	spread = "Syringe"
+	spread_type = SPECIAL
+	cure = "Spaceacillin & Glycerol"
+	cure_id = list("spaceacillin", "glycerol")
+	cure_chance = 5
+	agent = "Rip-LEY Alien Microbes"
+	affected_species = list("Human")
+	var/gibbed = 0
+
+/datum/disease/xeno_transformation/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if (prob(8))
+				affected_mob << "Your throat feels scratchy."
+				affected_mob.take_organ_damage(1)
+			if (prob(9))
+				affected_mob << "\red Kill..."
+			if (prob(9))
+				affected_mob << "\red Kill..."
+		if(3)
+			if (prob(8))
+				affected_mob << "\red Your throat feels very scratchy."
+				affected_mob.take_organ_damage(1)
+			/*
+			if (prob(8))
+				affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
+			*/
+			if (prob(10))
+				affected_mob << "Your skin feels tight."
+				affected_mob.take_organ_damage(5)
+			if (prob(4))
+				affected_mob << "\red You feel a stabbing pain in your head."
+				affected_mob.Paralyse(2)
+			if (prob(4))
+				affected_mob << "\red You can feel something move...inside."
+		if(4)
+			if (prob(10))
+				affected_mob << pick("\red Your skin feels very tight.", "\red Your blood boils!")
+				affected_mob.take_organ_damage(8)
+			if (prob(20))
+				affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
+			if (prob(8))
+				affected_mob << "\red You can feel... something...inside you."
+		if(5)
+			affected_mob <<"\red Your skin feels impossibly calloused..."
+			affected_mob.adjustToxLoss(10)
+			affected_mob.updatehealth()
+			if(prob(40))
+				if(gibbed != 0) return 0
+				var/turf/T = find_loc(affected_mob)
+				gibs(T)
+				src.cure(0)
+				gibbed = 1
+				affected_mob:Alienize()
+

code/datums/helper_datums/construction_datum.dm

@@ -0,0 +1,105 @@
+#define FORWARD -1
+#define BACKWARD 1
+
+/datum/construction
+	var/list/steps
+	var/atom/holder
+	var/result
+	var/list/steps_desc
+
+	New(atom)
+		..()
+		holder = atom
+		if(!holder) //don't want this without a holder
+			spawn
+				del src
+		set_desc(steps.len)
+		return
+
+	proc/next_step()
+		steps.len--
+		if(!steps.len)
+			spawn_result()
+		else
+			set_desc(steps.len)
+		return
+
+	proc/action(atom/used_atom,mob/user as mob)
+		return
+
+	proc/check_step(atom/used_atom,mob/user as mob) //check last step only
+		var/valid_step = is_right_key(used_atom)
+		if(valid_step)
+			if(custom_action(valid_step, used_atom, user))
+				next_step()
+				return 1
+		return 0
+
+	proc/is_right_key(atom/used_atom) // returns current step num if used_atom is of the right type.
+		var/list/L = steps[steps.len]
+		if(istype(used_atom, L["key"]))
+			return steps.len
+		return 0
+
+	proc/custom_action(step, used_atom, user)
+		return 1
+
+	proc/check_all_steps(atom/used_atom,mob/user as mob) //check all steps, remove matching one.
+		for(var/i=1;i<=steps.len;i++)
+			var/list/L = steps[i];
+			if(istype(used_atom, L["key"]))
+				if(custom_action(i, used_atom, user))
+					steps[i]=null;//stupid byond list from list removal...
+					listclearnulls(steps);
+					if(!steps.len)
+						spawn_result()
+					return 1
+		return 0
+
+
+	proc/spawn_result()
+		if(result)
+			new result(get_turf(holder))
+			spawn()
+				del holder
+		return
+
+	proc/set_desc(index as num)
+		var/list/step = steps[index]
+		holder.desc = step["desc"]
+		return
+
+/datum/construction/reversible
+	var/index
+
+	New(atom)
+		..()
+		index = steps.len
+		return
+
+	proc/update_index(diff as num)
+		index+=diff
+		if(index==0)
+			spawn_result()
+		else
+			set_desc(index)
+		return
+
+	is_right_key(atom/used_atom) // returns index step
+		var/list/L = steps[index]
+		if(istype(used_atom, L["key"]))
+			return FORWARD //to the first step -> forward
+		else if(L["backkey"] && istype(used_atom, L["backkey"]))
+			return BACKWARD //to the last step -> backwards
+		return 0
+
+	check_step(atom/used_atom,mob/user as mob)
+		var/diff = is_right_key(used_atom)
+		if(diff)
+			if(custom_action(index, diff, used_atom, user))
+				update_index(diff)
+				return 1
+		return 0
+
+	custom_action(index, diff, used_atom, user)
+		return 1

code/datums/helper_datums/events.dm

@@ -0,0 +1,67 @@
+/*
+ * WARRANTY VOID IF CODE USED
+ */
+
+
+/datum/events
+	var/list/events
+
+	New()
+		..()
+		events = new
+
+	proc/addEventType(event_type as text)
+		if(!(event_type in events) || !islist(events[event_type]))
+			events[event_type] = list()
+			return 1
+		return
+
+
+	//	Arguments: event_type as text, proc_holder as datum, proc_name as text
+	//	Returns: New event, null on error.
+	proc/addEvent(event_type as text, proc_holder, proc_name as text)
+		if(!event_type || !proc_holder || !proc_name)
+			return
+		addEventType(event_type)
+		var/list/event = events[event_type]
+		var/datum/event/E = new /datum/event(proc_holder,proc_name)
+		event += E
+		return E
+
+	//  Arguments: event_type as text, any number of additional arguments to pass to event handler
+	//  Returns: null
+	proc/fireEvent()
+		//world << "Events in [args[1]] called"
+		var/list/event = listgetindex(events,args[1])
+		if(istype(event))
+			spawn(-1)
+				for(var/datum/event/E in event)
+					if(!E.Fire(arglist(args.Copy(2))))
+						clearEvent(args[1],E)
+		return
+
+	// Arguments: event_type as text, E as /datum/event
+	// Returns: 1 if event cleared, null on error
+	proc/clearEvent(event_type as text, datum/event/E)
+		if(!event_type || !E)
+			return
+		var/list/event = listgetindex(events,event_type)
+		event -= E
+		return 1
+
+
+/datum/event
+	var/listener
+	var/proc_name
+
+	New(tlistener,tprocname)
+		listener = tlistener
+		proc_name = tprocname
+		return ..()
+
+	proc/Fire()
+		//world << "Event fired"
+		if(listener)
+			call(listener,proc_name)(arglist(args))
+			return 1
+		return

code/datums/helper_datums/getrev.dm

@@ -0,0 +1,96 @@
+/*
+ * This datum gets revision info from local svn 'entries' file
+ * Path to the directory containing it should be in 'config/svndir.txt' file
+ *
+ */
+
+var/global/datum/getrev/revdata = new("config/svndir.txt")
+
+//Oh yeah, I'm an OOP fag, lalala
+/datum/getrev
+	var/revision
+	var/commiter
+	var/svndirpath
+	var/revhref
+
+	proc/abort()
+		spawn()
+			del src
+
+	New(filename)
+		..()
+		var/list/Lines = file2list(filename)
+		if(!Lines.len)	return abort()
+		for(var/t in Lines)
+			if(!t)	continue
+			t = trim(t)
+			if (length(t) == 0)
+				continue
+			else if (copytext(t, 1, 2) == "#")
+				continue
+			var/pos = findtext(t, " ")
+			var/name = null
+			var/value = null
+			if (pos)
+				name = lowertext(copytext(t, 1, pos))
+				value = copytext(t, pos + 1)
+			else
+				name = lowertext(t)
+			if(!name)
+				continue
+			switch(name)
+				if("svndir")
+					svndirpath = value
+				if("revhref")
+					revhref = value
+
+		if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
+			var/list/filelist = file2list("[svndirpath]/entries")
+			var/s_archive = "" //Stores the previous line so the revision owner can be assigned.
+
+			//This thing doesn't count blank lines, so doing filelist[4] isn't working.
+			for(var/s in filelist)
+				if(!commiter)
+					if(s == "has-props")//The line before this is the committer.
+						commiter = s_archive
+				if(!revision)
+					var/n = text2num(s)
+					if(isnum(n))
+						if(n > 5000 && n < 99999) //Do you think we'll still be up and running at r100000? :) ~Errorage
+							revision = s
+				if(revision && commiter)
+					break
+				s_archive = s
+			if(!revision)
+				abort()
+			diary << "Revision info loaded succesfully"
+			return
+		return abort()
+
+	proc/getRevisionText()
+		var/output
+		if(revhref)
+			output = {"<a href="[revhref][revision]">[revision]</a>"}
+		else
+			output = revision
+		return output
+
+	proc/showInfo()
+		return {"<html>
+					<head>
+					</head>
+					<body>
+					<p><b>Server Revision:</b> [getRevisionText()]<br/>
+					<b>Author:</b> [commiter]</p>
+					</body>
+					<html>"}
+
+client/verb/showrevinfo()
+	set category = "OOC"
+	set name = "Show Server Revision"
+	var/output =  "Sorry, the revision info is unavailable."
+	output = file2text("/home/bay12/live/data/gitcommit")
+	output += "Current Infomational Settings: <br>"
+	output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>"
+	usr << browse(output,"window=revdata");
+	return

code/datums/helper_datums/global_iterator.dm

@@ -0,0 +1,154 @@
+/*
+README:
+
+The global_iterator datum is supposed to provide a simple and robust way to
+create some constantly "looping" processes with ability to stop and restart them at will.
+Generally, the only thing you want to play with (meaning, redefine) is the process() proc.
+It must contain all the things you want done.
+
+Control functions:
+	new - used to create datum. First argument (optional) - var list(to use in process() proc) as list,
+	second (optional) - autostart control.
+	If autostart == TRUE, the loop will be started immediately after datum creation.
+
+	start(list/arguments) - starts the loop. Takes arguments(optional) as a list, which is then used
+	by process() proc. Returns null if datum already active, 1 if loop started succesfully and 0 if there's
+	an error in supplied arguments (not list or empty list).
+
+	stop() - stops the loop. Returns null if datum is already inactive and 1 on success.
+
+	set_delay(new_delay) - sets the delay between iterations. Pretty selfexplanatory.
+	Returns 0 on error(new_delay is not numerical), 1 otherwise.
+
+	set_process_args(list/arguments) - passes the supplied arguments to the process() proc.
+
+	active() - Returns 1 if datum is active, 0 otherwise.
+
+	toggle() - toggles datum state. Returns new datum state (see active()).
+
+Misc functions:
+
+	get_last_exec_time() - Returns the time of last iteration.
+
+	get_last_exec_time_as_text() - Returns the time of last iteration as text
+
+
+Control vars:
+
+	delay - 	delay between iterations
+
+	check_for_null - if equals TRUE, on each iteration the supplied arguments will be checked for nulls.
+	If some varible equals null (and null only), the loop is stopped.
+	Usefull, if some var unexpectedly becomes null - due to object deletion, for example.
+	Of course, you can also check the variables inside process() proc to prevent runtime errors.
+
+Data storage vars:
+
+	result - stores the value returned by process() proc
+*/
+
+/datum/global_iterator
+	var/control_switch = 0
+	var/delay = 10
+	var/list/arg_list = new
+	var/last_exec = null
+	var/check_for_null = 1
+	var/forbid_garbage = 0
+	var/result
+	var/state = 0
+
+	New(list/arguments=null,autostart=1)
+		delay = delay>0?(delay):1
+		if(forbid_garbage) //prevents garbage collection with tag != null
+			tag = "\ref[src]"
+		set_process_args(arguments)
+		if(autostart)
+			start()
+		return
+
+	proc/main()
+		state = 1
+		while(src && control_switch)
+			last_exec = world.timeofday
+			if(check_for_null && has_null_args())
+				stop()
+				return 0
+			result = process(arglist(arg_list))
+			for(var/sleep_time=delay;sleep_time>0;sleep_time--) //uhh, this is ugly. But I see no other way to terminate sleeping proc. Such disgrace.
+				if(!control_switch)
+					return 0
+				sleep(1)
+		return 0
+
+	proc/start(list/arguments=null)
+		if(active())
+			return
+		if(arguments)
+			if(!set_process_args(arguments))
+				return 0
+		if(!state_check()) //the main loop is sleeping, wait for it to terminate.
+			return
+		control_switch = 1
+		spawn()
+			state = main()
+		return 1
+
+	proc/stop()
+		if(!active())
+			return
+		control_switch = 0
+		spawn(-1) //report termination error but don't wait for state_check().
+			state_check()
+		return 1
+
+	proc/state_check()
+		var/lag = 0
+		while(state)
+			sleep(1)
+			if(++lag>10)
+				CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.")
+		return 1
+
+	proc/process()
+		return
+
+	proc/active()
+		return control_switch
+
+	proc/has_null_args()
+		if(null in arg_list)
+			return 1
+		return 0
+
+
+	proc/set_delay(new_delay)
+		if(isnum(new_delay))
+			delay = max(1, round(new_delay))
+			return 1
+		else
+			return 0
+
+	proc/get_last_exec_time()
+		return (last_exec||0)
+
+	proc/get_last_exec_time_as_text()
+		return (time2text(last_exec)||"Wasn't executed yet")
+
+	proc/set_process_args(list/arguments)
+		if(arguments && istype(arguments, /list) && arguments.len)
+			arg_list = arguments
+			return 1
+		else
+//			world << "\red Invalid arguments supplied for [src.type], ref = \ref[src]"
+			return 0
+
+	proc/toggle_null_checks()
+		check_for_null = !check_for_null
+		return check_for_null
+
+	proc/toggle()
+		if(!stop())
+			start()
+		return active()
+
+

code/datums/helper_datums/teleport.dm

@@ -0,0 +1,185 @@
+//wrapper
+/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+	new /datum/teleport/instant/science(arglist(args))
+	return
+
+/datum/teleport
+	var/atom/movable/teleatom //atom to teleport
+	var/atom/destination //destination to teleport to
+	var/precision = 0 //teleport precision
+	var/datum/effect/effect/system/effectin //effect to show right before teleportation
+	var/datum/effect/effect/system/effectout //effect to show right after teleportation
+	var/soundin //soundfile to play before teleportation
+	var/soundout //soundfile to play after teleportation
+	var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation)
+
+
+	New(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+		..()
+		if(!Init(arglist(args)))
+			return 0
+		return 1
+
+	proc/Init(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout)
+		if(!setTeleatom(ateleatom))
+			return 0
+		if(!setDestination(adestination))
+			return 0
+		if(!setPrecision(aprecision))
+			return 0
+		setEffects(aeffectin,aeffectout)
+		setForceTeleport(afteleport)
+		setSounds(asoundin,asoundout)
+		return 1
+
+	//must succeed
+	proc/setPrecision(aprecision)
+		if(isnum(aprecision))
+			precision = aprecision
+			return 1
+		return 0
+
+	//must succeed
+	proc/setDestination(atom/adestination)
+		if(istype(adestination))
+			destination = adestination
+			return 1
+		return 0
+
+	//must succeed in most cases
+	proc/setTeleatom(atom/movable/ateleatom)
+		if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
+			del(ateleatom)
+			return 0
+		if(istype(ateleatom))
+			teleatom = ateleatom
+			return 1
+		return 0
+
+	//custom effects must be properly set up first for instant-type teleports
+	//optional
+	proc/setEffects(datum/effect/effect/system/aeffectin=null,datum/effect/effect/system/aeffectout=null)
+		effectin = istype(aeffectin) ? aeffectin : null
+		effectout = istype(aeffectout) ? aeffectout : null
+		return 1
+
+	//optional
+	proc/setForceTeleport(afteleport)
+		force_teleport = afteleport
+		return 1
+
+	//optional
+	proc/setSounds(asoundin=null,asoundout=null)
+		soundin = isfile(asoundin) ? asoundin : null
+		soundout = isfile(asoundout) ? asoundout : null
+		return 1
+
+	//placeholder
+	proc/teleportChecks()
+		return 1
+
+	proc/playSpecials(atom/location,datum/effect/effect/system/effect,sound)
+		if(location)
+			if(effect)
+				spawn(-1)
+					src = null
+					effect.attach(location)
+					effect.start()
+			if(sound)
+				spawn(-1)
+					src = null
+					playsound(location,sound,60,1)
+		return
+
+	//do the monkey dance
+	proc/doTeleport()
+
+		var/turf/destturf
+		var/turf/curturf = get_turf(teleatom)
+		var/area/destarea = get_area(destination)
+		if(precision)
+			var/list/posturfs = circlerangeturfs(destination,precision)
+			destturf = safepick(posturfs)
+		else
+			destturf = get_turf(destination)
+
+		if(!destturf || !curturf)
+			return 0
+
+		playSpecials(curturf,effectin,soundin)
+
+		if(force_teleport)
+			teleatom.forceMove(destturf)
+			playSpecials(destturf,effectout,soundout)
+		else
+			if(teleatom.Move(destturf))
+				playSpecials(destturf,effectout,soundout)
+
+		destarea.Entered(teleatom)
+
+		return 1
+
+	proc/teleport()
+		if(teleportChecks())
+			return doTeleport()
+		return 0
+
+/datum/teleport/instant //teleports when datum is created
+
+	New(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+		if(..())
+			teleport()
+		return
+
+
+/datum/teleport/instant/science
+
+	setEffects(datum/effect/effect/system/aeffectin,datum/effect/effect/system/aeffectout)
+		if(!aeffectin || !aeffectout)
+			var/datum/effect/effect/system/spark_spread/aeffect = new
+			aeffect.set_up(5, 1, teleatom)
+			effectin = effectin || aeffect
+			effectout = effectout || aeffect
+			return 1
+		else
+			return ..()
+
+	setPrecision(aprecision)
+		..()
+		if(istype(teleatom, /obj/item/weapon/storage/backpack/holding))
+			precision = rand(1,100)
+
+		var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
+		if(bagholding.len)
+			precision = max(rand(1,100)*bagholding.len,100)
+			if(istype(teleatom, /mob/living))
+				var/mob/living/MM = teleatom
+				MM << "\red The Bluespace interface on your Bag of Holding interferes with the teleport!"
+		return 1
+
+	teleportChecks()
+		if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
+			teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
+			return 0
+
+		if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
+			if(istype(teleatom, /mob/living))
+				var/mob/living/MM = teleatom
+				MM.visible_message("\red <B>The [MM] bounces off of the portal!</B>","\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.")
+			else
+				teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
+			return 0
+
+		if(destination.z == 2) //centcomm z-level
+			if(istype(teleatom, /obj/mecha))
+				var/obj/mecha/MM = teleatom
+				MM.occupant << "\red <B>The mech would not survive the jump to a location so far away!</B>"
+				return 0
+			if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
+				teleatom.visible_message("\red <B>The Bag of Holding bounces off of the portal!</B>")
+				return 0
+
+
+		if(destination.z > 7) //Away mission z-levels
+			return 0
+		return 1

code/datums/helper_datums/topic_input.dm

@@ -0,0 +1,60 @@
+/datum/topic_input
+	var/href
+	var/list/href_list
+
+	New(thref,list/thref_list)
+		href = thref
+		href_list = thref_list.Copy()
+		return
+
+	proc/get(i)
+		return listgetindex(href_list,i)
+
+	proc/getAndLocate(i)
+		var/t = get(i)
+		if(t)
+			t = locate(t)
+		return t || null
+
+	proc/getNum(i)
+		var/t = get(i)
+		if(t)
+			t = text2num(t)
+		return isnum(t) ? t : null
+
+	proc/getObj(i)
+		var/t = getAndLocate(i)
+		return isobj(t) ? t : null
+
+	proc/getMob(i)
+		var/t = getAndLocate(i)
+		return ismob(t) ? t : null
+
+	proc/getTurf(i)
+		var/t = getAndLocate(i)
+		return isturf(t) ? t : null
+
+	proc/getAtom(i)
+		return getType(i,/atom)
+
+	proc/getArea(i)
+		var/t = getAndLocate(i)
+		return isarea(t) ? t : null
+
+	proc/getStr(i)//params should always be text, but...
+		var/t = get(i)
+		return istext(t) ? t : null
+
+	proc/getType(i,type)
+		var/t = getAndLocate(i)
+		return istype(t,type) ? t : null
+
+	proc/getPath(i)
+		var/t = get(i)
+		if(t)
+			t = text2path(t)
+		return ispath(t) ? t : null
+
+	proc/getList(i)
+		var/t = getAndLocate(i)
+		return islist(t) ? t : null

code/datums/mixed.dm

@@ -0,0 +1,49 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+/datum/data
+	var/name = "data"
+	var/size = 1.0
+
+
+/datum/data/function
+	name = "function"
+	size = 2.0
+
+
+/datum/data/function/data_control
+	name = "data control"
+
+
+/datum/data/function/id_changer
+	name = "id changer"
+
+
+/datum/data/record
+	name = "record"
+	size = 5.0
+	var/list/fields = list(  )
+
+
+/datum/data/text
+	name = "text"
+	var/data = null
+
+
+
+/datum/powernet
+	var/list/cables = list()	// all cables & junctions
+	var/list/nodes = list()		// all APCs & sources
+
+	var/newload = 0
+	var/load = 0
+	var/newavail = 0
+	var/avail = 0
+	var/viewload = 0
+	var/number = 0
+	var/perapc = 0			// per-apc avilability
+	var/netexcess = 0
+
+
+
+/datum/debug
+	var/list/debuglist

code/datums/modules.dm

@@ -0,0 +1,62 @@
+// module datum.
+// this is per-object instance, and shows the condition of the modules in the object
+// actual modules needed is referenced through modulestypes and the object type
+
+/datum/module
+	var/status				// bits set if working, 0 if broken
+	var/installed			// bits set if installed, 0 if missing
+
+// moduletypes datum
+// this is per-object type, and shows the modules needed for a type of object
+
+/datum/moduletypes
+	var/list/modcount = list()	// assoc list of the count of modules for a type
+
+
+var/list/modules = list(			// global associative list
+"/obj/machinery/power/apc" = "card_reader,power_control,id_auth,cell_power,cell_charge")
+
+
+/datum/module/New(var/obj/O)
+
+	var/type = O.type		// the type of the creating object
+
+	var/mneed = mods.inmodlist(type)		// find if this type has modules defined
+
+	if(!mneed)		// not found in module list?
+		del(src)	// delete self, thus ending proc
+
+	var/needed = mods.getbitmask(type)		// get a bitmask for the number of modules in this object
+	status = needed
+	installed = needed
+
+/datum/moduletypes/proc/addmod(var/type, var/modtextlist)
+	modules += type	// index by type text
+	modules[type] = modtextlist
+
+/datum/moduletypes/proc/inmodlist(var/type)
+	return ("[type]" in modules)
+
+/datum/moduletypes/proc/getbitmask(var/type)
+	var/count = modcount["[type]"]
+	if(count)
+		return 2**count-1
+
+	var/modtext = modules["[type]"]
+	var/num = 1
+	var/pos = 1
+
+	while(1)
+		pos = findtext(modtext, ",", pos, 0)
+		if(!pos)
+			break
+		else
+			pos++
+			num++
+
+	modcount += "[type]"
+	modcount["[type]"] = num
+
+	return 2**num-1
+
+

code/datums/recipe.dm

@@ -0,0 +1,120 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ * /datum/recipe by rastaf0            13 apr 2011 *
+ * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * This is powerful and flexible recipe system.
+ * It exists not only for food.
+ * supports both reagents and objects as prerequisites.
+ * In order to use this system you have to define a deriative from /datum/recipe
+ * * reagents are reagents. Acid, milc, booze, etc.
+ * * items are objects. Fruits, tools, circuit boards.
+ * * result is type to create as new object
+ * * time is optional parameter, you shall use in in your machine,
+     default /datum/recipe/ procs does not rely on this parameter.
+ *
+ *  Functions you need:
+ *  /datum/recipe/proc/make(var/obj/container as obj)
+ *    Creates result inside container,
+ *    deletes prerequisite reagents,
+ *    transfers reagents from prerequisite objects,
+ *    deletes all prerequisite objects (even not needed for recipe at the moment).
+ *
+ *  /proc/select_recipe(list/datum/recipe/avaiable_recipes, obj/obj as obj, exact = 1)
+ *    Wonderful function that select suitable recipe for you.
+ *    obj is a machine (or magik hat) with prerequisites,
+ *    exact = 0 forces algorithm to ignore superfluous stuff.
+ *
+ *
+ *  Functions you do not need to call directly but could:
+ *  /datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents)
+ *    //1=precisely,  0=insufficiently, -1=superfluous
+ *
+ *  /datum/recipe/proc/check_items(var/obj/container as obj)
+ *    //1=precisely, 0=insufficiently, -1=superfluous
+ *
+ * */
+
+/datum/recipe
+	var/list/reagents // example:  = list("berryjuice" = 5) // do not list same reagent twice
+	var/list/items // example: =list(/obj/item/weapon/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo
+	var/result //example: = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
+	var/time = 100 // 1/10 part of second
+
+
+/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous
+	. = 1
+	for (var/r_r in reagents)
+		var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r)
+		if (!(abs(aval_r_amnt - reagents[r_r])<0.5)) //if NOT equals
+			if (aval_r_amnt>reagents[r_r])
+				. = -1
+			else
+				return 0
+	if ((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len)
+		return -1
+	return .
+
+/datum/recipe/proc/check_items(var/obj/container as obj) //1=precisely, 0=insufficiently, -1=superfluous
+	if (!items)
+		if (locate(/obj/) in container)
+			return -1
+		else
+			return 1
+	. = 1
+	var/list/checklist = items.Copy()
+	for (var/obj/O in container)
+		var/found = 0
+		for (var/type in checklist)
+			if (istype(O,type))
+				checklist-=type
+				found = 1
+				break
+		if (!found)
+			. = -1
+	if (checklist.len)
+		return 0
+	return .
+
+//general version
+/datum/recipe/proc/make(var/obj/container as obj)
+	var/obj/result_obj = new result(container)
+	for (var/obj/O in (container.contents-result_obj))
+		O.reagents.trans_to(result_obj, O.reagents.total_volume)
+		del(O)
+	container.reagents.clear_reagents()
+	return result_obj
+
+// food-related
+/datum/recipe/proc/make_food(var/obj/container as obj)
+	var/obj/result_obj = new result(container)
+	for (var/obj/O in (container.contents-result_obj))
+		if (O.reagents)
+			O.reagents.del_reagent("nutriment")
+			O.reagents.update_total()
+			O.reagents.trans_to(result_obj, O.reagents.total_volume)
+		del(O)
+	container.reagents.clear_reagents()
+	return result_obj
+
+/proc/select_recipe(var/list/datum/recipe/avaiable_recipes, var/obj/obj as obj, var/exact = 1 as num)
+	if (!exact)
+		exact = -1
+	var/list/datum/recipe/possible_recipes = new
+	for (var/datum/recipe/recipe in avaiable_recipes)
+		if (recipe.check_reagents(obj.reagents)==exact && recipe.check_items(obj)==exact)
+			possible_recipes+=recipe
+	if (possible_recipes.len==0)
+		return null
+	else if (possible_recipes.len==1)
+		return possible_recipes[1]
+	else //okay, let's select the most complicated recipe
+		var/r_count = 0
+		var/i_count = 0
+		. = possible_recipes[1]
+		for (var/datum/recipe/recipe in possible_recipes)
+			var/N_i = (recipe.items)?(recipe.items.len):0
+			var/N_r = (recipe.reagents)?(recipe.reagents.len):0
+			if (N_i > i_count || (N_i== i_count && N_r > r_count ))
+				r_count = N_r
+				i_count = N_i
+				. = recipe
+		return .

code/datums/spell.dm

@@ -0,0 +1,286 @@
+/obj/effect/proc_holder
+	var/panel = "Debug"//What panel the proc holder needs to go on.
+
+var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin verb for now
+
+/obj/effect/proc_holder/spell
+	name = "Spell"
+	desc = "A wizard spell"
+	density = 0
+	opacity = 0
+
+	var/school = "evocation" //not relevant at now, but may be important later if there are changes to how spells work. the ones I used for now will probably be changed... maybe spell presets? lacking flexibility but with some other benefit?
+
+	var/charge_type = "recharge" //can be recharge or charges, see charge_max and charge_counter descriptions; can also be based on the holder's vars now, use "holder_var" for that
+
+	var/charge_max = 100 //recharge time in deciseconds if charge_type = "recharge" or starting charges if charge_type = "charges"
+	var/charge_counter = 0 //can only cast spells if it equals recharge, ++ each decisecond if charge_type = "recharge" or -- each cast if charge_type = "charges"
+
+	var/holder_var_type = "bruteloss" //only used if charge_type equals to "holder_var"
+	var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
+
+	var/clothes_req = 1 //see if it requires clothes
+	var/stat_allowed = 0 //see if it requires being conscious/alive, need to set to 1 for ghostpells
+	var/invocation = "HURP DURP" //what is uttered when the wizard casts the spell
+	var/invocation_type = "none" //can be none, whisper and shout
+	var/range = 7 //the range of the spell; outer radius for aoe spells
+	var/message = "" //whatever it says to the guy affected by it
+	var/selection_type = "view" //can be "range" or "view"
+
+	var/overlay = 0
+	var/overlay_icon = 'icons/obj/wizard.dmi'
+	var/overlay_icon_state = "spell"
+	var/overlay_lifespan = 0
+
+	var/sparks_spread = 0
+	var/sparks_amt = 0 //cropped at 10
+	var/smoke_spread = 0 //1 - harmless, 2 - harmful
+	var/smoke_amt = 0 //cropped at 10
+
+	var/critfailchance = 0
+	var/centcomm_cancast = 1 //Whether or not the spell should be allowed on z2
+
+/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
+
+	if(!(src in usr.spell_list))
+		usr << "\red You shouldn't have this spell! Something's wrong."
+		return 0
+
+	if(usr.z == 2 && !centcomm_cancast) //Certain spells are not allowed on the centcomm zlevel
+		return 0
+
+	if(!skipcharge)
+		switch(charge_type)
+			if("recharge")
+				if(charge_counter < charge_max)
+					usr << "[name] is still recharging."
+					return 0
+			if("charges")
+				if(!charge_counter)
+					usr << "[name] has no charges left."
+					return 0
+
+	if(usr.stat && !stat_allowed)
+		usr << "Not when you're incapacitated."
+		return 0
+
+	if(ishuman(usr) || ismonkey(usr))
+		if(istype(usr.wear_mask, /obj/item/clothing/mask/muzzle))
+			usr << "Mmmf mrrfff!"
+			return 0
+
+	if(clothes_req) //clothes check
+		if(!istype(usr, /mob/living/carbon/human))
+			usr << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans."
+			return 0
+		if(!istype(usr:wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(user:wear_suit, /obj/item/clothing/suit/space/rig/wizard))
+			usr << "I don't feel strong enough without my robe."
+			return 0
+		if(!istype(usr:shoes, /obj/item/clothing/shoes/sandal))
+			usr << "I don't feel strong enough without my sandals."
+			return 0
+		if(!istype(usr:head, /obj/item/clothing/head/wizard) && !istype(user:head, /obj/item/clothing/head/helmet/space/rig/wizard))
+			usr << "I don't feel strong enough without my hat."
+			return 0
+
+	if(!skipcharge)
+		switch(charge_type)
+			if("recharge")
+				charge_counter = 0 //doesn't start recharging until the targets selecting ends
+			if("charges")
+				charge_counter-- //returns the charge if the targets selecting fails
+			if("holdervar")
+				adjust_var(user, holder_var_type, holder_var_amount)
+
+	return 1
+
+/obj/effect/proc_holder/spell/proc/invocation(mob/user = usr) //spelling the spell out and setting it on recharge/reducing charges amount
+
+	switch(invocation_type)
+		if("shout")
+			if(prob(50))//Auto-mute? Fuck that noise
+				usr.say(invocation)
+			else
+				usr.say(replacetext(invocation," ","`"))
+			if(usr.gender==MALE)
+				playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
+			else
+				playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
+		if("whisper")
+			if(prob(50))
+				usr.whisper(invocation)
+			else
+				usr.whisper(replacetext(invocation," ","`"))
+
+/obj/effect/proc_holder/spell/New()
+	..()
+
+	charge_counter = charge_max
+
+/obj/effect/proc_holder/spell/Click()
+    if(cast_check())
+        choose_targets()
+    return 1
+
+/obj/effect/proc_holder/spell/proc/choose_targets(mob/user = usr) //depends on subtype - /targeted or /aoe_turf
+	return
+
+/obj/effect/proc_holder/spell/proc/start_recharge()
+	while(charge_counter < charge_max)
+		sleep(1)
+		charge_counter++
+
+/obj/effect/proc_holder/spell/proc/perform(list/targets, recharge = 1) //if recharge is started is important for the trigger spells
+	before_cast(targets)
+	invocation()
+	spawn(0)
+		if(charge_type == "recharge" && recharge)
+			start_recharge()
+	if(prob(critfailchance))
+		critfail(targets)
+	else
+		cast(targets)
+	after_cast(targets)
+
+/obj/effect/proc_holder/spell/proc/before_cast(list/targets)
+	if(overlay)
+		for(var/atom/target in targets)
+			var/location
+			if(istype(target,/mob/living))
+				location = target.loc
+			else if(istype(target,/turf))
+				location = target
+			var/obj/effect/overlay/spell = new /obj/effect/overlay(location)
+			spell.icon = overlay_icon
+			spell.icon_state = overlay_icon_state
+			spell.anchored = 1
+			spell.density = 0
+			spawn(overlay_lifespan)
+				del(spell)
+
+/obj/effect/proc_holder/spell/proc/after_cast(list/targets)
+	for(var/atom/target in targets)
+		var/location
+		if(istype(target,/mob/living))
+			location = target.loc
+		else if(istype(target,/turf))
+			location = target
+		if(istype(target,/mob/living) && message)
+			target << text("[message]")
+		if(sparks_spread)
+			var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
+			sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is
+			sparks.start()
+		if(smoke_spread)
+			if(smoke_spread == 1)
+				var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
+				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
+				smoke.start()
+			else if(smoke_spread == 2)
+				var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad()
+				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
+				smoke.start()
+
+/obj/effect/proc_holder/spell/proc/cast(list/targets)
+	return
+
+/obj/effect/proc_holder/spell/proc/critfail(list/targets)
+	return
+
+/obj/effect/proc_holder/spell/proc/revert_cast(mob/user = usr) //resets recharge or readds a charge
+	switch(charge_type)
+		if("recharge")
+			charge_counter = charge_max
+		if("charges")
+			charge_counter++
+		if("holdervar")
+			adjust_var(user, holder_var_type, -holder_var_amount)
+
+	return
+
+/obj/effect/proc_holder/spell/proc/adjust_var(mob/living/target = usr, type, amount) //handles the adjustment of the var when the spell is used. has some hardcoded types
+	switch(type)
+		if("bruteloss")
+			target.adjustBruteLoss(amount)
+		if("fireloss")
+			target.adjustFireLoss(amount)
+		if("toxloss")
+			target.adjustToxLoss(amount)
+		if("oxyloss")
+			target.adjustOxyLoss(amount)
+		if("stunned")
+			target.AdjustStunned(amount)
+		if("weakened")
+			target.AdjustWeakened(amount)
+		if("paralysis")
+			target.AdjustParalysis(amount)
+		else
+			target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existant vars
+	return
+
+/obj/effect/proc_holder/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
+	var/max_targets = 1 //leave 0 for unlimited targets in range, 1 for one selectable target in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range
+	var/target_ignore_prev = 1 //only important if max_targets > 1, affects if the spell can be cast multiple times at one person from one cast
+	var/include_user = 0 //if it includes usr in the target list
+
+/obj/effect/proc_holder/spell/aoe_turf //affects all turfs in view or range (depends)
+	var/inner_radius = -1 //for all your ring spell needs
+
+/obj/effect/proc_holder/spell/targeted/choose_targets(mob/user = usr)
+	var/list/targets = list()
+
+	switch(max_targets)
+		if(0) //unlimited
+			for(var/mob/living/target in view_or_range(range, user, selection_type))
+				targets += target
+		if(1) //single target can be picked
+			if(range < 0)
+				targets += user
+			else
+				var/possible_targets = list()
+
+				for(var/mob/living/M in view_or_range(range, user, selection_type))
+					if(!include_user && user == M)
+						continue
+					possible_targets += M
+
+				targets += input("Choose the target for the spell.", "Targeting") as mob in possible_targets
+		else
+			var/list/possible_targets = list()
+			for(var/mob/living/target in view_or_range(range, user, selection_type))
+				possible_targets += target
+			for(var/i=1,i<=max_targets,i++)
+				if(!possible_targets.len)
+					break
+				if(target_ignore_prev)
+					var/target = pick(possible_targets)
+					possible_targets -= target
+					targets += target
+				else
+					targets += pick(possible_targets)
+
+	if(!include_user && (user in targets))
+		targets -= user
+
+	if(!targets.len) //doesn't waste the spell
+		revert_cast(user)
+		return
+
+	perform(targets)
+
+	return
+
+/obj/effect/proc_holder/spell/aoe_turf/choose_targets(mob/user = usr)
+	var/list/targets = list()
+
+	for(var/turf/target in view_or_range(range,user,selection_type))
+		if(!(target in view_or_range(inner_radius,user,selection_type)))
+			targets += target
+
+	if(!targets.len) //doesn't waste the spell
+		revert_cast()
+		return
+
+	perform(targets)
+
+	return

code/datums/spells/area_teleport.dm

@@ -0,0 +1,82 @@
+/obj/effect/proc_holder/spell/targeted/area_teleport
+	name = "Area teleport"
+	desc = "This spell teleports you to a type of area of your selection."
+
+	var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
+	var/invocation_area = 1 //if the invocation appends the selected area
+
+/obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1)
+	var/thearea = before_cast(targets)
+	if(!thearea || !cast_check(1))
+		revert_cast()
+		return
+	invocation(thearea)
+	spawn(0)
+		if(charge_type == "recharge" && recharge)
+			start_recharge()
+	cast(targets,thearea)
+	after_cast(targets)
+
+/obj/effect/proc_holder/spell/targeted/area_teleport/before_cast(list/targets)
+	var/A = null
+
+	if(!randomise_selection)
+		A = input("Area to teleport to", "Teleport", A) in teleportlocs
+	else
+		A = pick(teleportlocs)
+
+	var/area/thearea = teleportlocs[A]
+
+	return thearea
+
+/obj/effect/proc_holder/spell/targeted/area_teleport/cast(list/targets,area/thearea)
+	for(var/mob/living/target in targets)
+		var/list/L = list()
+		for(var/turf/T in get_area_turfs(thearea.type))
+			if(!T.density)
+				var/clear = 1
+				for(var/obj/O in T)
+					if(O.density)
+						clear = 0
+						break
+				if(clear)
+					L+=T
+
+		if(!L.len)
+			usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
+			return
+
+		if(target && target.buckled)
+			target.buckled.unbuckle()
+
+		var/list/tempL = L
+		var/attempt = null
+		var/success = 0
+		while(tempL.len)
+			attempt = pick(tempL)
+			success = target.Move(attempt)
+			if(!success)
+				tempL.Remove(attempt)
+			else
+				break
+
+		if(!success)
+			target.loc = pick(L)
+
+	return
+
+/obj/effect/proc_holder/spell/targeted/area_teleport/invocation(area/chosenarea = null)
+	if(!invocation_area || !chosenarea)
+		..()
+	else
+		switch(invocation_type)
+			if("shout")
+				usr.say("[invocation] [uppertext(chosenarea.name)]")
+				if(usr.gender==MALE)
+					playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
+				else
+					playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
+			if("whisper")
+				usr.whisper("[invocation] [uppertext(chosenarea.name)]")
+
+	return

code/datums/spells/conjure.dm

@@ -0,0 +1,87 @@
+/obj/effect/proc_holder/spell/aoe_turf/conjure
+	name = "Conjure"
+	desc = "This spell conjures objs of the specified types in range."
+
+	var/list/summon_type = list() //determines what exactly will be summoned
+	//should be text, like list("/obj/machinery/bot/ed209")
+
+	var/summon_lifespan = 0 // 0=permanent, any other time in deciseconds
+	var/summon_amt = 1 //amount of objects summoned
+	var/summon_ignore_density = 0 //if set to 1, adds dense tiles to possible spawn places
+	var/summon_ignore_prev_spawn_points = 0 //if set to 1, each new object is summoned on a new spawn point
+
+	var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
+	//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example
+	var/delay = 1//Go Go Gadget Inheritance
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/cast(list/targets)
+
+	for(var/turf/T in targets)
+		if(T.density && !summon_ignore_density)
+			targets -= T
+	playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
+
+	if(do_after(usr,delay))
+		for(var/i=0,i<summon_amt,i++)
+			if(!targets.len)
+				break
+			var/summoned_object_type = pick(summon_type)
+			var/spawn_place = pick(targets)
+			if(summon_ignore_prev_spawn_points)
+				targets -= spawn_place
+			if(ispath(summoned_object_type,/turf))
+				var/turf/O = spawn_place
+				var/turf/N = summoned_object_type
+				O.ChangeTurf(N)
+			else
+				var/atom/summoned_object = new summoned_object_type(spawn_place)
+
+				for(var/varName in newVars)
+					if(varName in summoned_object.vars)
+						summoned_object.vars[varName] = newVars[varName]
+
+				if(summon_lifespan)
+					spawn(summon_lifespan)
+						if(summoned_object)
+							del(summoned_object)
+	else
+		switch(charge_type)
+			if("recharge")
+				charge_counter = charge_max - 5//So you don't lose charge for a failed spell(Also prevents most over-fill)
+			if("charges")
+				charge_counter++//Ditto, just for different spell types
+
+
+	return
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes
+	name = "Dispense Wizard Justice"
+	desc = "This spell dispenses wizard justice."
+
+	summon_type = list(/obj/machinery/bot/ed209)
+	summon_amt = 10
+	range = 3
+	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")
+
+
+//This was previously left in the old wizard code, not being included.
+//Wasn't sure if I should transfer it here, or to code/datums/spells.dm
+//But I decided because it is a conjuration related object it would fit better here
+//Feel free to change this, I don't know.
+/obj/effect/forcefield
+	desc = "A space wizard's magic wall."
+	name = "FORCEWALL"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "m_shield"
+	anchored = 1.0
+	opacity = 0
+	density = 1
+	unacidable = 1
+
+
+	bullet_act(var/obj/item/projectile/Proj, var/def_zone)
+		var/turf/T = get_turf(src.loc)
+		if(T)
+			for(var/mob/M in T)
+				Proj.on_hit(M,M.bullet_act(Proj, def_zone))
+		return

code/datums/spells/dumbfire.dm

@@ -0,0 +1,86 @@
+/obj/effect/proc_holder/spell/dumbfire
+
+	var/projectile_type = ""
+	var/activate_on_collision = 1
+
+	var/proj_icon = 'icons/obj/projectiles.dmi'
+	var/proj_icon_state = "spell"
+	var/proj_name = "a spell projectile"
+
+	var/proj_trail = 0 //if it leaves a trail
+	var/proj_trail_lifespan = 0 //deciseconds
+	var/proj_trail_icon = 'icons/obj/wizard.dmi'
+	var/proj_trail_icon_state = "trail"
+
+	var/proj_type = "/obj/effect/proc_holder/spell" //IMPORTANT use only subtypes of this
+
+	var/proj_insubstantial = 0 //if it can pass through dense objects or not
+	var/proj_trigger_range = 1 //the range from target at which the projectile triggers cast(target)
+
+	var/proj_lifespan = 100 //in deciseconds * proj_step_delay
+	var/proj_step_delay = 1 //lower = faster
+
+/obj/effect/proc_holder/spell/dumbfire/choose_targets(mob/user = usr)
+
+	var/turf/T = get_turf(usr)
+	for(var/i = 1; i < range; i++)
+		var/turf/new_turf = get_step(T, usr.dir)
+		if(new_turf.density)
+			break
+		T = new_turf
+	perform(list(T))
+
+/obj/effect/proc_holder/spell/dumbfire/cast(list/targets, mob/user = usr)
+
+	for(var/turf/target in targets)
+		spawn(0)
+			var/obj/effect/proc_holder/spell/targeted/projectile
+			if(istext(proj_type))
+				var/projectile_type = text2path(proj_type)
+				projectile = new projectile_type(user)
+			if(istype(proj_type,/obj/effect/proc_holder/spell))
+				projectile = new /obj/effect/proc_holder/spell/targeted/trigger(user)
+				projectile:linked_spells += proj_type
+			projectile.icon = proj_icon
+			projectile.icon_state = proj_icon_state
+			projectile.dir = get_dir(projectile, target)
+			projectile.name = proj_name
+
+			var/current_loc = usr.loc
+
+			projectile.loc = current_loc
+
+			for(var/i = 0,i < proj_lifespan,i++)
+				if(!projectile)
+					break
+
+				if(proj_insubstantial)
+					projectile.loc = get_step(projectile, projectile.dir)
+				else
+					step(projectile, projectile.dir)
+
+				if(projectile.loc == current_loc || i == proj_lifespan)
+					projectile.cast(current_loc)
+					break
+
+				var/mob/living/L = locate(/mob/living) in range(projectile, proj_trigger_range) - usr
+				if(L)
+					projectile.cast(L.loc)
+					break
+
+				if(proj_trail && projectile)
+					spawn(0)
+						if(projectile)
+							var/obj/effect/overlay/trail = new /obj/effect/overlay(projectile.loc)
+							trail.icon = proj_trail_icon
+							trail.icon_state = proj_trail_icon_state
+							trail.density = 0
+							spawn(proj_trail_lifespan)
+								del(trail)
+
+				current_loc = projectile.loc
+
+				sleep(proj_step_delay)
+
+			if(projectile)
+				del(projectile)

code/datums/spells/emplosion.dm

@@ -0,0 +1,13 @@
+/obj/effect/proc_holder/spell/targeted/emplosion
+	name = "Emplosion"
+	desc = "This spell emplodes an area."
+
+	var/emp_heavy = 2
+	var/emp_light = 3
+
+/obj/effect/proc_holder/spell/targeted/emplosion/cast(list/targets)
+
+	for(var/mob/living/target in targets)
+		empulse(target.loc, emp_heavy, emp_light)
+
+	return

code/datums/spells/ethereal_jaunt.dm

@@ -0,0 +1,101 @@
+/obj/effect/proc_holder/spell/targeted/ethereal_jaunt
+	name = "Ethereal Jaunt"
+	desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
+
+	school = "transmutation"
+	charge_max = 300
+	clothes_req = 1
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_user = 1
+	centcomm_cancast = 0 //Prevent people from getting to centcomm
+
+	var phaseshift = 0
+	var/jaunt_duration = 50 //in deciseconds
+
+/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
+	for(var/mob/living/target in targets)
+		spawn(0)
+			var/mobloc = get_turf(target.loc)
+			var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc )
+			var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
+			animation.name = "water"
+			animation.density = 0
+			animation.anchored = 1
+			animation.icon = 'icons/mob/mob.dmi'
+			animation.icon_state = "liquify"
+			animation.layer = 5
+			animation.master = holder
+			if(phaseshift == 1)
+				animation.dir = target.dir
+				flick("phase_shift",animation)
+				target.loc = holder
+				target.client.eye = holder
+				sleep(jaunt_duration)
+				mobloc = get_turf(target.loc)
+				animation.loc = mobloc
+				target.canmove = 0
+				sleep(20)
+				animation.dir = target.dir
+				flick("phase_shift2",animation)
+				sleep(5)
+				if(!target.Move(mobloc))
+					for(var/direction in list(1,2,4,8,5,6,9,10))
+						var/turf/T = get_step(mobloc, direction)
+						if(T)
+							if(target.Move(T))
+								break
+				target.canmove = 1
+				target.client.eye = target
+				del(animation)
+				del(holder)
+			else
+				flick("liquify",animation)
+				target.loc = holder
+				target.client.eye = holder
+				var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
+				steam.set_up(10, 0, mobloc)
+				steam.start()
+				sleep(jaunt_duration)
+				mobloc = get_turf(target.loc)
+				animation.loc = mobloc
+				steam.location = mobloc
+				steam.start()
+				target.canmove = 0
+				sleep(20)
+				flick("reappear",animation)
+				sleep(5)
+				if(!target.Move(mobloc))
+					for(var/direction in list(1,2,4,8,5,6,9,10))
+						var/turf/T = get_step(mobloc, direction)
+						if(T)
+							if(target.Move(T))
+								break
+				target.canmove = 1
+				target.client.eye = target
+				del(animation)
+				del(holder)
+
+/obj/effect/dummy/spell_jaunt
+	name = "water"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "nothing"
+	var/canmove = 1
+	density = 0
+	anchored = 1
+
+/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
+	if (!src.canmove) return
+	var/turf/newLoc = get_step(src,direction)
+	if(!(newLoc.flags & NOJAUNT))
+		loc = newLoc
+	else
+		user << "<span class='warning'>Some strange aura is blocking the way!</span>"
+	src.canmove = 0
+	spawn(2) src.canmove = 1
+
+/obj/effect/dummy/spell_jaunt/ex_act(blah)
+	return
+/obj/effect/dummy/spell_jaunt/bullet_act(blah)
+	return

code/datums/spells/explosion.dm

@@ -0,0 +1,15 @@
+/obj/effect/proc_holder/spell/targeted/explosion
+	name = "Explosion"
+	desc = "This spell explodes an area."
+
+	var/ex_severe = 1
+	var/ex_heavy = 2
+	var/ex_light = 3
+	var/ex_flash = 4
+
+/obj/effect/proc_holder/spell/targeted/explosion/cast(list/targets)
+
+	for(var/mob/living/target in targets)
+		explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
+
+	return

code/datums/spells/genetic.dm

@@ -0,0 +1,31 @@
+/obj/effect/proc_holder/spell/targeted/genetic
+	name = "Genetic"
+	desc = "This spell inflicts a set of mutations and disabilities upon the target."
+
+	var/disabilities = 0 //bits
+	var/list/mutations = list() //mutation strings
+	var/duration = 100 //deciseconds
+	/*
+		Disabilities
+			1st bit - ?
+			2nd bit - ?
+			3rd bit - ?
+			4th bit - ?
+			5th bit - ?
+			6th bit - ?
+	*/
+
+/obj/effect/proc_holder/spell/targeted/genetic/cast(list/targets)
+
+	for(var/mob/living/target in targets)
+		for(var/x in mutations)
+			target.mutations.Add(x)
+		target.disabilities |= disabilities
+		target.update_mutations()	//update target's mutation overlays
+		spawn(duration)
+			for(var/x in mutations)
+				target.mutations.Remove(x)
+			target.disabilities &= ~disabilities
+			target.update_mutations()
+
+	return

code/datums/spells/horsemask.dm

@@ -0,0 +1,39 @@
+/obj/effect/proc_holder/spell/targeted/horsemask
+	name = "Curse of the Horseman"
+	desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes."
+	school = "transmutation"
+	charge_type = "recharge"
+	charge_max = 150
+	charge_counter = 0
+	clothes_req = 0
+	stat_allowed = 0
+	invocation = "KN'A FTAGHU, PUCK 'BTHNK!"
+	invocation_type = "shout"
+	range = 7
+	selection_type = "range"
+	var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+
+/obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr)
+	if(!targets.len)
+		user << "<span class='notice'>No target found in range.</span>"
+		return
+
+	var/mob/living/carbon/target = targets[1]
+
+	if(!(target.type in compatible_mobs))
+		user << "<span class='notice'>It'd be stupid to curse [target] with a horse's head!</span>"
+		return
+
+	if(!(target in oview(range)))//If they are not  in overview after selection.
+		user << "<span class='notice'>They are too far away!</span>"
+		return
+
+	var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
+	magichead.canremove = 0		//curses!
+	magichead.flags_inv = null	//so you can still see their face
+	magichead.voicechange = 1	//NEEEEIIGHH
+	target.visible_message(	"<span class='danger'>[target]'s face  lights up in fire, and after the event a horse's head takes its place!</span>", \
+							"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
+	target.equip_to_slot(magichead, slot_wear_mask)
+
+	flick("e_flash", target.flash)

code/datums/spells/inflict_handler.dm

@@ -0,0 +1,59 @@
+/obj/effect/proc_holder/spell/targeted/inflict_handler
+	name = "Inflict Handler"
+	desc = "This spell blinds and/or destroys/damages/heals and/or weakens/stuns the target."
+
+	var/amt_weakened = 0
+	var/amt_paralysis = 0
+	var/amt_stunned = 0
+
+	//set to negatives for healing
+	var/amt_dam_fire = 0
+	var/amt_dam_brute = 0
+	var/amt_dam_oxy = 0
+	var/amt_dam_tox = 0
+
+	var/amt_eye_blind = 0
+	var/amt_eye_blurry = 0
+
+	var/destroys = "none" //can be "none", "gib" or "disintegrate"
+
+/obj/effect/proc_holder/spell/targeted/inflict_handler/cast(list/targets)
+
+	for(var/mob/living/target in targets)
+		switch(destroys)
+			if("gib")
+				target.gib()
+			if("gib_brain")
+				if(ishuman(target) || ismonkey(target))
+					var/mob/living/carbon/C = target
+					if(C.brain_op_stage != 4) // Their brain is already taken out
+						var/obj/item/brain/B = new(C.loc)
+						B.transfer_identity(C)
+				target.gib()
+			if("disintegrate")
+				target.dust()
+
+		if(!target)
+			continue
+		//damage
+		if(amt_dam_brute > 0)
+			if(amt_dam_fire >= 0)
+				target.take_overall_damage(amt_dam_brute,amt_dam_fire)
+			else if (amt_dam_fire < 0)
+				target.take_overall_damage(amt_dam_brute,0)
+				target.heal_overall_damage(0,amt_dam_fire)
+		else if(amt_dam_brute < 0)
+			if(amt_dam_fire > 0)
+				target.take_overall_damage(0,amt_dam_fire)
+				target.heal_overall_damage(amt_dam_brute,0)
+			else if (amt_dam_fire <= 0)
+				target.heal_overall_damage(amt_dam_brute,amt_dam_fire)
+		target.adjustToxLoss(amt_dam_tox)
+		target.oxyloss += amt_dam_oxy
+		//disabling
+		target.Weaken(amt_weakened)
+		target.Paralyse(amt_paralysis)
+		target.Stun(amt_stunned)
+
+		target.eye_blind += amt_eye_blind
+		target.eye_blurry += amt_eye_blurry

code/datums/spells/knock.dm

@@ -0,0 +1,19 @@
+/obj/effect/proc_holder/spell/aoe_turf/knock
+	name = "Knock"
+	desc = "This spell opens nearby doors and does not require wizard garb."
+
+	school = "transmutation"
+	charge_max = 100
+	clothes_req = 0
+	invocation = "AULIE OXIN FIERA"
+	invocation_type = "whisper"
+	range = 3
+
+/obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets)
+	for(var/turf/T in targets)
+		for(var/obj/machinery/door/door in T.contents)
+			spawn(1)
+				if(istype(door,/obj/machinery/door/airlock))
+					door:locked = 0
+				door.open()
+	return

code/datums/spells/mind_transfer.dm

@@ -0,0 +1,114 @@
+/obj/effect/proc_holder/spell/targeted/mind_transfer
+	name = "Mind Transfer"
+	desc = "This spell allows the user to switch bodies with a target."
+
+	school = "transmutation"
+	charge_max = 600
+	clothes_req = 0
+	invocation = "GIN'YU CAPAN"
+	invocation_type = "whisper"
+	range = 1
+	var/list/protected_roles = list("Wizard","Changeling","Cultist") //which roles are immune to the spell
+	var/list/compatible_mobs = list(/mob/living/carbon/human,/mob/living/carbon/monkey) //which types of mobs are affected by the spell. NOTE: change at your own risk
+	var/base_spell_loss_chance = 20 //base probability of the wizard losing a spell in the process
+	var/spell_loss_chance_modifier = 7 //amount of probability of losing a spell added per spell (mind_transfer included)
+	var/spell_loss_amount = 1 //the maximum amount of spells possible to lose during a single transfer
+	var/msg_wait = 500 //how long in deciseconds it waits before telling that body doesn't feel right or mind swap robbed of a spell
+	var/paralysis_amount_caster = 20 //how much the caster is paralysed for after the spell
+	var/paralysis_amount_victim = 20 //how much the victim is paralysed for after the spell
+
+/*
+Urist: I don't feel like figuring out how you store object spells so I'm leaving this for you to do.
+Make sure spells that are removed from spell_list are actually removed and deleted when mind transfering.
+Also, you never added distance checking after target is selected. I've went ahead and did that.
+*/
+/obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr)
+	if(!targets.len)
+		user << "No mind found."
+		return
+
+	if(targets.len > 1)
+		user << "Too many minds! You're not a hive damnit!"//Whaa...aat?
+		return
+
+	var/mob/living/target = targets[1]
+
+	if(!(target in oview(range)))//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it.
+		user << "They are too far away!"
+		return
+
+	if(!(target.type in compatible_mobs))
+		user << "Their mind isn't compatible with yours."
+		return
+
+	if(target.stat == DEAD)
+		user << "You didn't study necromancy back at the Space Wizard Federation academy."
+		return
+
+	if(!target.key || !target.mind)
+		user << "They appear to be catatonic. Not even magic can affect their vacant mind."
+		return
+
+	if(target.mind.special_role in protected_roles)
+		user << "Their mind is resisting your spell."
+		return
+
+	var/mob/living/victim = target//The target of the spell whos body will be transferred to.
+	var/mob/caster = user//The wizard/whomever doing the body transferring.
+
+	//SPELL LOSS BEGIN
+	//NOTE: The caster must ALWAYS keep mind transfer, even when other spells are lost.
+	var/obj/effect/proc_holder/spell/targeted/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly.
+	var/list/checked_spells = user.spell_list
+	checked_spells -= m_transfer //Remove Mind Transfer from the list.
+
+	if(caster.spell_list.len)//If they have any spells left over after mind transfer is taken out. If they don't, we don't need this.
+		for(var/i=spell_loss_amount,(i>0&&checked_spells.len),i--)//While spell loss amount is greater than zero and checked_spells has spells in it, run this proc.
+			for(var/j=checked_spells.len,(j>0&&checked_spells.len),j--)//While the spell list to check is greater than zero and has spells in it, run this proc.
+				if(prob(base_spell_loss_chance))
+					checked_spells -= pick(checked_spells)//Pick a random spell to remove.
+					spawn(msg_wait)
+						victim << "The mind transfer has robbed you of a spell."
+					break//Spell lost. Break loop, going back to the previous for() statement.
+				else//Or keep checking, adding spell chance modifier to increase chance of losing a spell.
+					base_spell_loss_chance += spell_loss_chance_modifier
+
+	checked_spells += m_transfer//Add back Mind Transfer.
+	user.spell_list = checked_spells//Set user spell list to whatever the new list is.
+	//SPELL LOSS END
+
+	//MIND TRANSFER BEGIN
+	if(caster.mind.special_verbs.len)//If the caster had any special verbs, remove them from the mob verb list.
+		for(var/V in caster.mind.special_verbs)//Since the caster is using an object spell system, this is mostly moot.
+			caster.verbs -= V//But a safety nontheless.
+
+	if(victim.mind.special_verbs.len)//Now remove all of the victim's verbs.
+		for(var/V in victim.mind.special_verbs)
+			victim.verbs -= V
+
+	var/mob/dead/observer/ghost = victim.ghostize(0)
+	ghost.spell_list = victim.spell_list//If they have spells, transfer them. Now we basically have a backup mob.
+
+	caster.mind.transfer_to(victim)
+	victim.spell_list = caster.spell_list//Now they are inside the victim's body.
+
+	if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster.
+		for(var/V in caster.mind.special_verbs)//Not too important but could come into play.
+			caster.verbs += V
+
+	ghost.mind.transfer_to(caster)
+	caster.key = ghost.key	//have to transfer the key since the mind was not active
+	caster.spell_list = ghost.spell_list
+
+	if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here.
+		for(var/V in caster.mind.special_verbs)
+			caster.verbs += V
+	//MIND TRANSFER END
+
+	//Here we paralyze both mobs and knock them out for a time.
+	caster.Paralyse(paralysis_amount_caster)
+	victim.Paralyse(paralysis_amount_victim)
+
+	//After a certain amount of time the victim gets a message about being in a different body.
+	spawn(msg_wait)
+		caster << "\red You feel woozy and lightheaded. <b>Your body doesn't seem like your own.</b>"

code/datums/spells/projectile.dm

@@ -0,0 +1,83 @@
+/obj/effect/proc_holder/spell/targeted/projectile
+	name = "Projectile"
+	desc = "This spell summons projectiles which try to hit the targets."
+
+	var/proj_icon = 'icons/obj/projectiles.dmi'
+	var/proj_icon_state = "spell"
+	var/proj_name = "a spell projectile"
+
+	var/proj_trail = 0 //if it leaves a trail
+	var/proj_trail_lifespan = 0 //deciseconds
+	var/proj_trail_icon = 'icons/obj/wizard.dmi'
+	var/proj_trail_icon_state = "trail"
+
+	var/proj_type = "/obj/effect/proc_holder/spell/targeted" //IMPORTANT use only subtypes of this
+
+	var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle
+	var/proj_homing = 1 //if it follows the target
+	var/proj_insubstantial = 0 //if it can pass through dense objects or not
+	var/proj_trigger_range = 0 //the range from target at which the projectile triggers cast(target)
+
+	var/proj_lifespan = 15 //in deciseconds * proj_step_delay
+	var/proj_step_delay = 1 //lower = faster
+
+/obj/effect/proc_holder/spell/targeted/projectile/cast(list/targets, mob/user = usr)
+
+	for(var/mob/living/target in targets)
+		spawn(0)
+			var/obj/effect/proc_holder/spell/targeted/projectile
+			if(istext(proj_type))
+				var/projectile_type = text2path(proj_type)
+				projectile = new projectile_type(user)
+			if(istype(proj_type,/obj/effect/proc_holder/spell))
+				projectile = new /obj/effect/proc_holder/spell/targeted/trigger(user)
+				projectile:linked_spells += proj_type
+			projectile.icon = proj_icon
+			projectile.icon_state = proj_icon_state
+			projectile.dir = get_dir(target,projectile)
+			projectile.name = proj_name
+
+			var/current_loc = usr.loc
+
+			projectile.loc = current_loc
+
+			for(var/i = 0,i < proj_lifespan,i++)
+				if(!projectile)
+					break
+
+				if(proj_homing)
+					if(proj_insubstantial)
+						projectile.dir = get_dir(projectile,target)
+						projectile.loc = get_step_to(projectile,target)
+					else
+						step_to(projectile,target)
+				else
+					if(proj_insubstantial)
+						projectile.loc = get_step(projectile,dir)
+					else
+						step(projectile,dir)
+
+				if(!proj_lingering && projectile.loc == current_loc) //if it didn't move since last time
+					del(projectile)
+					break
+
+				if(proj_trail && projectile)
+					spawn(0)
+						if(projectile)
+							var/obj/effect/overlay/trail = new /obj/effect/overlay(projectile.loc)
+							trail.icon = proj_trail_icon
+							trail.icon_state = proj_trail_icon_state
+							trail.density = 0
+							spawn(proj_trail_lifespan)
+								del(trail)
+
+				if(projectile.loc in range(target.loc,proj_trigger_range))
+					projectile.perform(list(target))
+					break
+
+				current_loc = projectile.loc
+
+				sleep(proj_step_delay)
+
+			if(projectile)
+				del(projectile)

code/datums/spells/trigger.dm

@@ -0,0 +1,28 @@
+/obj/effect/proc_holder/spell/targeted/trigger
+	name = "Trigger"
+	desc = "This spell triggers another spell or a few."
+
+	var/list/linked_spells = list() //those are just referenced by the trigger spell and are unaffected by it directly
+	var/list/starting_spells = list() //those are added on New() to contents from default spells and are deleted when the trigger spell is deleted to prevent memory leaks
+
+/obj/effect/proc_holder/spell/targeted/trigger/New()
+	..()
+
+	for(var/spell in starting_spells)
+		var/spell_to_add = text2path(spell)
+		new spell_to_add(src) //should result in adding to contents, needs testing
+
+/obj/effect/proc_holder/spell/targeted/trigger/Del()
+	for(var/spell in contents)
+		del(spell)
+
+	..()
+
+/obj/effect/proc_holder/spell/targeted/trigger/cast(list/targets)
+	for(var/mob/living/target in targets)
+		for(var/obj/effect/proc_holder/spell/spell in contents)
+			spell.perform(list(target),0)
+		for(var/obj/effect/proc_holder/spell/spell in linked_spells)
+			spell.perform(list(target),0)
+
+	return

code/datums/spells/turf_teleport.dm

@@ -0,0 +1,34 @@
+/obj/effect/proc_holder/spell/targeted/turf_teleport
+	name = "Turf Teleport"
+	desc = "This spell teleports the target to the turf in range."
+
+	var/inner_tele_radius = 1
+	var/outer_tele_radius = 2
+
+	var/include_space = 0 //whether it includes space tiles in possible teleport locations
+	var/include_dense = 0 //whether it includes dense tiles in possible teleport locations
+
+/obj/effect/proc_holder/spell/targeted/turf_teleport/cast(list/targets)
+	for(var/mob/living/target in targets)
+		var/list/turfs = new/list()
+		for(var/turf/T in range(target,outer_tele_radius))
+			if(T in range(target,inner_tele_radius)) continue
+			if(istype(T,/turf/space) && !include_space) continue
+			if(T.density && !include_dense) continue
+			if(T.x>world.maxx-outer_tele_radius || T.x<outer_tele_radius)	continue	//putting them at the edge is dumb
+			if(T.y>world.maxy-outer_tele_radius || T.y<outer_tele_radius)	continue
+			turfs += T
+
+		if(!turfs.len)
+			var/list/turfs_to_pick_from = list()
+			for(var/turf/T in orange(target,outer_tele_radius))
+				if(!(T in orange(target,inner_tele_radius)))
+					turfs_to_pick_from += T
+			turfs += pick(/turf in turfs_to_pick_from)
+
+		var/turf/picked = pick(turfs)
+
+		if(!picked || !isturf(picked))
+			return
+
+		target.loc = picked

code/datums/spells/wizard.dm

@@ -0,0 +1,327 @@
+/obj/effect/proc_holder/spell/targeted/projectile/magic_missile
+	name = "Magic Missile"
+	desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
+
+	school = "evocation"
+	charge_max = 150
+	clothes_req = 1
+	invocation = "FORTI GY AMA"
+	invocation_type = "shout"
+	range = 7
+
+	max_targets = 0
+
+	proj_icon_state = "magicm"
+	proj_name = "a magic missile"
+	proj_lingering = 1
+	proj_type = "/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile"
+
+	proj_lifespan = 20
+	proj_step_delay = 5
+
+	proj_trail = 1
+	proj_trail_lifespan = 5
+	proj_trail_icon_state = "magicmd"
+
+/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile
+	amt_weakened = 5
+	amt_dam_fire = 10
+
+/obj/effect/proc_holder/spell/targeted/genetic/mutate
+	name = "Mutate"
+	desc = "This spell causes you to turn into a hulk and gain laser vision for a short while."
+
+	school = "transmutation"
+	charge_max = 400
+	clothes_req = 1
+	invocation = "BIRUZ BENNAR"
+	invocation_type = "shout"
+	message = "\blue You feel strong! You feel a pressure building behind your eyes!"
+	range = -1
+	include_user = 1
+
+	mutations = list(LASER, HULK)
+	duration = 300
+
+/obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate
+	name = "Disintegrate"
+	desc = "This spell instantly kills somebody adjacent to you with the vilest of magick."
+
+	school = "evocation"
+	charge_max = 600
+	clothes_req = 1
+	invocation = "EI NATH"
+	invocation_type = "shout"
+	range = 1
+
+	destroys = "gib_brain"
+
+	sparks_spread = 1
+	sparks_amt = 4
+
+/obj/effect/proc_holder/spell/targeted/smoke
+	name = "Smoke"
+	desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
+
+	school = "conjuration"
+	charge_max = 120
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_user = 1
+
+	smoke_spread = 2
+	smoke_amt = 10
+
+/obj/effect/proc_holder/spell/targeted/emplosion/disable_tech
+	name = "Disable Tech"
+	desc = "This spell disables all weapons, cameras and most other technology in range."
+	charge_max = 400
+	clothes_req = 1
+	invocation = "NEC CANTIO"
+	invocation_type = "shout"
+	range = -1
+	include_user = 1
+
+	emp_heavy = 6
+	emp_light = 10
+
+/obj/effect/proc_holder/spell/targeted/turf_teleport/blink
+	name = "Blink"
+	desc = "This spell randomly teleports you a short distance."
+
+	school = "abjuration"
+	charge_max = 20
+	clothes_req = 1
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_user = 1
+
+	smoke_spread = 1
+	smoke_amt = 10
+
+	inner_tele_radius = 0
+	outer_tele_radius = 6
+
+	centcomm_cancast = 0 //prevent people from getting to centcomm
+
+/obj/effect/proc_holder/spell/targeted/area_teleport/teleport
+	name = "Teleport"
+	desc = "This spell teleports you to a type of area of your selection."
+
+	school = "abjuration"
+	charge_max = 600
+	clothes_req = 1
+	invocation = "SCYAR NILA"
+	invocation_type = "shout"
+	range = -1
+	include_user = 1
+
+	smoke_spread = 1
+	smoke_amt = 5
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
+	name = "Forcewall"
+	desc = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
+
+	school = "transmutation"
+	charge_max = 100
+	clothes_req = 0
+	invocation = "TARCOL MINTI ZHERI"
+	invocation_type = "whisper"
+	range = 0
+
+	summon_type = list("/obj/effect/forcefield")
+	summon_lifespan = 300
+
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/carp
+	name = "Summon Carp"
+	desc = "This spell conjures a simple carp."
+
+	school = "conjuration"
+	charge_max = 1200
+	clothes_req = 1
+	invocation = "NOUK FHUNMM SACP RISSKA"
+	invocation_type = "shout"
+	range = 1
+
+	summon_type = list(/mob/living/simple_animal/hostile/carp)
+
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
+	name = "Artificer"
+	desc = "This spell conjures a construct which may be controlled by Shades"
+
+	school = "conjuration"
+	charge_max = 600
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+
+	summon_type = list(/obj/structure/constructshell)
+
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
+	name = "Summon Creature Swarm"
+	desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth"
+
+	school = "conjuration"
+	charge_max = 1200
+	clothes_req = 0
+	invocation = "IA IA"
+	invocation_type = "shout"
+	summon_amt = 10
+	range = 3
+
+	summon_type = list(/mob/living/simple_animal/hostile/creature)
+
+/obj/effect/proc_holder/spell/targeted/trigger/blind
+	name = "Blind"
+	desc = "This spell temporarily blinds a single person and does not require wizard garb."
+
+	school = "transmutation"
+	charge_max = 300
+	clothes_req = 0
+	invocation = "STI KALY"
+	invocation_type = "whisper"
+	message = "\blue Your eyes cry out in pain!"
+
+	starting_spells = list("/obj/effect/proc_holder/spell/targeted/inflict_handler/blind","/obj/effect/proc_holder/spell/targeted/genetic/blind")
+
+/obj/effect/proc_holder/spell/targeted/inflict_handler/blind
+	amt_eye_blind = 10
+	amt_eye_blurry = 20
+
+/obj/effect/proc_holder/spell/targeted/genetic/blind
+	disabilities = 1
+	duration = 300
+
+/obj/effect/proc_holder/spell/dumbfire/fireball
+	name = "Fireball"
+	desc = "This spell fires a fireball at a target and does not require wizard garb."
+
+	school = "evocation"
+	charge_max = 100
+	clothes_req = 0
+	invocation = "ONI SOMA"
+	invocation_type = "shout"
+	range = 20
+
+	proj_icon_state = "fireball"
+	proj_name = "a fireball"
+	proj_type = "/obj/effect/proc_holder/spell/turf/fireball"
+
+	proj_lifespan = 200
+	proj_step_delay = 1
+
+/obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T)
+	explosion(T, -1, 1, 2, 3)
+
+
+/obj/effect/proc_holder/spell/targeted/inflict_handler/fireball
+	amt_dam_brute = 20
+	amt_dam_fire = 25
+
+/obj/effect/proc_holder/spell/targeted/explosion/fireball
+	ex_severe = -1
+	ex_heavy = -1
+	ex_light = 2
+	ex_flash = 5
+
+
+
+
+
+
+//////////////////////////////Construct Spells/////////////////////////
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser
+	charge_max = 1800
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
+	name = "Floor Construction"
+	desc = "This spell constructs a cult floor"
+
+	school = "conjuration"
+	charge_max = 20
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+	summon_type = list(/turf/simulated/floor/engine/cult)
+	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
+	name = "Leser Construction"
+	desc = "This spell constructs a cult wall"
+
+	school = "conjuration"
+	charge_max = 100
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+	summon_type = list(/turf/simulated/wall/cult)
+	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
+	name = "Greater Construction"
+	desc = "This spell constructs a reinforced metal wall"
+
+	school = "conjuration"
+	charge_max = 300
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+	delay = 50
+
+	summon_type = list(/turf/simulated/wall/r_wall)
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
+	name = "Summon Soulstone"
+	desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space"
+
+	school = "conjuration"
+	charge_max = 3000
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+
+	summon_type = list(/obj/item/device/soulstone)
+
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
+	name = "Shield"
+	desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire"
+
+	school = "transmutation"
+	charge_max = 300
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = 0
+	summon_type = list(/obj/effect/forcefield)
+	summon_lifespan = 50
+
+
+/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
+	name = "Phase Shift"
+	desc = "This spell allows you to pass through walls"
+
+	school = "transmutation"
+	charge_max = 200
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_user = 1
+	phaseshift = 1
+	jaunt_duration = 50 //in deciseconds
+	centcomm_cancast = 0 //Stop people from getting to centcomm

code/datums/sun.dm

@@ -0,0 +1,107 @@
+/datum/sun
+	var/angle
+	var/dx
+	var/dy
+//	var/counter = 50		// to make the vars update during 1st call
+	var/rate
+	var/list/solars			// for debugging purposes, references solars_list at the constructor
+	var/nexttime = 3600		// Replacement for var/counter to force the sun to move every X IC minutes
+	var/lastAngleUpdate
+
+/datum/sun/New()
+
+	solars = solars_list
+	rate = rand(750,1250)/1000			// 75.0% - 125.0% of standard rotation
+	if(prob(50))
+		rate = -rate
+
+/hook/startup/proc/createSun()
+	sun = new /datum/sun()
+	return 1
+
+// calculate the sun's position given the time of day
+
+/datum/sun/proc/calc_position()
+
+/*	counter++
+	if(counter<50)		// count 50 pticks (50 seconds, roughly - about a 5deg change)
+		return
+	counter = 0 */
+
+	angle = ((rate*world.time/100)%360 + 360)%360
+
+	/*
+		Yields a 45 - 75 IC minute rotational period
+		Rotation rate can vary from 4.8 deg/min to 8 deg/min (288 to 480 deg/hr)
+	*/
+
+	if(lastAngleUpdate != angle)
+		for(var/obj/machinery/power/tracker/T in solars_list)
+			if(!T.powernet)
+				solars_list.Remove(T)
+				continue
+			T.set_angle(angle)
+	lastAngleUpdate=angle
+
+
+
+	if(nexttime > world.time)
+		return
+	nexttime = nexttime + 600	// 600 world.time ticks = 1 minute
+
+	// now calculate and cache the (dx,dy) increments for line drawing
+
+	var/s = sin(angle)
+	var/c = cos(angle)
+
+	if(c == 0)
+
+		dx = 0
+		dy = s
+
+	else if( abs(s) < abs(c))
+
+		dx = s / abs(c)
+		dy = c / abs(c)
+
+	else
+		dx = s/abs(s)
+		dy = c / abs(s)
+
+
+	for(var/obj/machinery/power/solar/S in solars_list)
+
+		if(!S.powernet)
+			solars_list.Remove(S)
+			continue
+		if(S.control)
+			occlusion(S)
+
+
+
+// for a solar panel, trace towards sun to see if we're in shadow
+
+/datum/sun/proc/occlusion(var/obj/machinery/power/solar/S)
+
+	var/ax = S.x		// start at the solar panel
+	var/ay = S.y
+
+	for(var/i = 1 to 20)		// 20 steps is enough
+		ax += dx	// do step
+		ay += dy
+
+		var/turf/T = locate( round(ax,0.5),round(ay,0.5),S.z)
+
+		if(T.x == 1 || T.x==world.maxx || T.y==1 || T.y==world.maxy)		// not obscured if we reach the edge
+			break
+
+		if(T.density)			// if we hit a solid turf, panel is obscured
+			S.obscured = 1
+			return
+
+	S.obscured = 0		// if hit the edge or stepped 20 times, not obscured
+	S.update_solar_exposure()
+
+
+
+