Merge pull request #6834 from Mechoid/RIGFixes

Fix various RIG issues

code/game/objects/items/devices/flash.dm

@@ -78,8 +78,8 @@
 		var/obj/item/rig_module/module = src.loc
 		if(module.holder && module.holder.wearer)
 			var/mob/living/carbon/human/H = module.holder.wearer
-			if(istype(H) && H.back)
-				var/obj/item/weapon/rig/suit = H.back
+			if(istype(H) && H.get_rig())
+				var/obj/item/weapon/rig/suit = H.get_rig()
 				if(istype(suit))
 					return suit.cell
 	return null

code/game/objects/items/weapons/mop_deploy.dm

@@ -1,6 +1,7 @@
 /obj/item/weapon/mop_deploy
 	name = "mop"
 	desc = "Deployable mop."
+	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mop"
 	force = 3
 	anchored = 1    // Never spawned outside of inventory, should be fine.