From 3642f61deea3ef3068e9de168012a28b5e83a9ee Mon Sep 17 00:00:00 2001
From: Eugeny <klochckov.wot@yandex.ru>
Date: Sat, 9 Mar 2024 01:21:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=B0=D1=81=D1=81=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B8=20=D0=B4=D0=B5=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Locale/ru-RU/ADT/boombox/boombox.ftl              | 6 ++++++
 .../Prototypes/ADT/Entities/Objects/Device/boombox.yml      | 1 +
 .../Entities/Markers/Spawners/Random/maintenance.yml        | 1 -
 .../Prototypes/Entities/Markers/Spawners/Random/salvage.yml | 2 --
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/ru-RU/ADT/boombox/boombox.ftl b/Resources/Locale/ru-RU/ADT/boombox/boombox.ftl
index b7cf28334bb..6a5cf8dc576 100644
--- a/Resources/Locale/ru-RU/ADT/boombox/boombox.ftl
+++ b/Resources/Locale/ru-RU/ADT/boombox/boombox.ftl
@@ -99,3 +99,9 @@ ent-BoomBoxTapeWaterfallPacked = запакованная кассета "Waterf
 
 ent-BoomBoxTapeGasterPacked = запакованная кассета
     .desc = Плотно упакованная кассета для бумбокса.
+
+ent-ADTBoomBoxTapeBorat = "Борат"
+    .desc = Старая кассета с музыкой из несмешного фильма. Если захотите побесить или развеселить космических кочевников.
+
+ent-ADTBoomBoxTapeBarotrauma = кассета "Wartrauma"
+    .desc = Музыка для аванпостов со скидками на боеприпасы и для подготовки к бою.
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml
index cee1b7fa852..88ac1895f8d 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml
@@ -153,6 +153,7 @@
 - type: entity
   parent: BaseBoomBoxTape
   id: BoomBoxTapeNATO
+  nospawn: true
   name: NATO
   description: Desc thing.
   components:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index bf963da471d..4adbd76cf2e 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -163,7 +163,6 @@
         - BoomBoxTapeTEOTEPacked
         - BoomBoxTapeTearsOfVeilPacked
         - BoomBoxTapeRunningOutPacked
-        - BoomBoxTapeNATOPacked
         - BoomBoxTapeHopesAndDreamsPacked
         - BoomBoxTapeNewOldHomePacked
         - BoomBoxTapeOnceUponATimePacked
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index f1404f2605b..1c563e0a30b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -38,7 +38,6 @@
         - BoomBoxTapeTEOTEPacked
         - BoomBoxTapeTearsOfVeilPacked
         - BoomBoxTapeRunningOutPacked
-        - BoomBoxTapeNATOPacked
         - BoomBoxTapeHopesAndDreamsPacked
         - BoomBoxTapeNewOldHomePacked
         - BoomBoxTapeOnceUponATimePacked
@@ -91,7 +90,6 @@
       - BoomBoxTapeTEOTEPacked
       - BoomBoxTapeTearsOfVeilPacked
       - BoomBoxTapeRunningOutPacked
-      - BoomBoxTapeNATOPacked
       - BoomBoxTapeHopesAndDreamsPacked
       - BoomBoxTapeNewOldHomePacked
       - BoomBoxTapeOnceUponATimePacked