Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

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

@@ -337,8 +337,12 @@
 					m_type = 2
 
 		if ("deathgasp")
-			message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
-			m_type = 1
+			if (species.name == "Machine")
+				message = "<B>[src]</B> gives one shrill beep before falling limp, screen quickly flashing blue before shutting off entirely."
+				m_type = 1
+			else
+				message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
+				m_type = 1
 
 		if ("giggle")
 			if(miming)

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

@@ -1135,7 +1135,7 @@ var/list/robot_verbs_default = list(
 					S.dirt = 0
 				for(var/A in tile)
 					if(istype(A, /obj/effect))
-						if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
+						if(is_cleanable(A))
 							qdel(A)
 					else if(istype(A, /obj/item))
 						var/obj/item/cleaned_item = A