Merge remote-tracking branch 'upstream/master' into tg-weather

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

@@ -648,7 +648,7 @@
 			newSnack.name = "Synthetic [newSnack.name]"
 			custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as they vomit [newSnack] from their mouth!")
 	catch(var/exception/e)
-		log_to_dd("Cooking error: [e] in [e.file]:[e.line]")
+		log_runtime(e, src, "Caught in SNPC cooking module")
 	doing &= ~SNPC_SPECIAL
 // END COOKING MODULE
 

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

@@ -1269,13 +1269,17 @@ var/global/list/damage_icon_parts = list()
 	if(wear_suit)
 		if(wear_suit.icon_override)
 			var/icon_path = "[wear_suit.icon_override]"
-			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
-			var/icon/icon_file = new(icon_path)
+			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty).
+			var/icon/icon_file
+			if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime.
+				icon_file = new(icon_path)
 			standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
 		else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
 			var/icon_path = "[wear_suit.sprite_sheets[species.name]]"
-			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
-			var/icon/icon_file = new(icon_path)
+			icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty).
+			var/icon/icon_file
+			if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime.
+				icon_file = new(icon_path)
 			standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
 		else
 			if(wear_suit.icon_state in C.IconStates())

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

@@ -815,7 +815,8 @@ var/list/ai_verbs_default = list(
 		"default",
 		"floating face",
 		"xeno queen",
-		"eldritch"
+		"eldritch",
+		"ancient machine"
 		)
 		input = input("Please select a hologram:") as null|anything in icon_list
 		if(input)
@@ -829,6 +830,8 @@ var/list/ai_verbs_default = list(
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo3"))
 				if("eldritch")
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo4"))
+				if("ancient machine")
+					holo_icon = getHologramIcon(icon('icons/mob/ancient_machine.dmi', "ancient_machine"))
 	return
 
 /mob/living/silicon/ai/proc/corereturn()
@@ -1040,4 +1043,4 @@ var/list/ai_verbs_default = list(
 
 	eyeobj.setLoc(get_turf(C))
 	client.eye = eyeobj
-	return 1
+	return 1

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

@@ -303,7 +303,7 @@
 
 
 /mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes)
-	if (!yes || ( \
+	if(!yes || ( \
 	 !istype(AM,/obj/machinery/door) && \
 	 !istype(AM,/obj/machinery/recharge_station) && \
 	 !istype(AM,/obj/machinery/disposal/deliveryChute) && \

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

@@ -315,7 +315,7 @@ var/list/robot_verbs_default = list(
 			if(camera && "Robots" in camera.network)
 				camera.network.Add("Medical")
 			module_sprites["Basic"] = "Medbot"
-			module_sprites["Standard"] = "surgeon"
+			module_sprites["Surgeon"] = "surgeon"
 			module_sprites["Advanced Droid"] = "droid-medical"
 			module_sprites["Needles"] = "medicalrobot"
 			module_sprites["Standard"] = "robotMedi"
@@ -1486,4 +1486,4 @@ var/list/robot_verbs_default = list(
 		if(1)
 			disable_component("comms", 160)
 		if(2)
-			disable_component("comms", 60)
+			disable_component("comms", 60)

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

@@ -164,7 +164,7 @@
 					if(!item_to_add)
 						usr.visible_message("[usr] pets [src].","<span class='notice'>You rest your hand on [src]'s back for a moment.</span>")
 						return
-					if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
+					if(istype(item_to_add,/obj/item/weapon/grenade/plastic/c4)) // last thing he ever wears, I guess
 						item_to_add.afterattack(src,usr,1)
 						return
 
@@ -208,7 +208,7 @@
 //Many  hats added, Some will probably be removed, just want to see which ones are popular.
 /mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, var/mob/user as mob)
 
-	if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
+	if(istype(item_to_add,/obj/item/weapon/grenade/plastic/c4)) // last thing he ever wears, I guess
 		item_to_add.afterattack(src,user,1)
 		return
 

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

@@ -135,6 +135,7 @@
 	var/alerted = 0
 	var/ore_eaten = 1
 	var/chase_time = 100
+	var/will_burrow = 1
 
 /mob/living/simple_animal/hostile/asteroid/goldgrub/New()
 	..()
@@ -170,7 +171,7 @@
 	visible_message("<span class='notice'>The ore was swallowed whole!</span>")
 
 /mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
-	if(!alerted)
+	if(!alerted && will_burrow)
 		alerted = 1
 		spawn(chase_time)
 		if(alerted)