Merge branch 'master' into Delta_fix_pack

modular_ss220/devices/code/items/radio.dm

@@ -36,13 +36,13 @@
  *	Radio QoL improvement
  *	So players can Alt+click to enable dynamic and Ctrl+Shift+click to enable speaker
 */
-/obj/item/radio/examine(mob/user)
+/obj/item/radio/headset/examine(mob/user)
 	. = ..()
 	if(in_range(src, user) || loc == user)
 		. += span_info("Alt-click on \the [name] to toggle broadcasting.")
 		. += span_info("Ctrl-Shift-click on \the [src] to toggle speaker.")
 
-/obj/item/radio/AltClick(mob/user)
+/obj/item/radio/headset/AltClick(mob/user)
 	if(!Adjacent(user))
 		return
 	if(!iscarbon(usr) && !isrobot(usr))
@@ -53,7 +53,7 @@
 	broadcasting = !broadcasting
 	to_chat(user, span_notice("You toggle broadcasting [broadcasting ? "on" : "off"]."))
 
-/obj/item/radio/CtrlShiftClick(mob/user)
+/obj/item/radio/headset/CtrlShiftClick(mob/user)
 	if(!Adjacent(user))
 		return
 	if(!iscarbon(usr) && !isrobot(usr))

modular_ss220/modular_ss220.dme

@@ -63,7 +63,6 @@
 #include "logs/_logs.dme"
 #include "mobs/_mobs.dme"
 #include "pixel_shift/_pixel_shift.dme"
-#include "radio_sound/radio_sound.dme"
 #include "screentip_change/_screentip_change.dme"
 #include "smart_equip_targeted/_smart_equip_targeted.dme"
 #include "sm_space_drop/sm_space_drop.dme"