Skip to content

Commit

Permalink
+
Browse files Browse the repository at this point in the history
  • Loading branch information
SmiLeYre committed Sep 9, 2023
1 parent 0aac456 commit 6e7c9e1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions code/game/machinery/dance_machine_handled.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/nukeop/nukeop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Binary file modified modular_citadel/icons/obj/boombox.dmi
Binary file not shown.
Binary file added modular_citadel/icons/obj/boombox_lefthand.dmi
Binary file not shown.
Binary file added modular_citadel/icons/obj/boombox_righthand.dmi
Binary file not shown.

0 comments on commit 6e7c9e1

Please sign in to comment.