Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed

code/modules/mob/living/blood.dm

@@ -162,8 +162,13 @@
 		blood_data["trace_chem"] = list2params(temp_chem)
 		if(mind)
 			blood_data["mind"] = mind
+		else if(last_mind)
+			blood_data["mind"] = last_mind
 		if(ckey)
 			blood_data["ckey"] = ckey
+		else if(last_mind)
+			blood_data["ckey"] = ckey(last_mind.key)
+
 		if(!suiciding)
 			blood_data["cloneable"] = 1
 		blood_data["blood_type"] = copytext(dna.blood_type,1,0)

code/modules/mob/living/brain/MMI.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /obj/item/device/mmi
 	name = "Man-Machine Interface"

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

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /mob/living/brain
 	languages_spoken = HUMAN

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost)
 	var/temperature = current

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /mob/living/carbon/alien/larva/Life()
 	set invisibility = 0

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 //TODO: Make these simple_animals
 

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

@@ -768,5 +768,5 @@
 	. = ..()
 	. += "---"
 	.["Make AI"] = "?_src_=vars;makeai=\ref[src]"
-	.["Modify bodypart"] = "<option value='?_src_=vars;editbodypart=\ref[src]'>Modify bodypart</option>"
+	.["Modify bodypart"] = "?_src_=vars;editbodypart=\ref[src]"
 	.["Modify organs"] = "?_src_=vars;editorgans=\ref[src]"

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

@@ -25,6 +25,7 @@
 	var/obj/item/ears = null //only used by humans.
 
 	var/datum/dna/dna = null//Carbon
+	var/datum/mind/last_mind = null //last mind to control this mob, for blood-based cloning
 
 	var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
 

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

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 //NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick!
 

code/modules/mob/living/carbon/monkey/life.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /mob/living/carbon/monkey
 

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

@@ -75,11 +75,12 @@
 		if(!t_state)
 			t_state = I.icon_state
 
-		var/icon_file = I.lefthand_file
-		if(get_held_index_of_item(I) % 2 == 0)
-			icon_file = I.righthand_file
+		var/image/standing = I.build_worn_icon(state = t_state, default_layer = HANDS_LAYER, default_icon_file = I.righthand_file, isinhands = TRUE)
+
+		if(get_held_index_of_item(I) % 2 == 1)
+			var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+			standing.transform = reflect
 
-		var/image/standing = I.build_worn_icon(state = t_state, default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE)
 		hands += standing
 
 	overlays_standing[HANDS_LAYER] = hands

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

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
 
 // Mulebot - carries crates around for Quartermaster
 // Navigates via floor navbeacons

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

@@ -1,5 +1,3 @@
-
-
 /mob/living/simple_animal/cockroach
 	name = "cockroach"
 	desc = "This station is just crawling with bugs."
@@ -16,11 +14,15 @@
 	response_help  = "pokes"
 	response_disarm = "shoos"
 	response_harm   = "splats"
+	speak_emote = list("chitters")
 	density = 0
 	ventcrawler = VENTCRAWLER_ALWAYS
 	gold_core_spawnable = 2
+	verb_say = "chitters"
+	verb_ask = "chitters inquisitively"
+	verb_exclaim = "chitters loudly"
+	verb_yell = "chitters loudly"
 	var/squish_chance = 50
-	loot = list(/obj/effect/decal/cleanable/deadcockroach)
 	del_on_death = 1
 
 /mob/living/simple_animal/cockroach/death(gibbed)
@@ -28,6 +30,10 @@
 		return
 	..()
 
+/mob/living/simple_animal/cockroach/proc/squish()
+	adjustBruteLoss(1) // kills a normal cockroach
+	new /obj/effect/decal/cleanable/deadcockroach(get_turf(src))
+
 /mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
 	if(ismob(AM))
 		if(isliving(AM))
@@ -35,14 +41,14 @@
 			if(A.mob_size > MOB_SIZE_SMALL)
 				if(prob(squish_chance))
 					A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
-					death()
+					squish()
 				else
 					visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
 	else
 		if(isobj(AM))
 			if(istype(AM,/obj/structure))
 				visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
-				death()
+				squish()
 
 /mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
 	return

code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm

@@ -51,10 +51,13 @@
 		if(!l_state)
 			l_state = l_hand.icon_state
 
-		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = DRONE_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
+		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = DRONE_HANDS_LAYER, default_icon_file = l_hand.righthand_file, isinhands = TRUE)
 		if(y_shift)
 			l_hand_image.pixel_y += y_shift
 
+		var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+		l_hand_image.transform = reflect
+
 		hands_overlays += l_hand_image
 
 		if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)

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

@@ -293,8 +293,10 @@ var/global/list/parasites = list() //all currently existing/living guardians
 		if(!l_state)
 			l_state = l_hand.icon_state
 
-		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
+		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.righthand_file, isinhands = TRUE)
 
+		var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+		l_hand_image.transform = reflect
 		hands_overlays += l_hand_image
 
 		if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)

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

@@ -171,7 +171,7 @@ Difficulty: Medium
 	var/range = 10
 	var/turf/previousturf = get_turf(src)
 	for(var/turf/J in getline(src,E))
-		if(!range || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])
+		if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])))
 			break
 		range--
 		PoolOrNew(/obj/effect/hotspot,J)

code/modules/mob/mob_movement.dm

@@ -129,6 +129,8 @@
 		return 0
 	if(isliving(mob))
 		var/mob/living/L = mob
+		if(L.slipping)
+			return 0
 		if(L.incorporeal_move)	//Move though walls
 			Process_Incorpmove(direct)
 			return 0

code/modules/mob/new_player/new_player.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 
 /mob/new_player
 	var/ready = 0