Merge branch 'master' into hook-kill-v10-final-ultimate-final

code/datums/datumvars.dm

@@ -819,6 +819,59 @@
 		message_admins("<span class='notice'>[key_name(usr)] has made [A] process normally</span>")
 		return TRUE
 
+	else if(href_list["modifyarmor"])
+		if(!check_rights(R_DEBUG|R_ADMIN))
+			return
+		var/obj/A = locateUID(href_list["modifyarmor"])
+		if(!istype(A))
+			return
+		A.var_edited = TRUE
+		var/list/armorlist = A.armor.getList()
+		var/list/displaylist
+
+		var/result
+		do
+			displaylist = list()
+			for(var/key in armorlist)
+				displaylist += "[key] = [armorlist[key]]"
+			result = input(usr, "Select an armor type to modify..", "Modify armor") as null|anything in displaylist + "(ADD ALL)" + "(SET ALL)" + "(DONE)"
+
+			if(result == "(DONE)")
+				break
+			else if(result == "(ADD ALL)" || result == "(SET ALL)")
+				var/new_amount = input(usr, result == "(ADD ALL)" ? "Enter armor to add to all types:" : "Enter new armor value for all types:", "Modify all types") as num|null
+				if(isnull(new_amount))
+					continue
+				var/proper_amount = text2num(new_amount)
+				if(isnull(proper_amount))
+					continue
+				for(var/key in armorlist)
+					armorlist[key] = (result == "(ADD ALL)" ? armorlist[key] : 0) + proper_amount
+			else if(result)
+				var/list/fields = splittext(result, " = ")
+				if(length(fields) != 2)
+					continue
+				var/type = fields[1]
+				if(isnull(armorlist[type]))
+					continue
+				var/new_amount = input(usr, "Enter new armor value for [type]:", "Modify [type]") as num|null
+				if(isnull(new_amount))
+					continue
+				var/proper_amount = text2num(new_amount)
+				if(isnull(proper_amount))
+					continue
+				armorlist[type] = proper_amount
+		while(result)
+
+		if(!result || !A)
+			return TRUE
+
+		A.armor = A.armor.setRating(armorlist["melee"], armorlist["bullet"], armorlist["laser"], armorlist["energy"], armorlist["bomb"], armorlist["bio"], armorlist["rad"], armorlist["fire"], armorlist["acid"], armorlist["magic"])
+
+		log_admin("[key_name(usr)] modified the armor on [A] to: melee = [armorlist["melee"]], bullet = [armorlist["bullet"]], laser = [armorlist["laser"]], energy = [armorlist["energy"]], bomb = [armorlist["bomb"]], bio = [armorlist["bio"]], rad = [armorlist["rad"]], fire = [armorlist["fire"]], acid = [armorlist["acid"]], magic = [armorlist["magic"]]")
+		message_admins("<span class='notice'>[key_name(usr)] modified the armor on [A] to: melee = [armorlist["melee"]], bullet = [armorlist["bullet"]], laser = [armorlist["laser"]], energy = [armorlist["energy"]], bomb = [armorlist["bomb"]], bio = [armorlist["bio"]], rad = [armorlist["rad"]], fire = [armorlist["fire"]], acid = [armorlist["acid"]], magic = [armorlist["magic"]]")
+		return TRUE
+
 	else if(href_list["addreagent"]) /* Made on /TG/, credit to them. */
 		if(!check_rights(R_DEBUG|R_ADMIN))	return
 

code/datums/diseases/critical.dm

@@ -159,7 +159,7 @@
 		var/mob/living/carbon/human/H = affected_mob
 		if(NO_HUNGER in H.dna.species.species_traits)
 			return TRUE
-		if(ismachine(H))
+		if(ismachineperson(H))
 			return TRUE
 	return ..()
 

code/datums/mind.dm

@@ -39,7 +39,6 @@
 	var/role_alt_title
 
 	var/datum/job/assigned_job
-	var/list/kills = list()
 	var/list/datum/objective/objectives = list()
 	var/list/datum/objective/special_verbs = list()
 	var/list/targets = list()

code/datums/spells/summonitem.dm

@@ -75,8 +75,6 @@
 								B.transfer_identity(C)
 								C.death()
 								add_attack_logs(target, C, "Magically debrained INTENT: [uppertext(target.a_intent)]")*/
-						if(C.stomach_contents && (item_to_retrieve in C.stomach_contents))
-							C.stomach_contents -= item_to_retrieve
 						for(var/X in C.bodyparts)
 							var/obj/item/organ/external/part = X
 							if(item_to_retrieve in part.embedded_objects)

code/datums/wires/airlock.dm

@@ -166,9 +166,9 @@
 			//raises them if they are down (only if power's on)
 			if(!A.locked)
 				if(A.lock())
-					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", hearing_distance =  1)
 			else if(A.unlock())
-				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", hearing_distance =  1)
 
 		if(AIRLOCK_WIRE_BACKUP_POWER1)
 			//two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter).