diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 9dd7705d88..b219399753 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -12,6 +12,9 @@
var/obj/item/disk/nuclear/the_disk = null
var/active = 0
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/pinpointer/Destroy()
active = 0
STOP_PROCESSING(SSobj, src)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index c4ce63f83f..fb91e2a028 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -814,13 +814,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
else
return FALSE
-
-// My best guess as to why this is here would be that it does so little. Still, keep it under all the procs, for sanity's sake.
-/obj/item
- icon = 'icons/obj/device.dmi'
- pickup_sound = 'sound/items/pickup/device.ogg'
- drop_sound = 'sound/items/drop/device.ogg'
-
//Worn icon generation for on-mob sprites
/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
//Get the required information about the base icon
diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm
index df6e56d218..aa0ea8aac4 100644
--- a/code/game/objects/items/devices/advnifrepair.dm
+++ b/code/game/objects/items/devices/advnifrepair.dm
@@ -14,7 +14,8 @@
origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5)
var/datum/reagents/supply
var/efficiency = 15 //How many units reagent per 1 unit nanopaste
-
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/nifrepairer/New()
..()
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
index 047bb7712a..b69100c562 100644
--- a/code/game/objects/items/devices/binoculars.dm
+++ b/code/game/objects/items/devices/binoculars.dm
@@ -8,6 +8,8 @@
throwforce = 5.0
throw_range = 15
throw_speed = 3
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
//matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
@@ -23,4 +25,4 @@
/obj/item/binoculars/scope
name = "rifle scope"
desc = "It's a rifle scope. Would be better if it were actually attached to a rifle."
- icon_state = "rifle_scope"
\ No newline at end of file
+ icon_state = "rifle_scope"
diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm
index ab03d7b982..9f91624ae6 100644
--- a/code/game/objects/items/devices/body_snatcher_vr.dm
+++ b/code/game/objects/items/devices/body_snatcher_vr.dm
@@ -9,6 +9,8 @@
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 200)
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2, TECH_ILLEGAL = 1)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/bodysnatcher/New()
..()
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 5d3ec6f594..14cd916ea8 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -16,6 +16,9 @@
var/saved_icon_state = "cigbutt"
var/saved_overlays
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/chameleon/dropped()
disrupt()
..()
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index f08d40d01d..4b493e87f6 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -90,6 +90,8 @@ var/global/list/obj/item/communicator/all_communicators = list()
"spark" = 'sound/effects/sparks4.ogg',
"rad" = 'sound/items/geiger/high1.ogg',
"servo" = 'sound/machines/rig/rigservo.ogg')
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
// Proc: New()
// Parameters: None
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
index c9f4ba3494..7a19a9926f 100644
--- a/code/game/objects/items/devices/debugger.dm
+++ b/code/game/objects/items/devices/debugger.dm
@@ -15,6 +15,8 @@
throw_range = 15
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index d9c4512578..a98f118df3 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -19,6 +19,8 @@
var/obj/item/shockpaddles/linked/paddles
var/obj/item/cell/bcell = null
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/defib_kit/get_cell()
return bcell
diff --git a/code/game/objects/items/devices/e_beacon.dm b/code/game/objects/items/devices/e_beacon.dm
index 6e3e15985d..54fc2ed305 100644
--- a/code/game/objects/items/devices/e_beacon.dm
+++ b/code/game/objects/items/devices/e_beacon.dm
@@ -6,6 +6,8 @@
var/beacon_active = FALSE
var/list/levels_for_distress
var/obj/item/gps/gps = null
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/emergency_beacon/New()
gps = new/obj/item/gps/emergency_beacon(src)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index fa5e7056bf..674c754871 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -33,6 +33,9 @@
var/cell_type = /obj/item/cell/device
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/flash/Initialize()
. = ..()
power_supply = new cell_type(src)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 0d6eae246b..a7d0ec123b 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -33,6 +33,8 @@
var/cell_type = /obj/item/cell/device
var/power_usage = 1
var/power_use = 1
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/flashlight/Initialize()
. = ..()
diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index 7999cc9639..d6a812a410 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/code/game/objects/items/devices/floor_painter.dm
@@ -38,6 +38,8 @@
"northeast" = NORTHEAST,
"precise" = 0
)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params)
if(!proximity)
diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm
index 781550e612..c592bdc9ac 100644
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -13,6 +13,9 @@
var/radiation_count = 0
var/datum/looping_sound/geiger/soundloop
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/geiger/Initialize()
soundloop = new(list(src), FALSE)
return ..()
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 52cddcb22d..c4aa9a2979 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -23,6 +23,8 @@ var/list/GPS_list = list()
var/list/tracking_devices
var/list/showing_tracked_names
var/obj/compass_holder/compass
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/gps/Initialize()
. = ..()
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index 61d9505474..6db9aa6a5a 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -9,6 +9,8 @@
var/list/known_targets
var/list/supported_types
var/datum/tgui_state/default/must_hack/hack_state
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/multitool/hacktool/override
hackspeed = 0.75
diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm
index f0637e85ef..13b309925b 100644
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -9,6 +9,8 @@
throw_speed = 4
throw_range = 10
var/datum/data/record/warrant/active
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
//look at it
/obj/item/holowarrant/examine(mob/user)
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 89ca05a09e..8920545e03 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -18,6 +18,8 @@
var/recharging = 0
var/recharge_locked = 0
var/obj/item/stock_parts/micro_laser/diode //used for upgrading!
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/laser_pointer/red
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 97786a2b82..84181f8312 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -53,6 +53,8 @@
var/bulb_shards = 0
// when we get this many shards, we get a free bulb.
var/shards_required = 4
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/lightreplacer/New()
failmsg = "The [name]'s refill light blinks red."
diff --git a/code/game/objects/items/devices/locker_painter.dm b/code/game/objects/items/devices/locker_painter.dm
index c4af2de572..d3eb23c42e 100644
--- a/code/game/objects/items/devices/locker_painter.dm
+++ b/code/game/objects/items/devices/locker_painter.dm
@@ -69,6 +69,8 @@
/obj/structure/closet/statue,
/obj/structure/closet/walllocker
)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/closet_painter/afterattack(atom/A, var/mob/user, proximity)
if(!proximity)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 570ecd6fca..f652f58f56 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -9,6 +9,8 @@
var/emagged = 0
var/insults = 0
var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TERRORIST!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "GLORY TO ALMACH!")
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/megaphone/proc/can_broadcast(var/mob/living/user)
if(user.client)
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 91e50acc55..21e6c7b02b 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -14,6 +14,8 @@
/obj/item/clothing/head/helmet/space/void,
/obj/item/clothing/suit/space/void
)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/modkit/afterattack(obj/item/O, mob/user as mob, proximity)
if(!proximity)
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index b5a04edb76..b29a434dbe 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -36,6 +36,8 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
var/screen_color = "#00ff0d"
var/last_notify = 0
var/screen_msg
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/paicard/relaymove(var/mob/user, var/direction)
if(user.stat || user.stunned)
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index 5769d5a327..f2591d3cff 100644
--- a/code/game/objects/items/devices/pipe_painter.dm
+++ b/code/game/objects/items/devices/pipe_painter.dm
@@ -5,6 +5,8 @@
icon_state = "labeler1"
var/list/modes
var/mode
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/pipe_painter/New()
..()
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index ff2de7da3d..1bfa370e58 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -24,6 +24,9 @@
var/datum/powernet/PN // Our powernet
var/obj/structure/cable/attached // the attached cable
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/powersink/Destroy()
STOP_PROCESSING(SSobj, src)
STOP_PROCESSING_POWER_OBJECT(src)
diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm
index 9d00ccde62..0847ae66b5 100644
--- a/code/game/objects/items/devices/radio/jammer.dm
+++ b/code/game/objects/items/devices/radio/jammer.dm
@@ -31,6 +31,8 @@ var/global/list/active_radio_jammers = list()
var/tick_cost = 5 //VOREStation Edit - For the ERPs.
origin_tech = list(TECH_ILLEGAL = 7, TECH_BLUESPACE = 5) //Such technology! Subspace jamming!
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/radio_jammer/New()
power_source = new(src)
diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm
index 6fd6a1b98a..1ec74ff105 100644
--- a/code/game/objects/items/devices/scanners/gas.dm
+++ b/code/game/objects/items/devices/scanners/gas.dm
@@ -14,6 +14,9 @@
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/analyzer/atmosanalyze(var/mob/user)
var/air = user.return_air()
if (!air)
diff --git a/code/game/objects/items/devices/scanners/halogen.dm b/code/game/objects/items/devices/scanners/halogen.dm
index 2303c9deee..c0af76eeed 100644
--- a/code/game/objects/items/devices/scanners/halogen.dm
+++ b/code/game/objects/items/devices/scanners/halogen.dm
@@ -8,6 +8,8 @@
throwforce = 0
throw_speed = 3
throw_range = 7
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/halogen_counter/attack(mob/living/M as mob, mob/living/user as mob)
if(!iscarbon(M))
diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm
index 37ba27100e..4300d620a0 100644
--- a/code/game/objects/items/devices/scanners/health.dm
+++ b/code/game/objects/items/devices/scanners/health.dm
@@ -18,6 +18,9 @@
var/showadvscan = 1
var/guide = FALSE
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/healthanalyzer/New()
if(advscan >= 1)
verbs += /obj/item/healthanalyzer/proc/toggle_adv
diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm
index 01d12d73a0..45286f9abf 100644
--- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm
+++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm
@@ -16,6 +16,9 @@
var/details = 0
var/recent_fail = 0
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/mass_spectrometer/New()
..()
var/datum/reagents/R = new/datum/reagents(5)
diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/game/objects/items/devices/scanners/reagents.dm
index 5fe46e6f19..fd20f9f9a9 100644
--- a/code/game/objects/items/devices/scanners/reagents.dm
+++ b/code/game/objects/items/devices/scanners/reagents.dm
@@ -10,6 +10,8 @@
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
var/details = 0
diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm
index daa40d42e1..2a0d725b31 100644
--- a/code/game/objects/items/devices/scanners/sleevemate.dm
+++ b/code/game/objects/items/devices/scanners/sleevemate.dm
@@ -28,6 +28,8 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
// Needs a matching /datum/transcore_db with key defined in code
var/db_key
var/datum/transcore_db/our_db // These persist all round and are never destroyed, just keep a hard ref
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/sleevemate/Initialize()
. = ..()
diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm
index 42d6e955f4..57931f22e0 100644
--- a/code/game/objects/items/devices/scanners/slime.dm
+++ b/code/game/objects/items/devices/scanners/slime.dm
@@ -9,6 +9,8 @@
throw_speed = 3
throw_range = 7
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
if(!istype(M, /mob/living/simple_mob/slime/xenobio))
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 9cb72a86da..1ac550046e 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -17,6 +17,9 @@
var/obj/machinery/camera/bug/camera
var/camtype = /obj/machinery/camera/bug
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/camerabug/New()
..()
// radio = new(src)
@@ -56,6 +59,9 @@
throw_speed = 3
origin_tech = list(TECH_ENGINEERING = 1)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/brokenbug/spy
name = "broken bug"
desc = "" //Even when it's broken it's inconspicuous
@@ -157,6 +163,10 @@
// var/obj/item/radio/bug/radio
var/obj/machinery/camera/bug/selected_camera
var/list/obj/machinery/camera/bug/cameras = new()
+
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/*
/obj/item/bug_monitor/New()
radio = new(src)
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index f38212b9a9..57115dc6de 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -23,6 +23,8 @@
var/max_cooling = 15 // in degrees per second - probably don't need to mess with heat capacity here
var/charge_consumption = 3 // charge per second at max_cooling
var/thermostat = T20C
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
//TODO: make it heat up the surroundings when not in space
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 2e8345da47..50fff1fdd6 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -20,6 +20,9 @@
var/global/list/overlay_cache = list() //cache recent overlays
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/t_scanner/update_icon()
icon_state = "t-ray[on]"
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index a85d9fcec2..00f7a0d2e1 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -18,6 +18,8 @@
throwforce = 2
throw_speed = 4
throw_range = 20
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/taperecorder/New()
..()
diff --git a/code/game/objects/items/devices/ticket_printer.dm b/code/game/objects/items/devices/ticket_printer.dm
index a9c0322840..6965b99a42 100644
--- a/code/game/objects/items/devices/ticket_printer.dm
+++ b/code/game/objects/items/devices/ticket_printer.dm
@@ -6,6 +6,8 @@
slot_flags = SLOT_BELT | SLOT_HOLSTER
var/print_cooldown = 1 MINUTE
var/last_print
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
w_class = ITEMSIZE_SMALL //CHOMP Add because something so small, trivial, and used for silly RP should not be practically gigantic.
/obj/item/ticket_printer/attack_self(mob/user)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 6f416945f5..9c75a312d5 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -29,6 +29,9 @@ effective or pretty fucking useless.
var/times_used = 0 //Number of times it's been used.
var/max_uses = 2
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
if(!user) return
if(times_used >= max_uses)
diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm
index 1bd0a22a52..e356690411 100644
--- a/code/game/objects/items/devices/translator.dm
+++ b/code/game/objects/items/devices/translator.dm
@@ -11,6 +11,8 @@
var/audio = 0 //If you need to hear to get the message
var/listening = 0
var/datum/language/langset
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/universal_translator/attack_self(mob/user)
if(!listening) //Turning ON
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index 02f3ee6292..4078ab3292 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -31,6 +31,9 @@
var/static/radial_set = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_set")
var/static/radial_seton = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_seton")
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/perfect_tele/Initialize()
. = ..()
diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm
index 5f4d7eb265..17f42979a8 100644
--- a/code/game/objects/items/devices/tvcamera.dm
+++ b/code/game/objects/items/devices/tvcamera.dm
@@ -11,6 +11,8 @@
var/obj/item/radio/radio
var/datum/weakref/showing
var/showing_name
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/tvcamera/New()
..()
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index 6d06d0581a..c8be5fb654 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -24,6 +24,8 @@
var/compact_mode = FALSE
icon = 'icons/obj/device.dmi'
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/uplink/Initialize(var/mapload)
. = ..()
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index fba33be170..f989f6110b 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -10,6 +10,9 @@
var/spamcheck = 0
var/insults
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/hailer/verb/set_message()
set name = "Set Hailer Message"
set category = "Object"
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index c802c8a1cc..f83215a6c2 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -16,6 +16,9 @@
var/hud_state = "grenade_he" // TGMC Ammo HUD Port
var/hud_state_empty = "grenade_empty" // TGMC Ammo HUD Port
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/grenade/proc/clown_check(var/mob/living/user)
if((CLUMSY in user.mutations) && prob(50))
to_chat(user, span_warning("Huh? How does this thing work?"))
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 50732ef31d..efd03f37b1 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -13,6 +13,8 @@
var/malfunction = 0
var/initialize_loc = BP_TORSO
var/known_implant = FALSE
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/implant/proc/trigger(emote, source as mob)
return
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 5c3d18ce64..2499b0c570 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -22,6 +22,8 @@
throw_range = 20
origin_tech = list(TECH_MAGNET = 1)
matter = list(MAT_STEEL = 400)
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/locator/attack_self(mob/user as mob)
user.set_machine(src)
diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm
index 6672d5ace9..cfb9b83812 100644
--- a/code/modules/detectivework/tools/scanner.dm
+++ b/code/modules/detectivework/tools/scanner.dm
@@ -13,6 +13,9 @@
var/reveal_blood = TRUE
var/reveal_fibers = FALSE
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
if (!ishuman(M))
to_chat(user, span_warning("\The [M] does not seem to be compatible with this device."))
diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm
index 5977c3c823..6e487d6d96 100644
--- a/code/modules/detectivework/tools/uvlight.dm
+++ b/code/modules/detectivework/tools/uvlight.dm
@@ -16,6 +16,8 @@
var/range = 3
var/on = 0
var/step_alpha = 50
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/uv_light/attack_self(var/mob/user)
on = !on
@@ -67,4 +69,4 @@
var/obj/item/O = A
if(O.was_bloodied && !(O.blood_overlay in O.overlays))
O.add_overlay(O.blood_overlay)
- reset_objects |= O
\ No newline at end of file
+ reset_objects |= O
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index 3d3a044307..584e5b38a0 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -11,6 +11,8 @@
var/transaction_purpose = "Default charge"
var/access_code = 0
var/datum/money_account/linked_account
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/eftpos/Initialize()
. = ..()
diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm
index 367db60346..7b68049841 100644
--- a/code/modules/holomap/mapper.dm
+++ b/code/modules/holomap/mapper.dm
@@ -4,6 +4,7 @@
description_info = "Use the device in your hand to add the mapping HUD to your screen. You can then power it on and change mapping modes.\
The device will show other powered-on mapping units on the map, as well as activated mapping beacons, but only of the same 'type' mapping unit.\
Normal mapping units can only display other normal beacons and mapping units, ERT mapping units can display other ERT, etc."
+ icon = 'icons/obj/device.dmi'
icon_state = "mapping_unit"
item_state = null
w_class = ITEMSIZE_SMALL
@@ -39,6 +40,9 @@
var/list/debug_mappers_list
var/list/debug_beacons_list
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
+
/obj/item/mapping_unit/deathsquad
name = "deathsquad mapping unit"
icon_state = "mapping_unit_ds"
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index b9b26a85f2..fb5ad1e90f 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -28,6 +28,8 @@
item_state = "analyzer"
var/datum/seed/last_seed
var/list/last_reagents
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/analyzer/plant_analyzer/Destroy()
. = ..()
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index 44fea24e73..a50d4e84c2 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -16,6 +16,8 @@
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2)
matter = list(MAT_STEEL = 500, MAT_GLASS = 200)
var/mode = 1;
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
do_scan(M, user)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 39f773a9d1..39618cb9a7 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -28,6 +28,8 @@
var/obj/item/wrapped = null // Item currently being held.
var/force_holder = null //
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/gripper/examine(mob/user)
. = ..()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 91347f41fa..5e4dfd3282 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -387,3 +387,5 @@
icon = 'icons/obj/device.dmi'
icon_state = "tonercartridge"
var/toner_amount = 30
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index cb9b55aa1f..3154e5ea19 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -339,6 +339,8 @@
w_class = ITEMSIZE_SMALL
item_state = "electronic"
slot_flags = SLOT_BELT
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/destTagger/tgui_state(mob/user)
return GLOB.tgui_inventory_state
diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm
index 26cc628d96..d00e86bd8d 100644
--- a/code/modules/xenoarcheaology/sampling.dm
+++ b/code/modules/xenoarcheaology/sampling.dm
@@ -91,6 +91,8 @@
var/sampled_turf = ""
var/num_stored_bags = 10
var/obj/item/evidencebag/filled_bag
+ pickup_sound = 'sound/items/pickup/device.ogg'
+ drop_sound = 'sound/items/drop/device.ogg'
/obj/item/core_sampler/examine(var/mob/user)
. = ..()