Merge branch 'incremental_tg' r5200 into bs12_with_tgport

Conflicts: baystation12.dme code/__HELPERS/global_lists.dm code/__HELPERS/type2type.dm code/__HELPERS/unsorted.dm code/datums/datumvars.dm code/datums/disease.dm code/datums/organs/organ_external.dm code/datums/supplypacks.dm code/defines/obj.dm code/game/area/areas.dm code/game/atoms.dm code/game/gamemodes/cult/cult_structures.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/gamemodes/events/ninja_equipment.dm code/game/gamemodes/events/space_ninja.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/hud.dm code/game/jobs/access.dm code/game/jobs/job/civilian.dm code/game/machinery/alarm.dm code/game/machinery/cloning.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/medical.dm code/game/machinery/computer/syndicate_shuttle.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/machine_interactions.dm code/game/objects/effects/decals/contraband.dm code/game/objects/effects/signs.dm code/game/objects/items/devices/PDA/PDA.dm code/game/objects/items/devices/PDA/cart.dm code/game/objects/items/weapons/photography.dm code/game/objects/structures/door_assembly.dm code/game/objects/structures/window.dm code/game/sound.dm code/game/verbs/ooc.dm code/global.dm code/modules/DetectiveWork/detective_work.dm code/modules/DetectiveWork/evidence.dm code/modules/DetectiveWork/footprints_and_rag.dm code/modules/DetectiveWork/scanner.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/adminhelp.dm code/modules/admin/verbs/adminpm.dm code/modules/awaymissions/gateway.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/client/preferences.dm code/modules/clothing/spacesuits/rig.dm code/modules/mining/machine_processing.dm code/modules/mining/machine_stacking.dm code/modules/mining/mint.dm code/modules/mining/ores_coins.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/living/carbon/alien/alien.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/carbon_defines.dm code/modules/mob/living/carbon/human/human_damage.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/living.dm code/modules/mob/living/say.dm code/modules/mob/mob.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_transformation_simple.dm code/modules/mob/new_player/login.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences_setup.dm code/modules/mob/new_player/savefile.dm code/modules/mob/new_player/sprite_accessories.dm code/modules/paperwork/folders.dm code/modules/paperwork/paper.dm code/modules/paperwork/photocopier.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/projectile/automatic.dm code/setup.dm code/unused/mining/datum_processing_recipe.dm code/unused/powerarmor/powerarmor.dm code/world.dm html/changelog.html icons/effects/96x96.dmi icons/mob/head.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/suit.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/suits.dmi icons/obj/hydroponics.dmi icons/obj/items.dmi icons/turf/areas.dmi icons/turf/walls.dmi maps/RandomZLevels/fileList.txt maps/RandomZLevels/spacebattle.dmm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-08-29 23:17:02 +01:00 · 2013-01-07 00:23:22 +10:00
parent ac229bb38e ee67e6a0d8
commit aae42d928a
338 changed files with 21863 additions and 19941 deletions
@@ -173,27 +173,27 @@ client
 		if(istype(D,/atom))
 			var/atom/A = D
 			if(isliving(A))
-				body += "<a href='byond://?src=\ref[src];rename=\ref[D]'><b>[D]</b></a>"
+				body += "<a href='?_src_=vars;rename=\ref[D]'><b>[D]</b></a>"
 				if(A.dir)
-					body += "<br><font size='1'><a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
+					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='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=ckey'>[M.ckey ? M.ckey : "No ckey"]</a> / <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=real_name'>[M.real_name ? M.real_name : "No real name"]</a></font>"
+				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='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=brute'>[M.getBruteLoss()]</a>
-				FIRE:<font size='1'><a href='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=fire'>[M.getFireLoss()]</a>
-				TOXIN:<font size='1'><a href='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=toxin'>[M.getToxLoss()]</a>
-				OXY:<font size='1'><a href='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=oxygen'>[M.getOxyLoss()]</a>
-				CLONE:<font size='1'><a href='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=clone'>[M.getCloneLoss()]</a>
-				BRAIN:<font size='1'><a href='byond://?src=\ref[src];mobToDamage=\ref[D];adjustDamage=brain'>[M.getBrainLoss()]</a>
+				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='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=name'><b>[D]</b></a>"
+				body += "<a href='?_src_=vars;datumedit=\ref[D];varnameedit=name'><b>[D]</b></a>"
 				if(A.dir)
-					body += "<br><font size='1'><a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
+					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>"

@@ -219,10 +219,10 @@ client

 		body += "</div></td>"

-		body += "<td width='50%'><div align='center'><a href='byond://?src=\ref[src];datumrefresh=\ref[D]'>Refresh</a>"
+		body += "<td width='50%'><div align='center'><a href='?_src_=vars;datumrefresh=\ref[D]'>Refresh</a>"

 		//if(ismob(D))
-		//	body += "<br><a href='byond://?src=\ref[src];mob_player_panel=\ref[D]'>Show player panel</a></div></td></tr></table></div><hr>"
+		//	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"
@@ -237,37 +237,37 @@ client
 				"}


-		body += "<option value='byond://?src=\ref[src];mark_object=\ref[D]'>Mark Object</option>"
+		body += "<option value='?_src_=vars;mark_object=\ref[D]'>Mark Object</option>"
 		if(ismob(D))
-			body += "<option value='byond://?src=\ref[src];mob_player_panel=\ref[D]'>Show player panel</option>"
+			body += "<option value='?_src_=vars;mob_player_panel=\ref[D]'>Show player panel</option>"

 		body += "<option value>---</option>"

 		if(ismob(D))
-			body += "<option value='byond://?src=\ref[src];give_spell=\ref[D]'>Give Spell</option>"
-			body += "<option value='byond://?src=\ref[src];give_disease=\ref[D]'>Give Disease</option>"
-			body += "<option value='byond://?src=\ref[src];ninja=\ref[D]'>Make Space Ninja</option>"
-			body += "<option value='byond://?src=\ref[src];godmode=\ref[D]'>Toggle Godmode</option>"
-			body += "<option value='byond://?src=\ref[src];build_mode=\ref[D]'>Toggle Build Mode</option>"
-			body += "<option value='byond://?src=\ref[src];direct_control=\ref[D]'>Assume Direct Control</option>"
-			body += "<option value='byond://?src=\ref[src];make_skeleton=\ref[D]'>Make 2spooky</option>"
-			body += "<option value='byond://?src=\ref[src];drop_everything=\ref[D]'>Drop Everything</option>"
-			body += "<option value='byond://?src=\ref[src];regenerateicons=\ref[D]'>Regenerate Icons</option>"
+			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;ninja=\ref[D]'>Make Space Ninja</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;direct_control=\ref[D]'>Assume Direct Control</option>"
+			body += "<option value='?_src_=vars;make_skeleton=\ref[D]'>Make 2spooky</option>"
+			body += "<option value='?_src_=vars;drop_everything=\ref[D]'>Drop Everything</option>"
+			body += "<option value='?_src_=vars;regenerateicons=\ref[D]'>Regenerate Icons</option>"
 			if(ishuman(D))
 				body += "<option value>---</option>"
-				body += "<option value='byond://?src=\ref[src];setmutantrace=\ref[D]'>Set Mutantrace</option>"
-				body += "<option value='byond://?src=\ref[src];makeai=\ref[D]'>Make AI</option>"
-				body += "<option value='byond://?src=\ref[src];makerobot=\ref[D]'>Make cyborg</option>"
-				body += "<option value='byond://?src=\ref[src];makemonkey=\ref[D]'>Make monkey</option>"
-				body += "<option value='byond://?src=\ref[src];makealien=\ref[D]'>Make alien</option>"
-				body += "<option value='byond://?src=\ref[src];makemetroid=\ref[D]'>Make metroid</option>"
+				body += "<option value='?_src_=vars;setmutantrace=\ref[D]'>Set Mutantrace</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;makemetroid=\ref[D]'>Make metroid</option>"
 			body += "<option value>---</option>"
-			body += "<option value='byond://?src=\ref[src];gib=\ref[D]'>Gib</option>"
+			body += "<option value='?_src_=vars;gib=\ref[D]'>Gib</option>"
 		if(isobj(D))
-			body += "<option value='byond://?src=\ref[src];delall=\ref[D]'>Delete all of type</option>"
+			body += "<option value='?_src_=vars;delall=\ref[D]'>Delete all of type</option>"
 		if(isobj(D) || ismob(D) || isturf(D))
-			body += "<option value='byond://?src=\ref[src];explode=\ref[D]'>Trigger explosion</option>"
-			body += "<option value='byond://?src=\ref[src];emp=\ref[D]'>Trigger EM pulse</option>"
+			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>"

@@ -327,7 +327,7 @@ client
 		var/html = ""

 		if(DA)
-			html += "<li style='backgroundColor:white'>(<a href='byond://?src=\ref[src];datumedit=\ref[DA];varnameedit=[name]'>E</a>) (<a href='byond://?src=\ref[src];datumchange=\ref[DA];varnamechange=[name]'>C</a>) (<a href='byond://?src=\ref[src];datummass=\ref[DA];varnamemass=[name]'>M</a>) "
+			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>"

@@ -364,11 +364,11 @@ client

 		else if (istype(value, /datum))
 			var/datum/D = value
-			html += "<a href='byond://?src=\ref[src];Vars=\ref[value]'>[name] \ref[value]</a> = [D.type]"
+			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='byond://?src=\ref[src];Vars=\ref[value]'>[name] \ref[value]</a> = [C] [C.type]"
+			html += "<a href='?_src_=vars;Vars=\ref[value]'>[name] \ref[value]</a> = [C] [C.type]"
 	//
 		else if (istype(value, /list))
 			var/list/L = value
@@ -398,393 +398,390 @@ client

 		return html

-/client/proc/view_var_Topic(href,href_list,hsrc)
+/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 )
-		. = 1	//default 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(0))	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].", 1)
-			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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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) ", 1)
-				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) ", 1)
-
-		else if(href_list["explode"])
-			if(!check_rights(0))	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(0))	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(0))	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(0))	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(0))	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["makemetroid"])
-			if(!check_rights(0))	return
-
-			var/mob/living/carbon/human/H = locate(href_list["makemetroid"])
-			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("makemetroid"=href_list["makemetroid"]))
-
-		else if(href_list["makeai"])
-			if(!check_rights(0))	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(0))	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","metroid","plant","tajaran","skrell") //BS12 EDIT TAJ EDIT SKR
-			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["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(0))	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] ", 1)
-				href_list["datumrefresh"] = href_list["mobToDamage"]
-		else
-			. = 0
-
-		if(href_list["datumrefresh"])
-			var/datum/DAT = locate(href_list["datumrefresh"])
-			if(!istype(DAT, /datum))
-				return
-			src.debug_variables(DAT)
-			. = 1
-
+	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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(0))	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["makemetroid"])
+		if(!check_rights(0))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["makemetroid"])
+		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("makemetroid"=href_list["makemetroid"]))
+
+	else if(href_list["makeai"])
+		if(!check_rights(0))	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(0))	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","metroid","plant","shadow","tajaran","skrell")
+		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["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(0))	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

@@ -65,11 +65,14 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease

 	if(stage > max_stages)
 		stage = max_stages
-	if(stage_prob != 0 && prob(stage_prob) && stage != max_stages && !cure_present && age > stage_minimum_age * stage) //now the disease shouldn't get back up to stage 4 in no time
-		stage++
-	if(stage != 1 && (prob(1) || (cure_present && prob(cure_chance))))
+
+	if(stage < max_stages && prob(stage_prob) && !cure_present) //now the disease shouldn't get back up to stage 4 in no time		stage++
+		//world << "up"
+	if(stage > 0 && (cure_present && prob(cure_chance)))
 		stage--
-	else if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
+		//world << "down"
+
+	if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
 //		world << "Cured as stage act"
 		cure()
 		return
@@ -96,6 +99,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease

 	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]"
@@ -105,7 +113,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 	if(force_spread)
 		how_spread = force_spread

-	if(how_spread == SPECIAL || how_spread == NON_CONTAGIOUS)//does not 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
@@ -117,6 +125,9 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 		else //no source and no mob affected. Rogue disease. Break
 			return

+	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

@@ -184,8 +195,8 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 		return 1
 	return 0

-/datum/disease/proc/Copy()
-	return new type(0, src)
+/datum/disease/proc/Copy(var/process = 0)
+	return new type(process, src)

 /*
 /datum/disease/Del()
@@ -11,6 +11,13 @@

 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"
+								)

 /*

@@ -31,6 +38,8 @@ var/list/archive_diseases = list()
 	// NEW VARS

 	var/list/symptoms = list() // The symptoms of the disease.
+	var/id = ""
+	var/processing = 0

 /*

@@ -38,7 +47,7 @@ var/list/archive_diseases = list()

 */

-/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D)

 	// Setup our dictionary if it hasn't already.
 	if(!dictionary_symptoms.len)
@@ -57,16 +66,27 @@ var/list/archive_diseases = list()
 		else
 			for(var/datum/symptom/S in D.symptoms)
 				symptoms += new S.type
-			name = D.name

-	Refresh(!copy)
+	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
@@ -96,8 +116,8 @@ var/list/archive_diseases = list()
 	return

 // Returns the advance disease with a different reference memory.
-/datum/disease/advance/Copy()
-	return new /datum/disease/advance(0, src, 1)
+/datum/disease/advance/Copy(var/process = 0)
+	return new /datum/disease/advance(process, src, 1)

 /*

@@ -149,13 +169,20 @@ var/list/archive_diseases = list()

 	return generated

-/datum/disease/advance/proc/Refresh(var/save = 1)
+/datum/disease/advance/proc/Refresh(var/new_name = 0)
 	//world << "[src.name] \ref[src] - REFRESH!"
 	var/list/properties = GenerateProperties()
 	AssignProperties(properties)
-	if(save)
+
+	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()

@@ -182,9 +209,10 @@ var/list/archive_diseases = list()

 		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(max(BLOOD, min(properties["transmittable"] - symptoms.len, AIRBORNE)))
-		permeability_mod = max(round(0.5 * properties["transmittable"]), 1)
-		stage_prob = max(properties["stage_rate"], 1)
+		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
@@ -213,7 +241,7 @@ var/list/archive_diseases = list()

 	switch(level_sev)

-		if(0)
+		if(-INFINITY to 0)
 			severity = "Non-Threat"
 		if(1)
 			severity = "Minor"
@@ -223,7 +251,7 @@ var/list/archive_diseases = list()
 			severity = "Harmful"
 		if(4)
 			severity = "Dangerous!"
-		if(5)
+		if(5 to INFINITY)
 			severity = "BIOHAZARD THREAT!"
 		else
 			severity = "Unknown"
@@ -232,42 +260,9 @@ var/list/archive_diseases = list()
 // 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 = max(properties["resistance"] - (symptoms.len / 2), 0)
+		var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
 		//world << "Res = [res]"
-		switch(round(res))
-			// Due to complications, I cannot randomly generate cures or randomly give cures.
-			if(0)
-				cure_id = "nutriment"
-
-			if(1)
-				cure_id = "sodiumchloride"
-
-			if(2)
-				cure_id = "orangejuice"
-
-			if(3)
-				cure_id = "spaceacillin"
-
-			if(4)
-				cure_id = "ethanol"
-
-			if(5)
-				cure_id = "ethylredoxrazine"
-
-			if(6)
-				cure_id = "synaptizine"
-
-			if(7)
-				cure_id = "silver"
-
-			if(8)
-				cure_id = "gold"
-
-			if(9)
-				cure_id = "mindbreaker"
-
-			else
-				cure_id = "plasma"
+		cure_id = advance_cures[res]

 		// Get the cure name from the cure_id
 		var/datum/reagent/D = chemical_reagents_list[cure_id]
@@ -281,7 +276,7 @@ var/list/archive_diseases = list()
 	var/s = safepick(GenerateSymptoms(level, 1))
 	if(s)
 		AddSymptom(s)
-		Refresh()
+		Refresh(1)
 	return

 // Randomly remove a symptom.
@@ -290,7 +285,7 @@ var/list/archive_diseases = list()
 		var/s = safepick(symptoms)
 		if(s)
 			RemoveSymptom(s)
-			Refresh()
+			Refresh(1)
 	return

 // Name the disease.
@@ -300,11 +295,15 @@ var/list/archive_diseases = list()

 // 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.
-	return dd_list2text(L, ":")
+	var/result = dd_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.
@@ -313,7 +312,7 @@ var/list/archive_diseases = list()
 	if(HasSymptom(S))
 		return

-	if(symptoms.len < 3 + rand(-1, 1))
+	if(symptoms.len < 5 + rand(-1, 1))
 		symptoms += S
 	else
 		RemoveSymptom(pick(symptoms))
@@ -338,7 +337,7 @@ var/list/archive_diseases = list()

 	var/list/diseases = list()

-	for(var/datum/disease/advance/A in D_list.Copy())
+	for(var/datum/disease/advance/A in D_list)
 		diseases += A.Copy()

 	if(!diseases.len)
@@ -361,7 +360,7 @@ var/list/archive_diseases = list()
 	 // 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()
+	to_return.Refresh(1)
 	return to_return

 /proc/SetViruses(var/datum/reagent/R, var/list/data)
@@ -376,4 +375,45 @@ var/list/archive_diseases = list()
 		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)]")
+
 #undef RANDOM_STARTING_LEVEL
@@ -1,5 +0,0 @@
-/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)
@@ -1,5 +0,0 @@
-/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)
@@ -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)
@@ -4,13 +4,13 @@
 Coughing

 	Noticable.
-	No Resistance.
-	Doesn't increase stage speed.
+	Little Resistance.
+	Doesn't increase stage speed much.
 	Transmittable.
 	Low Level.

 BONUS
-	Will force the affected mob to drop items!
+	Will force the affected mob to drop small items!

 //////////////////////////////////////
 */
@@ -19,8 +19,8 @@ BONUS

 	name = "Cough"
 	stealth = -1
-	resistance = 0
-	stage_speed = 0
+	resistance = 3
+	stage_speed = 1
 	transmittable = 2
 	level = 1

@@ -33,5 +33,7 @@ BONUS
 				M << "<span notice='notice'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>"
 			else
 				M.emote("cough")
-				M.drop_item()
+				var/obj/item/I = M.get_active_hand()
+				if(I && I.w_class < 3)
+					M.drop_item()
 	return
@@ -15,7 +15,7 @@ Bonus
 //////////////////////////////////////
 */

-/datum/symptom/damage_converter // Not the egg
+/datum/symptom/damage_converter

 	name = "Toxic Compensation"
 	stealth = 1
@@ -29,7 +29,7 @@ Bonus
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
-			if(5)
+			if(4, 5)
 				Convert(M)
 	return

@@ -39,5 +39,5 @@ Bonus
 		var/get_damage = rand(1, 2)
 		M.adjustFireLoss(-get_damage)
 		M.adjustBruteLoss(-get_damage)
-		M.adjustToxLoss(get_damage * 2)
+		M.adjustToxLoss(get_damage)
 		return 1
@@ -3,7 +3,7 @@

 Dizziness

-	Little bit hidden.
+	Hidden.
 	Lowers resistance considerably.
 	Decreases stage speed.
 	Reduced transmittability
@@ -18,7 +18,7 @@ Bonus
 /datum/symptom/dizzy // Not the egg

 	name = "Dizziness"
-	stealth = 1
+	stealth = 2
 	resistance = -2
 	stage_speed = -3
 	transmittable = -1
@@ -21,7 +21,7 @@ Bonus
 	stealth = 0
 	resistance = 3
 	stage_speed = 3
-	transmittable = 1
+	transmittable = 2
 	level = 2

 /datum/symptom/fever/Activate(var/datum/disease/advance/A)
@@ -29,6 +29,7 @@ Bonus
 	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>"
-		M.bodytemperature += 20 * A.stage
+		if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT)
+			M.bodytemperature = min(M.bodytemperature + (20 * A.stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1)

 	return
@@ -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
@@ -21,7 +21,7 @@ Bonus
 	stealth = 0
 	resistance = 2
 	stage_speed = 2
-	transmittable = 1
+	transmittable = 2
 	level = 2

 /datum/symptom/shivering/Activate(var/datum/disease/advance/A)
@@ -29,6 +29,7 @@ Bonus
 	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>"
-		M.bodytemperature -= 20 * A.stage
+		if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+			M.bodytemperature = min(M.bodytemperature - (20 * A.stage), BODYTEMP_COLD_DAMAGE_LIMIT + 1)

 	return
@@ -20,9 +20,9 @@ Bonus

 	name = "Sneezing"
 	stealth = -2
-	resistance = 2
+	resistance = 3
 	stage_speed = 0
-	transmittable = 3
+	transmittable = 4
 	level = 1

 /datum/symptom/sneeze/Activate(var/datum/disease/advance/A)
@@ -25,7 +25,14 @@ var/global/const/SYMPTOM_ACTIVATION_PROB = 3
 			return
 	CRASH("We couldn't assign an ID!")

-
-/datum/symptom/proc/Activate(var/mob/living/M, var/stage)
+// 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

@@ -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
@@ -30,7 +30,7 @@ Bonus

 /datum/symptom/vomit/Activate(var/datum/disease/advance/A)
 	..()
-	if(prob(SYMPTOM_ACTIVATION_PROB))
+	if(prob(SYMPTOM_ACTIVATION_PROB / 2))
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
@@ -42,7 +42,6 @@ Bonus

 /datum/symptom/vomit/proc/Vomit(var/mob/living/M)

-	M.Stun(5)
 	M.visible_message("<B>[M]</B> vomits on the floor!")

 	M.nutrition -= 20
@@ -82,7 +81,7 @@ Bonus

 /datum/symptom/vomit/blood/Vomit(var/mob/living/M)

-	M.Stun(5)
+	M.Stun(1)
 	M.visible_message("<B>[M]</B> vomits on the floor!")

 	// They lose blood and health.
@@ -112,7 +112,7 @@ Bonus
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
-			if(5)
+			if(4, 5)
 				M.overeatduration = 0
 				M.nutrition = 400

@@ -19,6 +19,7 @@
 		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

@@ -331,7 +331,7 @@ datum/mind
 		else
 			var/obj_count = 1
 			for(var/datum/objective/objective in objectives)
-				out += "<B>[obj_count]</B>: [objective.explanation_text] <a href='?src=\ref[src];obj_edit=\ref[objective]'>Edit</a> <a href='?src=\ref[src];obj_delete=\ref[objective]'>Delete</a><br>"
+				out += "<B>[obj_count]</B>: [objective.explanation_text] <a href='?src=\ref[src];obj_edit=\ref[objective]'>Edit</a> <a href='?src=\ref[src];obj_delete=\ref[objective]'>Delete</a> <a href='?src=\ref[src];obj_completed=\ref[objective]'><font color=[objective.completed ? "green" : "red"]>Toggle Completion</font></a><br>"
 				obj_count++
 		out += "<a href='?src=\ref[src];obj_add=1'>Add objective</a><br><br>"

@@ -471,9 +471,14 @@ datum/mind

 		else if (href_list["obj_delete"])
 			var/datum/objective/objective = locate(href_list["obj_delete"])
-			if (!objective) return
+			if(!istype(objective))	return
 			objectives -= objective

+		else if(href_list["obj_completed"])
+			var/datum/objective/objective = locate(href_list["obj_completed"])
+			if(!istype(objective))	return
+			objective.completed = !objective.completed
+
 		else if (href_list["revolution"])
 			switch(href_list["revolution"])
 				if("clear")
@@ -757,7 +762,7 @@ datum/mind
 						var/mob/living/carbon/monkey/M = current
 						if (istype(H))
 							log_admin("[key_name(usr)] attempting to monkeyize [key_name(current)]")
-							message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]", 1)
+							message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]")
 							src = null
 							M = H.monkeyize()
 							src = M.mind
@@ -787,7 +792,7 @@ datum/mind
 								D.cure(0)
 								sleep(0) //because deleting of virus is doing throught spawn(0)
 						log_admin("[key_name(usr)] attempting to humanize [key_name(current)]")
-						message_admins("\blue [key_name_admin(usr)] attempting to humanize [key_name_admin(current)]", 1)
+						message_admins("\blue [key_name_admin(usr)] attempting to humanize [key_name_admin(current)]")
 						var/obj/item/weapon/dnainjector/m2h/m2h = new
 						var/obj/item/weapon/implant/mobfinder = new(M) //hack because humanizing deletes mind --rastaf0
 						src = null
@@ -701,6 +701,18 @@
 obj/item/weapon/organ
 	icon = 'icons/mob/human_races/r_human.dmi'

+/*
+//Damage will not exceed max_damage using this proc
+//Cannot apply negative damage
+/datum/organ/external/proc/take_damage(brute, burn)
+	if(owner && (owner.status_flags & GODMODE))	return 0	//godmode
+	brute	= max(brute,0)
+	burn	= max(burn,0)
+
+	var/can_inflict = max_damage - (brute_dam + burn_dam)
+	if(!can_inflict)	return 0
+*/
+
 obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	..(loc)
 	if(!istype(H))
@@ -291,18 +291,17 @@
 /*	VIRUS2 4LIFE
 					/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
 					/obj/item/weapon/reagent_containers/glass/bottle/cold,
+					/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
+					/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion,
 					/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs,
 					/obj/item/weapon/reagent_containers/glass/bottle/magnitis,
-					/obj/item/weapon/reagent_containers/glass/bottle/wizarditis, worse than GBS if anything
-					/obj/item/weapon/reagent_containers/glass/bottle/gbs, No. Just no.
 					/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
 					/obj/item/weapon/reagent_containers/glass/bottle/brainrot,
+					/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion,
 					/obj/item/weapon/storage/syringes,
-					/obj/item/weapon/storage/beakerbox
-*/
-					)
-	cost = 20
-	containertype = /obj/structure/closet/crate/secure/weapon
+					/obj/item/weapon/storage/beakerbox)
+					/obj/item/weapon/reagent_containers/glass/bottle/mutagen)
+	cost = 25	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Virus crate"
 	access = access_cmo