From 6e7c9e1a2a844331ded5dfec3626db781735796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= Date: Sun, 10 Sep 2023 04:27:45 +0500 Subject: [PATCH] + --- code/game/machinery/dance_machine_handled.dm | 11 +++++++++++ code/modules/antagonists/nukeop/nukeop.dm | 2 +- modular_citadel/icons/obj/boombox.dmi | Bin 1882 -> 3158 bytes .../icons/obj/boombox_lefthand.dmi | Bin 0 -> 746 bytes .../icons/obj/boombox_righthand.dmi | Bin 0 -> 751 bytes 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 modular_citadel/icons/obj/boombox_lefthand.dmi create mode 100644 modular_citadel/icons/obj/boombox_righthand.dmi diff --git a/code/game/machinery/dance_machine_handled.dm b/code/game/machinery/dance_machine_handled.dm index 469c429094de..fd481ea727e2 100644 --- a/code/game/machinery/dance_machine_handled.dm +++ b/code/game/machinery/dance_machine_handled.dm @@ -2,6 +2,9 @@ name = "jukebox" desc = "Переносная колонка для крутых." icon = 'modular_citadel/icons/obj/boombox.dmi' + righthand_file = 'modular_citadel/icons/obj/boombox_righthand.dmi' + lefthand_file = 'modular_citadel/icons/obj/boombox_lefthand.dmi' + item_state = "raiqbawks" icon_state = "raiqbawks" verb_say = "states" density = TRUE @@ -14,6 +17,14 @@ var/datum/track/selectedtrack = null var/list/queuedplaylist = list() var/queuecooldown //This var exists solely to prevent accidental repeats of John Mulaney's 'What's New Pussycat?' incident. Intentional, however...... + unique_reskin = list( + "Basic" = list( + RESKIN_ICON_STATE = "raiqbawks" + ), + "Black" = list( + RESKIN_ICON_STATE = "raiqbawks_black" + ), + ) /obj/item/jukebox/emagged name = "jukebox" diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 13f2e30d48a5..24abba65c5e3 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -44,7 +44,7 @@ return if(SSticker.mode.name == "Extended") H.equipOutfit(/datum/outfit/syndicate/lone) - priority_announce("Приветствую, Станция. Мы отправляем к вам Специалиста по Защите Ядерного Диска ввиду того, что заметили недостаточную его безопасность. Bстречайте.", "[title] Фрегат ССО Синдиката") + priority_announce("Приветствую, Станция. Мы отправляем к вам Специалиста по Защите Ядерного Диска ввиду того, что заметили недостаточную его безопасность. Bстречайте.", "Фрегат [title] ССО Синдиката") else H.equipOutfit(nukeop_outfit) diff --git a/modular_citadel/icons/obj/boombox.dmi b/modular_citadel/icons/obj/boombox.dmi index 8ec6976675cf3cae4b8aec71cc297d0eb49634f6..86f51d2fe3362daf2c616cc956aa91f681adcfc3 100644 GIT binary patch delta 3070 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 literal 0 HcmV?d00001