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

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -146,6 +146,7 @@
 			"You wonder what the creator's mouth was shaped like")]."
 		if(4)
 			name = "statuette"
+			icon = 'icons/obj/xenoarchaeology.dmi'
 			item_type = "statuette"
 			icon_state = "statuette"
 			additional_desc = "It depicts a [pick("small","ferocious","wild","pleasing","hulking")] \
@@ -154,6 +155,8 @@
 			if(prob(25))
 				new_item = new /obj/item/weapon/vampiric(src.loc)
 		if(5)
+			name = "instrument"
+			icon = 'icons/obj/xenoarchaeology.dmi'
 			item_type = "instrument"
 			icon_state = "instrument"
 			if(prob(30))
@@ -256,17 +259,17 @@
 		if(16)
 			apply_prefix = 0
 			if(prob(25))
+				icon = 'icons/obj/xenoarchaeology.dmi'
 				item_type = "smooth green crystal"
 				icon_state = "Green lump"
 			else if(prob(33))
+				icon = 'icons/obj/xenoarchaeology.dmi'
 				item_type = "irregular purple crystal"
 				icon_state = "Phazon"
-			else if(prob(50))
+			else
+				icon = 'icons/obj/xenoarchaeology.dmi'
 				item_type = "rough red crystal"
 				icon_state = "changerock"
-			else
-				item_type = "smooth red crystal"
-				icon_state = "ore"
 			additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
 
 			apply_material_decorations = 0
@@ -285,8 +288,8 @@
 		if(18)
 			new_item = new /obj/item/device/radio/beacon(src.loc)
 			talkative = 0
-			new_item.icon_state = "unknown[rand(1,4)]"
 			new_item.icon = 'icons/obj/xenoarchaeology.dmi'
+			new_item.icon_state = "unknown[rand(1,4)]"
 			new_item.desc = ""
 		if(19)
 			apply_prefix = 0
@@ -339,10 +342,10 @@
 		if(26)
 			//energy gun
 			var/spawn_type = pick(\
-			/obj/item/weapon/gun/energy/laser/practice,\
-			/obj/item/weapon/gun/energy/laser,\
-			/obj/item/weapon/gun/energy/xray,\
-			/obj/item/weapon/gun/energy/laser/captain)
+			/obj/item/weapon/gun/energy/laser/practice/xenoarch,\
+			/obj/item/weapon/gun/energy/laser/xenoarch,\
+			/obj/item/weapon/gun/energy/xray/xenoarch,\
+			/obj/item/weapon/gun/energy/laser/captain/xenoarch)
 			if(spawn_type)
 				var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
 				new_item = new_gun
@@ -451,7 +454,7 @@
 			//robot remains
 			apply_prefix = 0
 			item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]"
-			icon = 'icons/effects/blood.dmi'
+			icon = 'icons/mob/robots.dmi'
 			icon_state = "remainsrobot"
 			additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\
 			"They are barely recognisable as anything other than a pile of waste metals.",\

code/modules/research/xenoarchaeology/finds/finds_eguns.dm

@@ -0,0 +1,25 @@
+//snowflake guns for xenoarch because you can't override the update_icon() proc inside the giant mess that is find creation
+/obj/item/weapon/gun/energy/laser/xenoarch
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	update_icon()
+		return
+
+/obj/item/weapon/gun/energy/laser/practice/xenoarch
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	update_icon()
+		return
+
+/obj/item/weapon/gun/energy/laser/practice/xenoarch
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	update_icon()
+		return
+
+/obj/item/weapon/gun/energy/xray/xenoarch
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	update_icon()
+		return
+
+/obj/item/weapon/gun/energy/laser/captain/xenoarch
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	update_icon()
+		return

code/modules/research/xenoarchaeology/tools/tools_coresampler.dm

@@ -73,7 +73,8 @@
 			//update the sample bag
 			filled_bag.icon_state = "evidence"
 			var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
-			filled_bag.underlays += I
+			filled_bag.overlays += I
+			filled_bag.overlays += "evidence"
 			filled_bag.w_class = 1
 
 			user << "\blue You take a core sample of the [item_to_sample]."