Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/954

Resolves conflicts in datums/hud.dm

code/modules/mob/dead/observer/observer.dm

@@ -71,6 +71,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
+	if(stat != DEAD)
+		succumb()
 	if(stat == DEAD)
 		ghostize(1)
 	else

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -45,9 +45,9 @@
 		usr << "This one seems particularly lifeless. Perhaps it will regain some of it's luster later.."
 
 
-/obj/item/organ/brain/attack(mob/living/carbon/M, mob/living/carbon/user)
-	if(!istype(M, /mob))
-		return
+/obj/item/organ/brain/attack(mob/living/carbon/M, mob/user)
+	if(!istype(M))
+		return ..()
 
 	add_fingerprint(user)
 

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

@@ -337,23 +337,29 @@
 		return
 
 	client.screen -= hud_used.item_action_list
-	hud_used.item_action_list = list()
 
 	for(var/obj/item/I in src)
 		if(I.action_button_name)
-			var/obj/screen/item_action/A = new(hud_used)
+			if(hud_used.item_action_list.len < num)
+				var/obj/screen/item_action/N = new(hud_used)
+				hud_used.item_action_list += N
+
+			var/obj/screen/item_action/A = hud_used.item_action_list[num]
+
 			A.icon = ui_style2icon(client.prefs.UI_style)
 			A.icon_state = "template"
-			var/image/img = image(I.icon, I.icon_state)
+
+			A.overlays = list()
+			var/image/img = image(I.icon, A, I.icon_state)
 			img.pixel_x = 0
 			img.pixel_y = 0
 			A.overlays += img
-			if(I.action_button_name)
-				A.name = I.action_button_name
-			else
-				A.name = "Use [I.name]"
+
+			A.name = I.action_button_name
 			A.owner = I
-			hud_used.item_action_list += A
+
+			client.screen += hud_used.item_action_list[num]
+
 			switch(num)
 				if(1)
 					A.screen_loc = ui_action_slot1
@@ -366,6 +372,4 @@
 				if(5)
 					A.screen_loc = ui_action_slot5
 					break //5 slots available, so no more can be added.
-			num++
-
-	client.screen += hud_used.item_action_list
+			num++

code/modules/mob/living/living.dm

@@ -12,7 +12,7 @@
 		src.adjustOxyLoss(src.health + 200)
 		src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
 		src << "\blue You have given up life and succumbed to death."
-
+		death()
 
 
 /mob/living/proc/updatehealth()

code/modules/mob/living/silicon/ai/ai.dm

@@ -31,7 +31,7 @@ var/list/ai_list = list()
 	var/obj/item/device/multitool/aiMulti = null
 
 	//MALFUNCTION
-	var/datum/AI_Module/module_picker/malf_picker
+	var/datum/module_picker/malf_picker
 	var/processing_time = 100
 	var/list/datum/AI_Module/current_modules = list()
 	var/fire_res_on_core = 0
@@ -48,6 +48,7 @@ var/list/ai_list = list()
 	var/datum/trackable/track = null
 
 	var/last_paper_seen = null
+	var/can_shunt = 1
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names

code/modules/mob/living/silicon/robot/robot.dm

@@ -238,6 +238,9 @@
 		adjustBruteLoss(60)
 		updatehealth()
 		return 1
+	else
+		gib()
+		return 1
 	return 0
 
 /mob/living/silicon/robot/Stat()

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -3,8 +3,8 @@
 	damage_type = BRUTE
 
 /mob/living/simple_animal/hostile/hivebot
-	name = "Hivebot"
-	desc = "A small robot"
+	name = "hivebot"
+	desc = "A small robot."
 	icon = 'icons/mob/hivebot.dmi'
 	icon_state = "basic"
 	icon_living = "basic"
@@ -28,7 +28,7 @@
 	minbodytemp = 0
 
 /mob/living/simple_animal/hostile/hivebot/range
-	name = "Hivebot"
+	name = "hivebot"
 	desc = "A smallish robot, this one is armed!"
 	ranged = 1
 
@@ -37,7 +37,7 @@
 	rapid = 1
 
 /mob/living/simple_animal/hostile/hivebot/strong
-	name = "Strong Hivebot"
+	name = "strong hivebot"
 	desc = "A robot, this one is armed and looks tough!"
 	health = 80
 	ranged = 1
@@ -54,8 +54,8 @@
 	return
 
 /mob/living/simple_animal/hostile/hivebot/tele//this still needs work
-	name = "Beacon"
-	desc = "Some odd beacon thing"
+	name = "beacon"
+	desc = "Some odd beacon thing."
 	icon = 'icons/mob/hivebot.dmi'
 	icon_state = "def_radar-off"
 	icon_living = "def_radar-off"

code/modules/mob/living/simple_animal/parrot.dm

@@ -109,8 +109,6 @@ lines 294-301 in living/say.dm (speech buffer)
 
 	parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
 
-	player_list += src
-
 	verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \
 			  /mob/living/simple_animal/parrot/proc/steal_from_mob, \
 			  /mob/living/simple_animal/parrot/verb/drop_held_item_player, \
@@ -160,10 +158,11 @@ lines 294-301 in living/say.dm (speech buffer)
 			switch(remove_from)
 				if("ears")
 					if(ears)
-						if(available_channels.len)
-							src.say("[pick(available_channels)] BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
-						else
-							src.say("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+						if(!stat)
+							if(available_channels.len)
+								src.say("[pick(available_channels)] BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+							else
+								src.say("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
 						ears.loc = src.loc
 						ears = null
 						for(var/possible_phrase in speak)
@@ -264,7 +263,7 @@ lines 294-301 in living/say.dm (speech buffer)
 	if(parrot_state == PARROT_PERCH)
 		parrot_sleep_dur = parrot_sleep_max //Reset it's sleep timer if it was perched
 
-	if(M.melee_damage_upper > 0)
+	if(M.melee_damage_upper > 0 && !stat)
 		parrot_interest = M
 		parrot_state = PARROT_SWOOP | PARROT_ATTACK //Attack other animals regardless
 		icon_state = "parrot_fly"
@@ -704,7 +703,7 @@ lines 294-301 in living/say.dm (speech buffer)
 
 
 //parrots will eat crackers instead of dropping them
-	if(istype(held_item,/obj/item/weapon/reagent_containers/food/snacks/cracker) && (!drop_gently))
+	if(istype(held_item,/obj/item/weapon/reagent_containers/food/snacks/cracker) && (drop_gently))
 		del(held_item)
 		held_item = null
 		if(health < maxHealth)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -24,9 +24,9 @@
 	var/stop_automated_movement_when_pulled = 1 //When set to 1 this stops the animal from moving when someone is pulling it.
 
 	//Interaction
-	var/response_help   = "You try to help"
-	var/response_disarm = "You try to disarm"
-	var/response_harm   = "You try to hurt"
+	var/response_help   = "pokes"
+	var/response_disarm = "shoves"
+	var/response_harm   = "hits"
 	var/harm_intent_damage = 3
 
 	//Temperature effect
@@ -457,6 +457,8 @@
 
 /mob/living/simple_animal/adjustBruteLoss(damage)
 	health = Clamp(health - damage, 0, maxHealth)
+	if(health < 1)
+		Die()
 
 /mob/living/simple_animal/proc/SA_attackable(target)
 	if (isliving(target))
@@ -467,4 +469,4 @@
 		var/obj/mecha/M = target
 		if (M.occupant)
 			return 0
-	return 1
+	return 1

code/modules/mob/mob_grab.dm

@@ -36,6 +36,8 @@
 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
 /obj/item/weapon/grab/proc/throw()
 	if(affecting)
+		if(affecting.buckled)
+			return null
 		if(state >= GRAB_AGGRESSIVE)
 			return affecting
 	return null
@@ -78,6 +80,7 @@
 			affecting.drop_item()
 			affecting.hand = h
 			for(var/obj/item/weapon/grab/G in affecting.grabbed_by)
+				if(G == src) continue
 				if(G.state == GRAB_AGGRESSIVE)
 					allow_upgrade = 0
 		if(allow_upgrade)
@@ -106,7 +109,7 @@
 		return
 	if(assailant.next_move > world.time)
 		return
-	if(last_upgrade > world.time + UPGRADE_COOLDOWN)
+	if(world.time < (last_upgrade + UPGRADE_COOLDOWN))
 		return
 	if(!assailant.canmove || assailant.lying)
 		del(src)

code/modules/mob/mob_helpers.dm

@@ -115,6 +115,11 @@ proc/isobserver(A)
 		return 1
 	return 0
 
+proc/isovermind(A)
+	if(istype(A, /mob/camera/blob))
+		return 1
+	return 0
+
 proc/isorgan(A)
 	if(istype(A, /datum/limb))
 		return 1