Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

Conflicts: code/modules/mob/living/carbon/human/human_defense.dm code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2026-08-25 04:57:47 +01:00 · 2015-09-11 18:13:14 -04:00
parent a58f70025d d91a41c6b1
commit 26f1d02bda
49 changed files with 704 additions and 739 deletions
@@ -183,6 +183,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/show_plant_genes,
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,
+	/client/proc/callproc_target,
 	/client/proc/toggledebuglogs,
 	/client/proc/SDQL_query,
 	/client/proc/SDQL2_query,
@@ -194,6 +195,7 @@ var/list/admin_verbs_debug = list(

 var/list/admin_verbs_paranoid_debug = list(
 	/client/proc/callproc,
+	/client/proc/callproc_target,
 	/client/proc/debug_controller
 	)

@@ -263,6 +265,7 @@ var/list/admin_verbs_hideable = list(
 	/client/proc/restart_controller,
 	/client/proc/cmd_admin_list_open_jobs,
 	/client/proc/callproc,
+	/client/proc/callproc_target,
 	/client/proc/Debug2,
 	/client/proc/reload_admins,
 	/client/proc/kill_air,
@@ -0,0 +1,152 @@
+
+/client/proc/callproc()
+	set category = "Debug"
+	set name = "Advanced ProcCall"
+
+	if(!check_rights(R_DEBUG)) return
+	if(config.debugparanoid && !check_rights(R_ADMIN)) return
+
+	var/target = null
+	var/targetselected = 0
+
+	switch(alert("Proc owned by something?",, "Yes", "No", "Cancel"))
+		if("Yes")
+			targetselected=1
+			switch(input("Proc owned by...", "Owner", null) as null|anything in list("Obj", "Mob", "Area or Turf", "Client"))
+				if("Obj")
+					target = input("Select target:", "Target") as null|obj in world
+				if("Mob")
+					target = input("Select target:", "Target", usr) as null|mob in world
+				if("Area or Turf")
+					target = input("Select target:", "Target", get_turf(usr)) as null|area|turf in world
+				if("Client")
+					target = input("Select target:", "Target", usr.client) as null|anything in clients
+				else
+					return
+			if(!target)
+				usr << "Proc call cancelled."
+				return
+		if("Cancel")
+			return
+		if("No")
+			; // do nothing
+
+	callproc_targetpicked(targetselected, target)
+
+/client/proc/callproc_target(atom/A in world)
+	set category = "Debug"
+	set name = "Advanced ProcCall Target"
+
+	if(!check_rights(R_DEBUG)) return
+	if(config.debugparanoid && !check_rights(R_ADMIN)) return
+
+	callproc_targetpicked(1, A)
+
+/client/proc/callproc_targetpicked(hastarget, datum/target)
+
+	// this needs checking again here because VV's 'Call Proc' option directly calls this proc with the target datum
+	if(!check_rights(R_DEBUG)) return
+	if(config.debugparanoid && !check_rights(R_ADMIN)) return
+
+	var/returnval = null
+
+	var/procname = input("Proc name", "Proc") as null|text
+	if(!procname) return
+
+	if(hastarget)
+		if(!target)
+			usr << "Your callproc target no longer exists."
+			return
+		if(!hascall(target, procname))
+			usr << "\The [target] has no call [procname]()"
+			return
+
+	var/list/arguments = list()
+	var/done = 0
+	var/current = null
+
+	while(!done)
+		if(hastarget && !target)
+			usr << "Your callproc target no longer exists."
+			return
+		switch(input("Type of [arguments.len+1]\th variable", "argument [arguments.len+1]") as null|anything in list(
+				"finished", "null", "text", "num", "type", "obj reference", "mob reference",
+				"area/turf reference", "icon", "file", "client", "mob's area", "marked datum"))
+			if(null)
+				return
+
+			if("finished")
+				done = 1
+
+			if("null")
+				current = null
+
+			if("text")
+				current = input("Enter text for [arguments.len+1]\th argument") as null|text
+				if(isnull(current)) return
+
+			if("num")
+				current = input("Enter number for [arguments.len+1]\th argument") as null|num
+				if(isnull(current)) return
+
+			if("type")
+				current = input("Select type for [arguments.len+1]\th argument") as null|anything in typesof(/obj, /mob, /area, /turf)
+				if(isnull(current)) return
+
+			if("obj reference")
+				current = input("Select object for [arguments.len+1]\th argument") as null|obj in world
+				if(isnull(current)) return
+
+			if("mob reference")
+				current = input("Select mob for [arguments.len+1]\th argument") as null|mob in world
+				if(isnull(current)) return
+
+			if("area/turf reference")
+				current = input("Select area/turf for [arguments.len+1]\th argument") as null|area|turf in world
+				if(isnull(current)) return
+
+			if("icon")
+				current = input("Provide icon for [arguments.len+1]\th argument") as null|icon
+				if(isnull(current)) return
+
+			if("client")
+				current = input("Select client for [arguments.len+1]\th argument") as null|anything in clients
+				if(isnull(current)) return
+
+			if("mob's area")
+				var/mob/M = input("Select mob to take area for [arguments.len+1]\th argument") as null|mob in world
+				if(!M) return
+				current = get_area(M)
+				if(!current)
+					switch(alert("\The [M] appears to not have an area; do you want to pass null instead?",, "Yes", "Cancel"))
+						if("Yes")
+							; // do nothing
+						if("Cancel")
+							return
+
+			if("marked datum")
+				current = holder.marked_datum
+				if(!current)
+					switch(alert("You do not currently have a marked datum; do you want to pass null instead?",, "Yes", "Cancel"))
+						if("Yes")
+							; // do nothing
+						if("Cancel")
+							return
+		if(!done)
+			arguments += current
+
+	if(hastarget)
+		if(!target)
+			usr << "Your callproc target no longer exists."
+			return
+		log_admin("[key_name(src)] called [target]'s [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].")
+		if(arguments.len)
+			returnval = call(target, procname)(arglist(arguments))
+		else
+			returnval = call(target, procname)()
+	else
+		log_admin("[key_name(src)] called [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].")
+		returnval = call(procname)(arglist(arguments))
+
+	usr << "<span class='info'>[procname]() returned: [isnull(returnval) ? "null" : returnval]</span>"
+	feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -14,139 +14,7 @@

 	feedback_add_details("admin_verb","DG2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-
-
-/* 21st Sept 2010
-Updated by Skie -- Still not perfect but better!
-Stuff you can't do:
-Call proc /mob/proc/make_dizzy() for some player
-Because if you select a player mob as owner it tries to do the proc for
-/mob/living/carbon/human/ instead. And that gives a run-time error.
-But you can call procs that are of type /mob/living/carbon/human/proc/ for that player.
-*/
-
-/client/proc/callproc()
-	set category = "Debug"
-	set name = "Advanced ProcCall"
-
-	if(!check_rights(R_DEBUG)) return
-	if(config.debugparanoid && !check_rights(R_ADMIN)) return
-
-	spawn(0)
-		var/target = null
-		var/targetselected = 0
-		var/lst[] // List reference
-		lst = new/list() // Make the list
-		var/returnval = null
-		var/class = null
-
-		switch(alert("Proc owned by something?",,"Yes","No"))
-			if("Yes")
-				targetselected = 1
-				class = input("Proc owned by...","Owner",null) as null|anything in list("Obj","Mob","Area or Turf","Client")
-				switch(class)
-					if("Obj")
-						target = input("Enter target:","Target",usr) as obj in world
-					if("Mob")
-						target = input("Enter target:","Target",usr) as mob in world
-					if("Area or Turf")
-						target = input("Enter target:","Target",usr.loc) as area|turf in world
-					if("Client")
-						var/list/keys = list()
-						for(var/client/C)
-							keys += C
-						target = input("Please, select a player!", "Selection", null, null) as null|anything in keys
-					else
-						return
-			if("No")
-				target = null
-				targetselected = 0
-
-		var/procname = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
-		if(!procname)	return
-
-		if(targetselected)
-			if(!target)
-				usr << "<span class='danger'>Your target no longer exists.</span>"
-				return
-			if(!hascall(target,procname))
-				usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
-				return
-		else
-			if(copytext(procname, 1, 7) == "/proc/")
-				// nothing
-			else if(copytext(procname, 1, 6) == "proc/")
-				procname = "/[procname]"
-			else if(copytext(procname, 1, 2) == "/")
-				procname = "/proc[procname]"
-			else
-				procname = "/proc/[procname]"
-			// Procs have the strange property that text2path will return non-null, but ispath() will return false.
-			var/path = text2path(procname)
-			if(!path || ispath(path))
-				usr << "<span class='danger'>Invalid proc [procname]</span>"
-				return
-
-		var/argnum = input("Number of arguments","Number:",0) as num|null
-		if(!argnum && (argnum!=0))	return
-
-		lst.len = argnum // Expand to right length
-		//TODO: make a list to store whether each argument was initialised as null.
-		//Reason: So we can abort the proccall if say, one of our arguments was a mob which no longer exists
-		//this will protect us from a fair few errors ~Carn
-
-		var/i
-		for(i=1, i<argnum+1, i++) // Lists indexed from 1 forwards in byond
-
-			// Make a list with each index containing one variable, to be given to the proc
-			class = input("What kind of variable?","Variable Type") in list("text","num","type","reference","mob reference","icon","file","client","mob's area","CANCEL")
-			switch(class)
-				if("CANCEL")
-					return
-
-				if("text")
-					lst[i] = input("Enter new text:","Text",null) as text
-
-				if("num")
-					lst[i] = input("Enter new number:","Num",0) as num
-
-				if("type")
-					lst[i] = input("Enter type:","Type") in typesof(/obj,/mob,/area,/turf)
-
-				if("reference")
-					lst[i] = input("Select reference:","Reference",src) as mob|obj|turf|area in world
-
-				if("mob reference")
-					lst[i] = input("Select reference:","Reference",usr) as mob in world
-
-				if("file")
-					lst[i] = input("Pick file:","File") as file
-
-				if("icon")
-					lst[i] = input("Pick icon:","Icon") as icon
-
-				if("client")
-					var/list/keys = list()
-					for(var/mob/M in world)
-						keys += M.client
-					lst[i] = input("Please, select a player!", "Selection", null, null) as null|anything in keys
-
-				if("mob's area")
-					var/mob/temp = input("Select mob", "Selection", usr) as mob in world
-					lst[i] = temp.loc
-
-		if(targetselected)
-			if(!target)
-				usr << "<font color='red'>Error: callproc(): owner of proc no longer exists.</font>"
-				return
-			log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
-			returnval = call(target,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
-		else
-			log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
-			returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc
-
-		usr << "<font color='blue'>[procname] returned: [returnval ? returnval : "null"]</font>"
-		feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+// callproc moved to code/modules/admin/callproc

 /client/proc/Cell()
 	set category = "Debug"
@@ -0,0 +1,93 @@
+
+// Keep these two together, they *must* be defined on both
+// If /client ever becomes /datum/client or similar, they can be merged
+/client/proc/get_view_variables_header()
+	return "<b>[src]</b>"
+/datum/proc/get_view_variables_header()
+	return "<b>[src]</b>"
+
+/atom/get_view_variables_header()
+	return {"
+		<a href='?_src_=vars;datumedit=\ref[src];varnameedit=name'><b>[src]</b></a>
+		<br><font size='1'>
+		<a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=left'><<</a>
+		<a href='?_src_=vars;datumedit=\ref[src];varnameedit=dir'>[dir2text(dir)]</a>
+		<a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=right'>>></a>
+		</font>
+		"}
+
+/mob/living/get_view_variables_header()
+	return {"
+		<a href='?_src_=vars;rename=\ref[src]'><b>[src]</b></a><font size='1'>
+		<br><a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=left'><<</a> <a href='?_src_=vars;datumedit=\ref[src];varnameedit=dir'>[dir2text(dir)]</a> <a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=right'>>></a>
+		<br><a href='?_src_=vars;datumedit=\ref[src];varnameedit=ckey'>[ckey ? ckey : "No ckey"]</a> / <a href='?_src_=vars;datumedit=\ref[src];varnameedit=real_name'>[real_name ? real_name : "No real name"]</a>
+		<br>
+		BRUTE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brute'>[getBruteLoss()]</a>
+		FIRE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=fire'>[getFireLoss()]</a>
+		TOXIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=toxin'>[getToxLoss()]</a>
+		OXY:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=oxygen'>[getOxyLoss()]</a>
+		CLONE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=clone'>[getCloneLoss()]</a>
+		BRAIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brain'>[getBrainLoss()]</a>
+		</font>
+		"}
+
+// Same for these as for get_view_variables_header() above
+/client/proc/get_view_variables_options()
+	return ""
+/datum/proc/get_view_variables_options()
+	return ""
+
+/mob/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;mob_player_panel=\ref[src]'>Show player panel</option>
+		<option>---</option>
+		<option value='?_src_=vars;give_spell=\ref[src]'>Give Spell</option>
+		<option value='?_src_=vars;give_disease2=\ref[src]'>Give Disease</option>
+		<option value='?_src_=vars;give_disease=\ref[src]'>Give TG-style Disease</option>
+		<option value='?_src_=vars;godmode=\ref[src]'>Toggle Godmode</option>
+		<option value='?_src_=vars;build_mode=\ref[src]'>Toggle Build Mode</option>
+
+		<option value='?_src_=vars;ninja=\ref[src]'>Make Space Ninja</option>
+		<option value='?_src_=vars;make_skeleton=\ref[src]'>Make 2spooky</option>
+
+		<option value='?_src_=vars;direct_control=\ref[src]'>Assume Direct Control</option>
+		<option value='?_src_=vars;drop_everything=\ref[src]'>Drop Everything</option>
+
+		<option value='?_src_=vars;regenerateicons=\ref[src]'>Regenerate Icons</option>
+		<option value='?_src_=vars;addlanguage=\ref[src]'>Add Language</option>
+		<option value='?_src_=vars;remlanguage=\ref[src]'>Remove Language</option>
+		<option value='?_src_=vars;addorgan=\ref[src]'>Add Organ</option>
+		<option value='?_src_=vars;remorgan=\ref[src]'>Remove Organ</option>
+
+		<option value='?_src_=vars;fix_nano=\ref[src]'>Fix NanoUI</option>
+
+		<option value='?_src_=vars;addverb=\ref[src]'>Add Verb</option>
+		<option value='?_src_=vars;remverb=\ref[src]'>Remove Verb</option>
+		<option>---</option>
+		<option value='?_src_=vars;gib=\ref[src]'>Gib</option>
+		<option value='?_src_=vars;explode=\ref[src]'>Trigger explosion</option>
+		<option value='?_src_=vars;emp=\ref[src]'>Trigger EM pulse</option>
+		"}
+
+/mob/living/carbon/human/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;setspecies=\ref[src]'>Set Species</option>
+		<option value='?_src_=vars;makeai=\ref[src]'>Make AI</option>
+		<option value='?_src_=vars;makerobot=\ref[src]'>Make cyborg</option>
+		<option value='?_src_=vars;makemonkey=\ref[src]'>Make monkey</option>
+		<option value='?_src_=vars;makealien=\ref[src]'>Make alien</option>
+		<option value='?_src_=vars;makeslime=\ref[src]'>Make slime</option>
+		"}
+
+/obj/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;delall=\ref[src]'>Delete all of type</option>
+		<option value='?_src_=vars;explode=\ref[src]'>Trigger explosion</option>
+		<option value='?_src_=vars;emp=\ref[src]'>Trigger EM pulse</option>
+		"}
+
+/turf/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;explode=\ref[src]'>Trigger explosion</option>
+		<option value='?_src_=vars;emp=\ref[src]'>Trigger EM pulse</option>
+		"}
@@ -0,0 +1,546 @@
+
+/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 = sanitize(input(usr,"What would you like to name this mob?","Input a name",M.real_name) as text|null, 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["give_disease2"])
+		if(!check_rights(R_ADMIN|R_FUN))	return
+
+		var/mob/M = locate(href_list["give_disease2"])
+		if(!istype(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+
+		src.give_disease2(M)
+		href_list["datumrefresh"] = href_list["give_spell"]
+
+	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.ChangeToSkeleton()
+		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++
+						qdel(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("<span class='notice'>[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted)</span>")
+			if("Type and subtypes")
+				var/i = 0
+				for(var/obj/Obj in world)
+					if(istype(Obj,O_type))
+						i++
+						qdel(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("<span class='notice'>[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)</span>")
+
+	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.set_dir(turn(A.dir, -45))
+			if("left")	A.set_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["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]."
+		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(!new_language)
+			return
+
+		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(!rem_language)
+			return
+
+		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["addorgan"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/M = locate(href_list["addorgan"])
+		if(!istype(M))
+			usr << "This can only be done to instances of type /mob/living/carbon"
+			return
+
+		var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in typesof(/obj/item/organ)-/obj/item/organ
+		if(!new_organ) return
+
+		if(!M)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		if(locate(new_organ) in M.internal_organs)
+			usr << "Mob already has that organ."
+			return
+
+		new new_organ(M)
+
+
+	else if(href_list["remorgan"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/M = locate(href_list["remorgan"])
+		if(!istype(M))
+			usr << "This can only be done to instances of type /mob/living/carbon"
+			return
+
+		var/obj/item/organ/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
+
+		if(!M)
+			usr << "Mob doesn't exist anymore"
+			return
+
+		if(!(locate(rem_organ) in M.internal_organs))
+			usr << "Mob does not have that organ."
+			return
+
+		usr << "Removed [rem_organ] from [M]."
+		rem_organ.removed()
+		qdel(rem_organ)
+
+	else if(href_list["fix_nano"])
+		if(!check_rights(R_DEBUG)) return
+
+		var/mob/H = locate(href_list["fix_nano"])
+
+		if(!istype(H) || !H.client)
+			usr << "This can only be done on mobs with clients"
+			return
+
+		nanomanager.send_resources(H.client)
+
+		usr << "Resource files sent"
+		H << "Your NanoUI Resource files have been refreshed"
+
+		log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)] ")
+
+	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("<span class='notice'>[key_name(usr)] dealt [amount] amount of [Text] damage to [L]</span>")
+			href_list["datumrefresh"] = href_list["mobToDamage"]
+
+	else if(href_list["call_proc"])
+		var/datum/D = locate(href_list["call_proc"])
+		if(istype(D) || istype(D, /client)) // can call on clients too, not just datums
+			callproc_targetpicked(1, D)
+
+	if(href_list["datumrefresh"])
+		var/datum/DAT = locate(href_list["datumrefresh"])
+		if(istype(DAT, /datum) || istype(DAT, /client))
+			debug_variables(DAT)
+
+	return
@@ -0,0 +1,160 @@
+
+// Variables to not even show in the list.
+// step_* and bound_* are here because they literally break the game and do nothing else.
+// parent_type is here because it's pointless to show in VV.
+/var/list/view_variables_hide_vars = list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "parent_type", "step_x", "step_y", "step_size")
+// Variables not to expand the lists of. Vars is pointless to expand, and overlays/underlays cannot be expanded.
+/var/list/view_variables_dont_expand = list("overlays", "underlays", "vars")
+
+/client/proc/debug_variables(datum/D in world)
+	set category = "Debug"
+	set name = "View Variables"
+
+	if(!check_rights(0))
+		return
+
+	if(!D)
+		return
+
+	var/icon/sprite
+	if(istype(D, /atom))
+		var/atom/A = D
+		if(A.icon && A.icon_state)
+			sprite = icon(A.icon, A.icon_state)
+			usr << browse_rsc(sprite, "view_vars_sprite.png")
+
+	usr << browse_rsc('code/js/view_variables.js', "view_variables.js")
+
+	var/html = {"
+		<html>
+		<head>
+			<script src='view_variables.js'></script>
+			<title>[D] (\ref[D] - [D.type])</title>
+			<style>
+				body { font-family: Verdana, sans-serif; font-size: 9pt; }
+				.value { font-family: "Courier New", monospace; font-size: 8pt; }
+			</style>
+		</head>
+		<body onload='selectTextField(); updateSearch()'; onkeyup='updateSearch()'>
+			<div align='center'>
+				<table width='100%'><tr>
+					<td width='50%'>
+						<table align='center' width='100%'><tr>
+							[sprite ? "<td><img src='view_vars_sprite.png'></td>" : ""]
+							<td><div align='center'>[D.get_view_variables_header()]</div></td>
+						</tr></table>
+						<div align='center'>
+							<b><font size='1'>[replacetext("[D.type]", "/", "/<wbr>")]</font></b>
+							[holder.marked_datum == D ? "<br/><font size='1' color='red'><b>Marked Object</b></font>" : ""]
+						</div>
+					</td>
+					<td width='50%'>
+						<div align='center'>
+							<a href='?_src_=vars;datumrefresh=\ref[D]'>Refresh</a>
+							<form>
+								<select name='file'
+								        size='1'
+								        onchange='loadPage(this.form.elements\[0\])'
+								        target='_parent._top'
+								        onmouseclick='this.focus()'
+								        style='background-color:#ffffff'>
+									<option>Select option</option>
+									<option />
+									<option value='?_src_=vars;mark_object=\ref[D]'>Mark Object</option>
+									<option value='?_src_=vars;call_proc=\ref[D]'>Call Proc</option>
+									[D.get_view_variables_options()]
+								</select>
+							</form>
+						</div>
+					</td>
+				</tr></table>
+			</div>
+			<hr/>
+			<font size='1'>
+				<b>E</b> - Edit, tries to determine the variable type by itself.<br/>
+				<b>C</b> - Change, asks you for the var type first.<br/>
+				<b>M</b> - Mass modify: changes this variable for all objects of this type.<br/>
+			</font>
+			<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/>
+			<ol id='vars'>
+				[make_view_variables_var_list(D)]
+			</ol>
+		</body>
+		</html>
+		"}
+
+	usr << browse(html, "window=variables\ref[D];size=475x650")
+
+
+/proc/make_view_variables_var_list(datum/D)
+	. = ""
+	var/list/variables = list()
+	for(var/x in D.vars)
+		if(x in view_variables_hide_vars)
+			continue
+		variables += x
+	variables = sortList(variables)
+	for(var/x in variables)
+		. += make_view_variables_var_entry(D, x, D.vars[x])
+
+/proc/make_view_variables_var_entry(datum/D, varname, value, level=0)
+	var/ecm = null
+	var/vtext = null
+	var/extra = null
+
+	if(D)
+		ecm = {"
+			(<a href='?_src_=vars;datumedit=\ref[D];varnameedit=[varname]'>E</a>)
+			(<a href='?_src_=vars;datumchange=\ref[D];varnamechange=[varname]'>C</a>)
+			(<a href='?_src_=vars;datummass=\ref[D];varnamemass=[varname]'>M</a>)
+			"}
+
+	if(isnull(value))
+		vtext = "null"
+	else if(istext(value))
+		vtext = "\"[value]\""
+	else if(isicon(value))
+		vtext = "[value]"
+	else if(isfile(value))
+		vtext = "'[value]'"
+	else if(istype(value, /datum))
+		var/datum/DA = value
+		if("[DA]" == "[DA.type]" || !"[DA]")
+			vtext = "<a href='?_src_=vars;Vars=\ref[DA]'>\ref[DA]</a> - [DA.type]"
+		else
+			vtext = "<a href='?_src_=vars;Vars=\ref[DA]'>\ref[DA]</a> - [DA] ([DA.type])"
+	else if(istype(value, /client))
+		var/client/C = value
+		vtext = "<a href='?_src_=vars;Vars=\ref[C]'>\ref[C]</a> - [C] ([C.type])"
+	else if(islist(value))
+		var/list/L = value
+		vtext = "/list ([L.len])"
+		if(!(varname in view_variables_dont_expand) && L.len > 0 && L.len < 100)
+			extra = "<ul>"
+			var/index = 1
+			for (var/entry in L)
+				if(istext(entry))
+					extra += make_view_variables_var_entry(null, entry, L[entry], level+1)
+				else
+					extra += make_view_variables_var_entry(null, index, L[index], level+1)
+				index++
+			extra += "</ul>"
+	else
+		vtext = "[value]"
+
+	return "<li>[ecm][varname] = <span class='value'>[vtext]</span>[extra]</li>"
@@ -1,6 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/merc
 	light_overlay = "helmet_light_dual_green"
-	camera_networks = list("NUKE")
+	camera_networks = list(NETWORK_MERCENARY)

 /obj/item/weapon/rig/merc
 	name = "crimson hardsuit control module"
@@ -7,7 +7,7 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 	species_restricted = list("Human")
-	camera_networks = list("NUKE")
+	camera_networks = list(NETWORK_MERCENARY)
 	light_overlay = "helmet_light_green" //todo: species-specific light overlays

 /obj/item/clothing/suit/space/void/merc
@@ -16,6 +16,7 @@

 	for(var/i in 1 to codelen)
 		code += pick(digits)
+		digits -= code[code.len]

 	generate_loot()

@@ -166,7 +167,7 @@
 			user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 			var/turf/T = get_turf(src.loc)
 			explosion(T, 0, 0, 1, 2)
-			del(src)
+			qdel(src)
 	
 /obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)	
 	if (locked)
@@ -25,7 +25,7 @@
 	speech_verb = "says"
 	whisper_verb = "whispers"
 	key = "0"
-	flags = RESTRICTED | COMMON_VERBS
+	flags = RESTRICTED
 	syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")

 //TODO flag certain languages to use the mob-type specific say_quote and then get rid of these.
@@ -183,6 +183,7 @@
 			if(!Adjacent(target))
 				awaiting_surrender = 5 // I'm done playing nice
 				mode = SECBOT_HUNT
+				return
 			var/threat = check_threat(target)
 			if(threat < 4)
 				target = null
@@ -696,6 +696,28 @@
 			number += 2
 	return number

+//Used by various things that knock people out by applying blunt trauma to the head.
+//Checks that the species has a "head" (brain containing organ) and that hit_zone refers to it.
+/mob/living/carbon/human/proc/headcheck(var/target_zone, var/brain_tag = "brain")
+	if(!species.has_organ[brain_tag])
+		return 0
+	
+	var/obj/item/organ/affecting = internal_organs_by_name[brain_tag]
+	
+	target_zone = check_zone(target_zone)
+	if(!affecting || affecting.parent_organ != target_zone)
+		return 0
+	
+	//if the parent organ is significantly larger than the brain organ, then hitting it is not guaranteed
+	var/obj/item/organ/parent = get_organ(target_zone)
+	if(!parent)
+		return 0
+	
+	if(parent.w_class > affecting.w_class + 1)
+		return prob(100 / 2**(parent.w_class - affecting.w_class - 1))
+	
+	return 1
+
 /mob/living/carbon/human/IsAdvancedToolUser(var/silent)
 	if(species.has_fine_manipulation)
 		return 1
@@ -16,14 +16,14 @@ emp_act

 	var/obj/item/organ/external/organ = get_organ()

-	//Shields
+	//Shields
 	var/shield_check = check_shields(P.damage, P, null, def_zone, "the [P.name]")
 	if(shield_check)
 		if(shield_check < 0)
 			return shield_check
 		else
 			P.on_hit(src, 2, def_zone)
-			return 2
+			return 2

 	//Shrapnel
 	if(P.can_embed())
@@ -146,21 +146,21 @@ emp_act
 	..()

 /mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone)
-	if(check_attack_throat(I, user))
+	if(check_attack_throat(I, user))
 		return null

 	if(user == src) // Attacking yourself can't miss
 		return target_zone

-	var/hit_zone = get_zone_with_miss_chance(target_zone, src)
+	var/hit_zone = get_zone_with_miss_chance(target_zone, src)

 	if(!hit_zone)
 		visible_message("<span class='danger'>\The [user] misses [src] with \the [I]!</span>")
 		return null
-
+
 	if(check_shields(I.force, I, user, target_zone, "the [I.name]"))
-		return
-	
+		return null
+
 	var/obj/item/organ/external/affecting = get_organ(hit_zone)
 	if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
 		user << "<span class='danger'>They are missing that limb!</span>"
@@ -174,7 +174,7 @@ emp_act
 		return //should be prevented by attacked_with_item() but for sanity.

 	visible_message("<span class='danger'>[src] has been [I.attack_verb.len? pick(I.attack_verb) : "attacked"] in the [affecting.name] with [I.name] by [user]!</span>")
-
+
 	var/blocked = run_armor_check(hit_zone, "melee", I.armor_penetration, "Your armor has protected your [affecting.name].", "Your armor has softened the blow to your [affecting.name].")
 	standard_weapon_hit_effects(I, user, effective_force, blocked, hit_zone)

@@ -182,32 +182,40 @@ emp_act

 /mob/living/carbon/human/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
 	var/obj/item/organ/external/affecting = get_organ(hit_zone)
-	if(!affecting)
+	if(!affecting)
 		return 0

 	// Handle striking to cripple.
 	if(user.a_intent == I_DISARM)
-		effective_force /= 2
-		if(..(I, effective_force, blocked, hit_zone))
-			attack_joint(affecting, I, blocked)
-		else
+		effective_force /= 2 //half the effective force
+		if(!..(I, effective_force, blocked, hit_zone))
 			return 0
+		
+		attack_joint(affecting, I, blocked) //but can dislocate joints
 	else if(!..())
 		return 0
-
+
 	if(effective_force > 10 || effective_force >= 5 && prob(33))
 		forcesay(hit_appends)	//forcesay checks stat already

-	if(prob(25 + (effective_force * 2)))
-		if(!((I.damtype == BRUTE) || (I.damtype == HALLOSS)))
-			return
-
+	if((I.damtype == BRUTE || I.damtype == HALLOSS) && prob(25 + (effective_force * 2)))
+		if(!stat)
+			if(headcheck(hit_zone))
+				//Harder to score a stun but if you do it lasts a bit longer
+				if(prob(effective_force))
+					visible_message("<span class='danger'>[src] [species.knockout_message]</span>")
+					apply_effect(20, PARALYZE, blocked)
+			else
+				//Easier to score a stun but lasts less time
+				if(prob(effective_force + 10))
+					visible_message("<span class='danger'>[src] has been knocked down!</span>")
+					apply_effect(6, WEAKEN, blocked)
+		
+		//Apply blood
 		if(!(I.flags & NOBLOODY))
 			I.add_blood(src)
-
-		var/bloody = 0
+		
 		if(prob(33))
-			bloody = 1
 			var/turf/location = loc
 			if(istype(location, /turf/simulated))
 				location.add_blood(src)
@@ -217,28 +225,19 @@ emp_act
 					H.bloody_body(src)
 					H.bloody_hands(src)

-		if(!stat)
 			switch(hit_zone)
-				if("head")//Harder to score a stun but if you do it lasts a bit longer
-					if(prob(effective_force))
-						apply_effect(20, PARALYZE, blocked)
-						visible_message("<span class='danger'>\The [src] has been knocked unconscious!</span>")
-					if(bloody)//Apply blood
-						if(wear_mask)
-							wear_mask.add_blood(src)
-							update_inv_wear_mask(0)
-						if(head)
-							head.add_blood(src)
-							update_inv_head(0)
-						if(glasses && prob(33))
-							glasses.add_blood(src)
-							update_inv_glasses(0)
-				if("chest")//Easier to score a stun but lasts less time
-					if(prob(effective_force + 10))
-						apply_effect(6, WEAKEN, blocked)
-						visible_message("<span class='danger'>\The [src] has been knocked down!</span>")
-					if(bloody)
-						bloody_body(src)
+				if("head")
+					if(wear_mask)
+						wear_mask.add_blood(src)
+						update_inv_wear_mask(0)
+					if(head)
+						head.add_blood(src)
+						update_inv_head(0)
+					if(glasses && prob(33))
+						glasses.add_blood(src)
+						update_inv_glasses(0)
+				if("chest")
+					bloody_body(src)

 	return 1

@@ -445,4 +444,3 @@ emp_act
 		perm += perm_by_part[part]

 	return perm
-
@@ -66,6 +66,7 @@
 	var/dusted_anim = "dust-h"
 	var/death_sound
 	var/death_message = "seizes up and falls limp, their eyes dead and lifeless..."
+	var/knockout_message = "has been knocked unconscious!"

 	// Environment tolerance/life processes vars.
 	var/reagent_tag                                   //Used for metabolizing reagents.
@@ -279,6 +279,8 @@
 	brute_mod = 1.875 // 100% * 1.875 * 0.8 (robolimbs) ~= 150%
 	burn_mod = 1.875  // So they take 50% extra damage from brute/burn overall.
 	show_ssd = "flashing a 'system offline' glyph on their monitor"
+	death_message = "gives one shrill beep before falling lifeless."
+	knockout_message = "encounters a hardware fault and suddenly reboots!"

 	warning_low_pressure = 50
 	hazard_low_pressure = 0
@@ -2,7 +2,7 @@
 /mob/living/carbon/process_resist()

 	//drop && roll
-	if(on_fire)
+	if(on_fire && !buckled)
 		fire_stacks -= 1.2
 		Weaken(3)
 		spin(32,2)
@@ -573,21 +573,12 @@ default behaviour is:
 	set name = "Resist"
 	set category = "IC"

-	if(can_resist())
+	if(!(stat || next_move > world.time))
 		setClickCooldown(20)
 		resist_grab()
-		if(!weakened && !restrained())
+		if(!weakened)
 			process_resist()

-/mob/living/proc/can_resist()
-	//need to allow !canmove, or otherwise neck grabs can't be resisted
-	//similar thing with weakened and pinning
-	if(stat)
-		return 0
-	if(!canClick())
-		return 0
-	return 1
-
 /mob/living/proc/process_resist()
 	//Getting out of someone's inventory.
 	if(istype(src.loc, /obj/item/weapon/holder))
@@ -161,19 +161,13 @@ proc/get_radio_key_from_channel(var/channel)
 	else
 		speaking = get_default_language()

-	if (speaking)
-		// This is broadcast to all mobs with the language,
-		// irrespective of distance or anything else.
-		if(speaking.flags & HIVEMIND)
-			speaking.broadcast(src,trim(message))
-			return 1
-		//If we've gotten this far, keep going!
-		if(speaking.flags & COMMON_VERBS)
-			verb = say_quote(message)
-		else
-			verb = speaking.get_spoken_verb(copytext(message, length(message)))
-	else
-		verb = say_quote(message)
+	// This is broadcast to all mobs with the language,
+	// irrespective of distance or anything else.
+	if(speaking && (speaking.flags & HIVEMIND))
+		speaking.broadcast(src,trim(message))
+		return 1
+
+	verb = say_quote(message, speaking)

 	if(is_muzzled())
 		src << "<span class='danger'>You're muzzled and cannot speak!</span>"
@@ -136,6 +136,5 @@
 // Cleaner proc for creating powersupply for an AI.
 /mob/living/silicon/ai/proc/create_powersupply()
 	if(psupply)
-		del(psupply)
+		qdel(psupply)
 	psupply = new/obj/machinery/ai_powersupply(src)
-
@@ -34,9 +34,6 @@
 /mob/living/captive_brain/emote(var/message)
 	return

-/mob/living/captive_brain/can_resist()
-	return !(stat || !canClick())
-
 /mob/living/captive_brain/process_resist()
 	//Resisting control by an alien mind.
 	if(istype(src.loc,/mob/living/simple_animal/borer))
@@ -91,15 +91,15 @@
 	var/damage = 20
 	var/obj/item/clothing/hat = attacker.head
 	if(istype(hat))
-		damage += hat.force * 10
+		damage += hat.force * 3

 	var/armor = target.run_armor_check("head", "melee")
-	target.apply_damage(damage*rand(90, 110)/100, BRUTE, "head", armor)
-	attacker.apply_damage(10*rand(90, 110)/100, BRUTE, "head", attacker.run_armor_check("head", "melee"))
+	target.apply_damage(damage, BRUTE, "head", armor)
+	attacker.apply_damage(10, BRUTE, "head", attacker.run_armor_check("head", "melee"))

-	if(!armor && prob(damage))
+	if(!armor && target.headcheck("head") && prob(damage))
 		target.apply_effect(20, PARALYZE)
-		target.visible_message("<span class='danger'>[target] has been knocked unconscious!</span>")
+		target.visible_message("<span class='danger'>[target] [target.species.knockout_message]</span>")

 	playsound(attacker.loc, "swing_hit", 25, 1, -1)
 	attacker.attack_log += text("\[[time_stamp()]\] <font color='red'>Headbutted [target.name] ([target.ckey])</font>")
@@ -626,6 +626,12 @@ proc/is_blind(A)

 	return 0

+/mob/living/carbon/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+	if(handcuffed)
+		return SAFE_PERP
+
+	return ..()
+
 /mob/living/carbon/human/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
 	var/threatcount = ..()
 	if(. == SAFE_PERP)
@@ -270,7 +270,7 @@
 	owner.updatehealth() //droplimb will call updatehealth() again if it does end up being called

 	//If limb took enough damage, try to cut or tear it off
-	if(owner && loc == owner)
+	if(owner && loc == owner && !is_stump())
 		if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier))
 			//organs can come off in three cases
 			//1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off.
@@ -25,4 +25,4 @@
 	qdel(src)

 /obj/item/organ/external/stump/is_usable()
-	return 0
+	return 0
@@ -1148,7 +1148,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)

 	switch(severity)
 		if(1.0)
-			//set_broken() //now Del() do what we need
+			//set_broken() //now qdel() do what we need
 			if (cell)
 				cell.ex_act(1.0) // more lags woohoo
 			qdel(src)
@@ -32,17 +32,17 @@
 		return
 	..()

-/datum/reagent/nutriment/egg // Also bad for skrell. Not a child of protein because it might mess up, not sure.
+/datum/reagent/nutriment/protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien && alien == IS_SKRELL)
+		M.adjustToxLoss(2 * removed)
+		return
+	..()
+
+/datum/reagent/nutriment/protein/egg // Also bad for skrell.
 	name = "egg yolk"
 	id = "egg"
 	color = "#FFFFAA"

-/datum/reagent/nutriment/egg/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
-	if(alien && alien == IS_SKRELL)
-		M.adjustToxLoss(0.5 * removed)
-		return
-	..()
-
 /datum/reagent/nutriment/honey
 	name = "Honey"
 	id = "honey"
@@ -570,19 +570,36 @@
 	adj_drowsy = -3
 	adj_sleepy = -2
 	adj_temp = 25
+	overdose = 45

 	glass_icon_state = "hot_coffee"
 	glass_name = "cup of coffee"
 	glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."

 /datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
-	..()
 	if(alien == IS_DIONA)
 		return
+	..()
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(0.5 * removed)
+		M.make_jittery(4) //extra sensitive to caffine
 	if(adj_temp > 0)
 		holder.remove_reagent("frostoil", 10 * removed)
-	if(dose > 45)
-		M.make_jittery(5)
+
+/datum/reagent/nutriment/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(2 * removed)
+		M.make_jittery(4)
+		return
+
+/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien)
+	if(alien == IS_DIONA)
+		return
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(4 * REM)
+		M.apply_effect(3, STUTTER)
+	M.make_jittery(5)

 /datum/reagent/drink/coffee/icecoffee
 	name = "Iced Coffee"
@@ -1010,7 +1027,39 @@
 	glass_desc = "A crystal clear glass of Griffeater gin."
 	glass_center_of_mass = list("x"=16, "y"=12)

-/datum/reagent/ethanol/kahlua
+//Base type for alchoholic drinks containing coffee
+/datum/reagent/ethanol/coffee
+	overdose = 45
+
+/datum/reagent/ethanol/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_DIONA)
+		return
+	..()
+	M.dizziness = max(0, M.dizziness - 5)
+	M.drowsyness = max(0, M.drowsyness - 3)
+	M.sleeping = max(0, M.sleeping - 2)
+	if(M.bodytemperature > 310)
+		M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(0.5 * removed)
+		M.make_jittery(4) //extra sensitive to caffine
+
+/datum/reagent/ethanol/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(2 * removed)
+		M.make_jittery(4)
+		return
+	..()
+
+/datum/reagent/ethanol/coffee/overdose(var/mob/living/carbon/M, var/alien)
+	if(alien == IS_DIONA)
+		return
+	if(alien == IS_TAJARA)
+		M.adjustToxLoss(4 * REM)
+		M.apply_effect(3, STUTTER)
+	M.make_jittery(5)
+
+/datum/reagent/ethanol/coffee/kahlua
 	name = "Kahlua"
 	id = "kahlua"
 	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
@@ -1022,17 +1071,6 @@
 	glass_desc = "DAMN, THIS THING LOOKS ROBUST"
 	glass_center_of_mass = list("x"=15, "y"=7)

-/datum/reagent/ethanol/kahlua/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
-	..()
-	if(alien == IS_DIONA)
-		return
-	M.dizziness = max(0, M.dizziness - 5)
-	M.drowsyness = max(0, M.drowsyness - 3)
-	M.sleeping = max(0, M.sleeping - 2)
-	if(M.bodytemperature > 310)
-		M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
-	M.make_jittery(5)
-
 /datum/reagent/ethanol/melonliquor
 	name = "Melon Liquor"
 	id = "melonliquor"
@@ -1246,7 +1284,7 @@
 	glass_desc = "We cannot take legal responsibility for your actions after imbibing."
 	glass_center_of_mass = list("x"=15, "y"=7)

-/datum/reagent/ethanol/b52
+/datum/reagent/ethanol/coffee/b52
 	name = "B-52"
 	id = "b52"
 	description = "Coffee, Irish Cream, and cognac. You will get bombed."
@@ -1357,7 +1395,7 @@
 	glass_name = "glass of Booger"
 	glass_desc = "Ewww..."

-/datum/reagent/ethanol/brave_bull
+/datum/reagent/ethanol/coffee/brave_bull
 	name = "Brave Bull"
 	id = "bravebull"
 	description = "It's just as effective as Dutch-Courage!"
@@ -1566,7 +1604,7 @@
 	glass_desc = "An irish car bomb."
 	glass_center_of_mass = list("x"=16, "y"=8)

-/datum/reagent/ethanol/irishcoffee
+/datum/reagent/ethanol/coffee/irishcoffee
 	name = "Irish Coffee"
 	id = "irishcoffee"
 	description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
@@ -420,19 +420,19 @@
 		return
 	M.druggy = max(M.druggy, 30)
 	if(dose < 1)
-		M.stuttering = max(M.stuttering, 3)
+		M.apply_effect(3, STUTTER)
 		M.make_dizzy(5)
 		if(prob(10))
 			M.emote(pick("twitch", "giggle"))
 	else if(dose < 2)
-		M.stuttering = max(M.stuttering, 3)
+		M.apply_effect(3, STUTTER)
 		M.make_jittery(10)
 		M.make_dizzy(10)
 		M.druggy = max(M.druggy, 35)
 		if(prob(20))
 			M.emote(pick("twitch","giggle"))
 	else
-		M.stuttering = max(M.stuttering, 3)
+		M.apply_effect(3, STUTTER)
 		M.make_jittery(20)
 		M.make_dizzy(20)
 		M.druggy = max(M.druggy, 40)
@@ -130,8 +130,10 @@
 	if(blocked < 2)
 		weaken_duration = smash_duration + min(0, force - target.getarmor(hit_zone, "melee") + 10)
 	
-	if(hit_zone == "head" && istype(target, /mob/living/carbon/))
-		user.visible_message("<span class='danger'>\The [user] smashes [src] over [target]'s head!</span>")
+	var/mob/living/carbon/human/H = target
+	if(istype(H) && H.headcheck(hit_zone))
+		var/obj/item/organ/affecting = H.get_organ(hit_zone) //headcheck should ensure that affecting is not null
+		user.visible_message("<span class='danger'>[user] smashes [src] into [H]'s [affecting.name]!</span>")
 		if(weaken_duration)
 			target.apply_effect(min(weaken_duration, 5), WEAKEN, blocked) // Never weaken more than a flash!
 	else
@@ -428,5 +430,3 @@
 	New()
 		..()
 		reagents.add_reagent("ale", 30)
-
-
@@ -15,6 +15,20 @@

 		return 1

+/datum/disease2/disease/get_view_variables_header()
+	. = list()
+	for(var/datum/disease2/effectholder/E in effects)
+		. += "[E.stage]: [E.effect.name]"
+	return {"
+		<b>[name()]</b><br><font size=1>
+		[list2text(., "<br>")]</font>
+	"}
+
+/datum/disease2/disease/get_view_variables_options()
+	return ..() + {"
+		<option value='?src=\ref[src];info=1'>Show info</option>
+	"}
+
 /datum/admins/var/datum/virus2_editor/virus2_editor_datum = new
 /client/proc/virus2_editor()
 	set name = "Virus Editor"