diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index efff391c539..c59c500ada4 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -3,12 +3,10 @@ desc = "Pretend to be a director for a brief moment before someone tackles you to make you shut up." desc_fluff = "Annoy your colleagues! Scare interns! Impress no one!" desc_info = "A device used to project your voice. Loudly." - item_icons = list( - slot_l_hand_str = 'icons/mob/items/device/lefthand_megaphone.dmi', - slot_r_hand_str = 'icons/mob/items/device/righthand_megaphone.dmi', - ) + icon = 'icons/obj/contained_items/tools/megaphone.dmi' icon_state = "megaphone" item_state = "megaphone" + contained_sprite = TRUE w_class = ITEMSIZE_SMALL flags = CONDUCT diff --git a/html/changelogs/geeves-megaphone_fix.yml b/html/changelogs/geeves-megaphone_fix.yml new file mode 100644 index 00000000000..ba1de09c72f --- /dev/null +++ b/html/changelogs/geeves-megaphone_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed megaphones having the wrong handedness." \ No newline at end of file diff --git a/icons/mob/items/device/lefthand_megaphone.dmi b/icons/mob/items/device/lefthand_megaphone.dmi deleted file mode 100644 index a5f67c05510..00000000000 Binary files a/icons/mob/items/device/lefthand_megaphone.dmi and /dev/null differ diff --git a/icons/mob/items/device/righthand_megaphone.dmi b/icons/mob/items/device/righthand_megaphone.dmi deleted file mode 100644 index c7a5b141b9c..00000000000 Binary files a/icons/mob/items/device/righthand_megaphone.dmi and /dev/null differ diff --git a/icons/obj/contained_items/tools/megaphone.dmi b/icons/obj/contained_items/tools/megaphone.dmi new file mode 100644 index 00000000000..11dde68e8b8 Binary files /dev/null and b/icons/obj/contained_items/tools/megaphone.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 7117d21725d..a8b889111fd 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ