Merge remote-tracking branch 'remotes/tgstation/master' into The_Alien_Queen_Bends_Down_And_Plants_A_Kiss_On_WJ_With_Her_Long_Wet_Tongue-mouth

# Conflicts:
#	icons/mob/actions.dmi

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

@@ -297,11 +297,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	..()
 	if(statpanel("Status"))
 		stat(null, "Station Time: [worldtime2text()]")
-		if(ticker)
-			if(ticker.mode)
-				for(var/datum/gang/G in ticker.mode.gangs)
-					if(G.is_dominating)
-						stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
+		if(ticker && ticker.mode)
+			for(var/datum/gang/G in ticker.mode.gangs)
+				if(G.is_dominating)
+					stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
+			if(istype(ticker.mode, /datum/game_mode/blob))
+				var/datum/game_mode/blob/B = ticker.mode
+				if(B.message_sent)
+					stat(null, "Blobs to Blob Win: [blobs_legit.len]/[B.blobwincount]")
 
 /mob/dead/observer/verb/reenter_corpse()
 	set category = "Ghost"

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

@@ -203,12 +203,19 @@
 		for(var/obj/item/I in BP.embedded_objects)
 			msg += "<B>[t_He] [t_has] \a \icon[I] [I] embedded in [t_his] [BP.name]!</B>\n"
 
+	//stores how many left limbs are missing
+	var/l_limbs_missing = 0
 	for(var/t in missing)
 		if(t=="head")
 			msg += "<span class='deadsay'><B>[capitalize(t_his)] [parse_zone(t)] is missing!</B><span class='warning'>\n"
 			continue
+		if(t == "l_arm" || t == "l_leg")
+			l_limbs_missing++
 		msg += "<B>[capitalize(t_his)] [parse_zone(t)] is missing!</B>\n"
 
+	if(l_limbs_missing >= 2)
+		msg += "[t_He] looks all right now.\n"
+
 	if(temp)
 		if(temp < 30)
 			msg += "[t_He] [t_has] minor bruising.\n"
@@ -345,7 +352,6 @@
 						msg += "<a href='?src=\ref[src];hud=s;add_crime=1'>\[Add crime\]</a> "
 						msg += "<a href='?src=\ref[src];hud=s;view_comment=1'>\[View comment log\]</a> "
 						msg += "<a href='?src=\ref[src];hud=s;add_comment=1'>\[Add comment\]</a>\n"
-
 	msg += "*---------*</span>"
 
 	user << msg

code/modules/mob/living/living.dm

@@ -953,12 +953,16 @@ Sorry Giacom. Please don't be mad :(
 
 /mob/living/Stat()
 	..()
+
 	if(statpanel("Status"))
-		if(ticker)
-			if(ticker.mode)
-				for(var/datum/gang/G in ticker.mode.gangs)
-					if(G.is_dominating)
-						stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
+		if(ticker && ticker.mode)
+			for(var/datum/gang/G in ticker.mode.gangs)
+				if(G.is_dominating)
+					stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
+			if(istype(ticker.mode, /datum/game_mode/blob))
+				var/datum/game_mode/blob/B = ticker.mode
+				if(B.message_sent)
+					stat(null, "Blobs to Blob Win: [blobs_legit.len]/[B.blobwincount]")
 
 /mob/living/cancel_camera()
 	..()

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

@@ -10,6 +10,7 @@
 	healable = 0
 	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	maxbodytemp = INFINITY
 	minbodytemp = 0
 	has_unlimited_silicon_privilege = 1
 	sentience_type = SENTIENCE_ARTIFICIAL

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -313,6 +313,7 @@ Difficulty: Very Hard
 		return
 	current = src
 	ReadMemory()
+	. = ..()
 
 /obj/machinery/smartfridge/black_box/process()
 	..()

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

@@ -51,6 +51,7 @@ Difficulty: Medium
 	aggro_vision_range = 18
 	idle_vision_range = 13
 	appearance_flags = 0
+	mouse_opacity = 1
 
 /mob/living/simple_animal/hostile/megafauna/legion/New()
 	..()

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

@@ -22,6 +22,7 @@
 	var/elimination = 0
 	anchored = TRUE
 	layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise
+	mouse_opacity = 2 // Easier to click on in melee, they're giant targets anyway
 
 /mob/living/simple_animal/hostile/megafauna/death(gibbed)
 	if(health > 0)

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

@@ -15,6 +15,7 @@
 	var/icon_aggro = null // for swapping to when we get aggressive
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_MINIMUM
+	mob_size = MOB_SIZE_LARGE
 
 /mob/living/simple_animal/hostile/asteroid/Aggro()
 	..()
@@ -452,7 +453,6 @@
 	aggro_vision_range = 9
 	idle_vision_range = 5
 	anchored = 1 //Stays anchored until death as to be unpullable
-	mob_size = MOB_SIZE_LARGE
 	var/pre_attack = 0
 	var/pre_attack_icon = "Goliath_preattack"
 	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide)

code/modules/mob/mob.dm

@@ -2,6 +2,7 @@
 	mob_list -= src
 	dead_mob_list -= src
 	living_mob_list -= src
+	all_clockwork_mobs -= src
 	if(observers && observers.len)
 		for(var/M in observers)
 			var/mob/dead/observe = M
@@ -593,7 +594,7 @@ var/next_mob_id = 0
 
 	if(statpanel("Status"))
 		stat(null, "Map: [MAP_NAME]")
-		if (nextmap && istype(nextmap))
+		if(nextmap && istype(nextmap))
 			stat(null, "Next Map: [nextmap.friendlyname]")
 		stat(null, "Server Time: [time2text(world.realtime, "YYYY-MM-DD hh:mm")]")
 		if(SSshuttle.emergency)

code/modules/mob/mob_movement.dm

@@ -12,7 +12,26 @@
 			return 1
 	return (!mover.density || !density || lying)
 
+//there are bugs with byond's default versions of these verbs
+/client/verb/moveup()
+	set name = ".moveup"
+	set instant = 1
+	Move(get_step(mob, NORTH), NORTH)
 
+/client/verb/movedown()
+	set name = ".movedown"
+	set instant = 1
+	Move(get_step(mob, SOUTH), SOUTH)
+
+/client/verb/moveright()
+	set name = ".moveright"
+	set instant = 1
+	Move(get_step(mob, EAST), EAST)
+
+/client/verb/moveleft()
+	set name = ".moveleft"
+	set instant = 1
+	Move(get_step(mob, WEST), WEST)
 
 /client/Northeast()
 	swap_hand()
@@ -90,14 +109,15 @@
 
 
 /client/Move(n, direct)
+	if(world.time < move_delay)
+		return 0
+	move_delay = world.time+world.tick_lag //this is here because Move() can now be called mutiple times per tick
 	if(!mob || !mob.loc)
 		return 0
 	if(mob.notransform)
 		return 0	//This is sota the goto stop mobs from moving var
 	if(mob.control_object)
 		return Move_object(direct)
-	if(world.time < move_delay)
-		return 0
 	if(!isliving(mob))
 		return mob.Move(n,direct)
 	if(mob.stat == DEAD)

code/modules/mob/transform_procs.dm

@@ -422,8 +422,8 @@
 	. = new_slime
 	qdel(src)
 
-/mob/proc/become_overmind(mode_made = 0)
-	var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made)
+/mob/proc/become_overmind(mode_made, starting_points = 60)
+	var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made, starting_points)
 	if(mind)
 		mind.transfer_to(B)
 	else