Merge remote-tracking branch 'citadel/master' into shield_refactor

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

@@ -653,6 +653,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return 0
 
 	transfer_ckey(target, FALSE)
+	target.AddElement(/datum/element/ghost_role_eligibility)
 	target.faction = list("neutral")
 	return 1
 

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

@@ -707,7 +707,7 @@
 
 /mob/living/carbon/human/wash_cream()
 	if(creamed) //clean both to prevent a rare bug
-		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))
+		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_snout"))
 		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human"))
 		creamed = FALSE
 

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

@@ -5,10 +5,10 @@
 	icon_living = "bumbles"
 	icon_dead = "bumbles_dead"
 	turns_per_move = 1
-	response_help = "shoos"
+	response_help = "pets"
 	response_disarm = "brushes aside"
 	response_harm = "squashes"
-	speak_emote = list("bzzzs")
+	speak_emote = list("buzzes")
 	maxHealth = 100
 	health = 100
 	harm_intent_damage = 1
@@ -20,10 +20,12 @@
 	mob_size = MOB_SIZE_TINY
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
-	verb_say = "bzzs"
-	verb_ask = "bzzs inquisitively"
-	verb_exclaim = "bzzs intensely"
-	verb_yell = "bzzs intensely"
+	verb_say = "buzzs"
+	verb_ask = "buzzes inquisitively"
+	verb_exclaim = "buzzes intensely"
+	verb_yell = "buzzes intensely"
+	emote_see = list("buzzes.", "makes a loud buzz.", "rolls several times.", "buzzes happily.")
+	speak_chance = 1
 
 /mob/living/simple_animal/pet/bumbles/Initialize()
 	. = ..()
@@ -44,3 +46,22 @@
 
 /mob/living/simple_animal/pet/bumbles/bee_friendly()
 	return TRUE //treaty signed at the Beeneeva convention
+
+/mob/living/simple_animal/pet/bumbles/handle_automated_movement()
+	. = ..()
+	if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE)  || buckled)
+		return
+	if(!resting && prob(1))
+		emote("me", EMOTE_VISIBLE, pick("curls up on the surface below ", "is looking very sleepy.", "buzzes softly ", "looks around for a flower nap "))
+		set_resting(TRUE)
+	else if (resting && prob(1))
+		emote("me", EMOTE_VISIBLE, pick("wakes up with a smiling buzz.", "rolls upside down before waking up.", "stops resting."))
+		set_resting(FALSE)
+/mob/living/simple_animal/pet/bumbles/update_mobility()
+	. = ..()
+	if(stat != DEAD)
+		if(!CHECK_MOBILITY(src, MOBILITY_STAND))
+			icon_state = "[icon_living]_rest"
+		else
+			icon_state = "[icon_living]"
+		regenerate_icons()

code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm

@@ -161,7 +161,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
 				INVOKE_ASYNC(src, .proc/arena_checks)
 			if(TUMOR_INACTIVE)
 				activity = TUMOR_ACTIVE
-				var/mob/dead/observer/elitemind = null
+				var/mob/elitemind = null
 				visible_message("<span class='boldwarning'>[src] begins to convulse.  Your instincts tell you to step back.</span>")
 				activator = user
 				if(!boosted)

code/modules/mob/mob_helpers.dm

@@ -443,10 +443,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/)
 		if(A)
 			poll_message = "[poll_message] Status:[A.name]."
-	var/list/mob/dead/observer/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
+	var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
 
 	if(LAZYLEN(candidates))
-		var/mob/dead/observer/C = pick(candidates)
+		var/mob/C = pick(candidates)
 		to_chat(M, "Your mob has been taken over by a ghost!")
 		message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(M)])")
 		M.ghostize(FALSE, TRUE)