Merge remote-tracking branch 'upstream/master' into to_chat

Conflicts:
	code/modules/research/xenobiology/xenobiology.dm

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -40,6 +40,7 @@
 	var/obj/effect/blob/factory/factory = null
 	var/list/human_overlays = list()
 	var/is_zombie = 0
+	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
 
 /mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	..()
@@ -160,6 +161,7 @@
 	maxbodytemp = 360
 	force_threshold = 10
 	environment_smash = 3
+	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
 
 
 /mob/living/simple_animal/hostile/blob/blobbernaut/blob_act()

code/game/machinery/telecomms/logbrowser.dm

@@ -90,9 +90,12 @@
 							race = "Artificial Life"
 
 						else if(isslime(M)) // NT knows a lot about slimes, but not aliens. Can identify slimes
-							race = "slime"
+							race = "Slime"
 							language = race
 
+						else if(isbot(M))
+							race = "Bot"
+
 						else if(isanimal(M))
 							race = "Domestic Animal"
 							language = race

code/game/machinery/vending.dm

@@ -1252,7 +1252,7 @@
 	vend_delay = 15
 	icon_state = "artvend"
 	products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/device/camera = 4,/obj/item/device/camera_film = 6,
-	/obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/packageWrap = 4,
+	/obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/tape_roll = 5,/obj/item/stack/packageWrap = 4,
 	/obj/item/weapon/storage/fancy/crayons = 4,/obj/item/weapon/hand_labeler = 4,/obj/item/weapon/paper = 10,
 	/obj/item/weapon/c_tube = 10,/obj/item/weapon/pen = 5,/obj/item/weapon/pen/blue = 5,
 	/obj/item/weapon/pen/red = 5)