Merge branch 'master' into upstream-merge-37476

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

@@ -1,4 +1,4 @@
-/obj/item/device/sensor_device
+/obj/item/sensor_device
 	name = "handheld crew monitor" //Thanks to Gun Hog for the name!
 	desc = "A miniature machine that tracks suit sensors across the station."
 	icon = 'icons/obj/device.dmi'
@@ -6,5 +6,5 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
 
-/obj/item/device/sensor_device/attack_self(mob/user)
+/obj/item/sensor_device/attack_self(mob/user)
 	GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it