From 23820ef1fef9eb5dbebb95d46d35bf6b50b0ac85 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Wed, 27 Nov 2024 00:57:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?=
 =?UTF-8?q?=D0=95=D0=BD=D0=B3=D0=B8=20+=20=D0=92=D0=BE=D0=B7=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=20=D0=90=D0=BC=D1=83=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Client/Lobby/LobbyState.cs            |  2 +-
 Content.Client/Lobby/UI/LobbyGui.xaml         |  2 +-
 Content.Client/Lobby/UI/LobbyGui.xaml.cs      |  2 +-
 .../MainMenu/UI/MainMenuControl.xaml          |  2 +-
 .../_White/Rules/RulesWikiSection.xaml        |  2 +-
 .../Silicons/Borgs/SharedBorgSystem.cs        |  6 +--
 .../{ChangelogHonk.yml => ChangelogAmour.yml} | 18 ++++++-
 .../en-US/changelog/changelog-window.ftl      |  2 +-
 .../ru-RU/changelog/changelog-window.ftl      |  2 +-
 .../Inventories/clothesmate.yml               |  4 +-
 .../Prototypes/Entities/Mobs/Species/base.yml |  2 +-
 .../Objects/Specific/Medical/healing.yml      |  4 +-
 .../Weapons/Guns/Battery/battery_guns.yml     |  2 +-
 .../Objects/Weapons/Guns/SMGs/smgs.yml        | 10 ++--
 Resources/Prototypes/GameRules/events.yml     | 32 ++++++-------
 Resources/Prototypes/GameRules/roundstart.yml |  8 ++--
 .../Prototypes/GameRules/unknown_shuttles.yml | 22 ++++-----
 .../Loadouts/Jobs/Civilian/passenger.yml      |  2 +-
 .../Loadouts/Jobs/Security/common.yml         |  2 +-
 .../Prototypes/Loadouts/loadout_groups.yml    |  6 +--
 .../Prototypes/Loadouts/role_loadouts.yml     |  6 +--
 .../Prototypes/Procedural/salvage_rewards.yml |  2 +-
 .../Crafting/Graphs/improvised/gauze.yml      |  4 +-
 .../Prototypes/Recipes/Lathes/medical.yml     |  2 +-
 .../Prototypes/_White/Aspects/Aspects.yml     |  2 +-
 .../_White/JukeboxSongs/LobbySongs.yml        | 48 +++++++++----------
 Resources/Prototypes/game_presets.yml         |  4 +-
 27 files changed, 108 insertions(+), 92 deletions(-)
 rename Resources/Changelog/{ChangelogHonk.yml => ChangelogAmour.yml} (79%)

diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index febe8e6cdb..2adc8ef4f1 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -244,7 +244,7 @@ namespace Content.Client.Lobby
                 _lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
             }
 
-            _lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Honk Station [/font]");
+            _lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Amour [/font]");
             _lobby!.ChangelogLabel.SetMarkup("Список изменений:");
         }
 
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 8f0fcb37ad..25bf89ae94 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -109,7 +109,7 @@
                                 Margin="0 7 0 7" />
 
                             <buttons:OhioLobbyTextButton
-                                Name="ChangelogHonk"
+                                Name="ChangelogAmour"
                                 Access="Public"
                                 ButtonText="Changelog"
                                 Margin="0 7 0 7"
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 91408582bb..483da1d323 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -26,7 +26,7 @@ namespace Content.Client.Lobby.UI
 
             OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
             DiscordButton.OnPressed += _ => _stalinManager.RequestUri();
-            ChangelogHonk.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
+            ChangelogAmour.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
             QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
         }
 
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index 31e89d0127..275c27f1d2 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -7,7 +7,7 @@
 
         <BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="MainMenuBox" MinWidth="300" >
 
-            <Label Name="Title" Text="HONK STATION" Align="Center" />
+            <Label Name="Title" Text="AMOUR" Align="Center" />
 
             <Control MinSize="0 4" />
 
diff --git a/Content.Client/_White/Rules/RulesWikiSection.xaml b/Content.Client/_White/Rules/RulesWikiSection.xaml
index 78abc72d3c..f4cf78c308 100644
--- a/Content.Client/_White/Rules/RulesWikiSection.xaml
+++ b/Content.Client/_White/Rules/RulesWikiSection.xaml
@@ -1,6 +1,6 @@
 <BoxContainer xmlns="https://spacestation14.io"
               Orientation="Vertical" HorizontalExpand="True">
-    <Label Text="Правила сервера Honk Station"
+    <Label Text="Правила сервера Amour"
            StyleClasses="LabelHeading"
            HorizontalExpand="True"
            HorizontalAlignment="Center"/>
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index dac6c22b0e..a459066d85 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -21,8 +21,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
     [Dependency] protected readonly SharedContainerSystem Container = default!;
     [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; //Honk
-    [Dependency] protected readonly IRobustRandom RobustRandom = default!; //Honk
+    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // Amour
+    [Dependency] protected readonly IRobustRandom RobustRandom = default!; // Amour
 
     private HashSet<TTSVoicePrototype> _voices = new();
 
@@ -63,7 +63,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
             .Where(x => x.BorgVoice)
             .ToHashSet();
     }
-    //Honk
+    // Amour
 
     private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)
     {
diff --git a/Resources/Changelog/ChangelogHonk.yml b/Resources/Changelog/ChangelogAmour.yml
similarity index 79%
rename from Resources/Changelog/ChangelogHonk.yml
rename to Resources/Changelog/ChangelogAmour.yml
index fcd66c2ee2..28edc44e8b 100644
--- a/Resources/Changelog/ChangelogHonk.yml
+++ b/Resources/Changelog/ChangelogAmour.yml
@@ -77,7 +77,7 @@
   time: '2024-11-05T18:00:13.0000000+00:00'
 - author: BIG_Zi_348
   changes:
-  - message: "HOTFIX ChangelogHonk"
+  - message: "HOTFIX"
     type: Add
   id: 12
   time: '2024-11-05T18:00:13.0000000+00:00'
@@ -111,3 +111,19 @@
     type: Add
   id: 17
   time: '2024-11-24T18:00:13.0000000+00:00'
+- author: BIG_Zi_348
+  changes:
+  - message: "Добавлен самодельный зеркальный щит и его крафт."
+    type: Add
+  - message: "Добавлен самодельный отражающий жилет и его крафт. Осторожно - он очень хрупкий."
+    type: Add
+  - message: "Добавлен шлем из ведра и его крафт. Обладает повышенной защитой от гарнитурных-воров."
+    type: Add
+  - message: "Одержимый клинок способен помогать в бою."
+    type: Add
+  - message: "Священники были обучены методам сдерживания одержимых клинков."
+    type: Add
+  - message: "Двуручные молоты теперь валят на землю."
+    type: tweak
+  id: 18
+  time: '2024-11-26T18:00:13.0000000+00:00'
diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
index ac5921c853..73d0fd6b9e 100644
--- a/Resources/Locale/en-US/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -13,4 +13,4 @@ changelog-button-new-entries = Changelog (new!)
 changelog-tab-title-Changelog = Changelog
 changelog-tab-title-Admin = Admin
 changelog-tab-title-ChangelogWhite = Giedi Prime
-changelog-tab-title-ChangelogHonk = Honk Station
+changelog-tab-title-ChangelogAmour = Amour
diff --git a/Resources/Locale/ru-RU/changelog/changelog-window.ftl b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
index c0cd050024..0968ba721f 100644
--- a/Resources/Locale/ru-RU/changelog/changelog-window.ftl
+++ b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
@@ -13,4 +13,4 @@ changelog-button-new-entries = Обновления (новые!)
 changelog-tab-title-Changelog = Changelog
 changelog-tab-title-Admin = Admin
 changelog-tab-title-ChangelogWhite = Giedi Prime
-changelog-tab-title-ChangelogHonk = Honk Station
+changelog-tab-title-ChangelogAmour = Amour
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 76605f8d2f..4299602199 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -179,9 +179,9 @@
     ClothingUnderwearSocksStripedThigh: 2
     ClothingUnderwearSocksThinKnee: 1
     ClothingUnderwearSocksThinThigh: 1
-    #honk start
+    # Amour start
     ClothingBalaclava: 5
-    #honk end
+    # Amour end
   emaggedInventory:
     ClothingHandsGlovesCombat: 1
     ClothingMaskGasSyndicate: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 152befe42e..65f70f7285 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -287,7 +287,7 @@
   - type: RoleplayInfo
   - type: Mood # WD
   - type: OfferItem # WD-EDIT
-  - type: Cuntable #Honk Edit
+  - type: Cuntable # Amour Edit
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 98e7be1bdc..8431a7f53b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -33,7 +33,7 @@
       - Biological
     damage:
       groups:
-        Burn: -15 # Honk
+        Burn: -15 # Amour
     healingBeginSound:
       path: "/Audio/Items/Medical/ointment_begin.ogg"
     healingEndSound:
@@ -118,7 +118,7 @@
       - Biological
     damage:
       groups:
-        Brute: -20 # Honk
+        Brute: -20 # Amour
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
     healingEndSound:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index a905ba3277..486d61f7f6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -231,7 +231,7 @@
 - type: entity
   name: laser rifle
   parent: BaseWeaponBattery
-  id: WeaponLaserCarbineOld #HonkFix
+  id: WeaponLaserCarbineOld # Amour Fix
   description: Favoured by Nanotrasen Security for being cheap and easy to use.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index c47f4b1ffc..2080783d44 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -119,8 +119,8 @@
   - type: Item
     sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi
   - type: Gun
-    minAngle: 1 # HONK EDIT FROM 11 TO 1
-    maxAngle: 7 # HONK EDIT FROM 19 TO 7
+    minAngle: 1 # Amour EDIT FROM 11 TO 1
+    maxAngle: 7 # Amour EDIT FROM 19 TO 7
     shotsPerBurst: 5
     availableModes:
     - SemiAuto
@@ -217,9 +217,9 @@
     - type: Item
       sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi
     - type: Gun
-      minAngle: 4 # HONK EDIT FROM 21 TO 4
-      maxAngle: 10 # HONK EDIT FROM 32 TO 10
-      fireRate: 5 # HONK EDIT FROM 6 TO 5
+      minAngle: 4 # Amour EDIT FROM 21 TO 4
+      maxAngle: 10 # Amour EDIT FROM 32 TO 10
+      fireRate: 5 # Amour EDIT FROM 6 TO 5
       selectedMode: FullAuto
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 563d901393..548a60cbe5 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -75,8 +75,8 @@
   - type: StationEvent
     weight: 5
     duration: 1
-    earliestStart: 30 # Honk edit
-    minimumPlayers: 30 # Honk from 10 to 30
+    earliestStart: 30 # Amour edit
+    minimumPlayers: 30 # Amour from 10 to 30
   - type: RandomEntityStorageSpawnRule
     prototype: MobSkeletonCloset
 
@@ -88,9 +88,9 @@
   - type: StationEvent
     weight: 6.5
     duration: 1
-    earliestStart: 60 # Honk from 40 to 60
+    earliestStart: 60Amour from 40 to 60
     reoccurrenceDelay: 20
-    minimumPlayers: 30 # Honk from 20 to 30
+    minimumPlayers: 30 # Amour from 20 to 30
   - type: RandomSpawnRule
     prototype: SpawnPointGhostDragon
 
@@ -116,7 +116,7 @@
     weight: 7.5
     duration: 1
     earliestStart: 45
-    minimumPlayers: 30 # Honk from 20 to 30
+    minimumPlayers: 30 # Amour from 20 to 30
   - type: RandomSpawnRule
     prototype: MobRevenant
 
@@ -182,7 +182,7 @@
     - id: MobMouse2
       prob: 0.02
     - id: MobMouseCancer
-      prob: 0.01 # Honk from 0.001 to 0.01
+      prob: 0.01 # Amour from 0.001 to 0.01
     specialEntries:
     - id: SpawnPointGhostRatKing
       prob: 0.001
@@ -323,7 +323,7 @@
     weight: 4
     duration: 1
     earliestStart: 30
-    minimumPlayers: 30 # Honk from 20 to 30
+    minimumPlayers: 30 # Amour from 20 to 30
   - type: RandomSpawnRule
     prototype: SpawnPointGhostTerminator
 
@@ -353,7 +353,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 30 # Honk from 20 to 30
+    earliestStart: 30 # Amour from 20 to 30
     minimumPlayers: 15
     weight: 3
     duration: 60
@@ -376,7 +376,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 30 # Honk from 20 to 30
+    earliestStart: 30 # Amour from 20 to 30
     minimumPlayers: 15
     weight: 3
     duration: 60
@@ -414,8 +414,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 30 # Honk from 20 to 30
-    minimumPlayers: 30 # Honk from 20 to 30
+    earliestStart: 30 # Amour from 20 to 30
+    minimumPlayers: 30 # Amour from 20 to 30
     weight: 1.5
     duration: 60
   - type: VentCrittersRule
@@ -463,7 +463,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 45 # Honk from 35 to 45
+    earliestStart: 45 # Amour from 35 to 45
     weight: 4.5
     minimumPlayers: 20
     duration: 1
@@ -499,8 +499,8 @@
   - type: StationEvent
     earliestStart: 30
     weight: 8
-    minimumPlayers: 20 # Honk from 15 to 20
-    maxOccurrences: 2 # Honk from 1 to 2
+    minimumPlayers: 20 # Amour from 15 to 20
+    maxOccurrences: 2 # Amour from 1 to 2
     startAnnouncement: station-event-communication-interception
     startAudio:
       path: /Audio/Announcements/intercept.ogg
@@ -545,7 +545,7 @@
     weight: 3.5
     duration: 1
     earliestStart: 30
-    minimumPlayers: 30 # Honk from 20 to 30
+    minimumPlayers: 30 # Amour from 20 to 30
   - type: ImmovableRodRule
     rodPrototypes:
     - id: ImmovableRodKeepTilesStill
@@ -596,7 +596,7 @@
       weight: 5
     - type: MobReplacementRule
 
-# Honk
+# Amour
 - type: entity
   id: SpaceLawChange
   parent: BaseGameRule
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 602b9641c8..79ffab0d84 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -69,7 +69,7 @@
   noSpawn: true
   components:
   - type: GameRule
-    minPlayers: 20 # Honk
+    minPlayers: 20 # Amour
   - type: RandomMetadata #this generates the random operation name cuz it's cool.
     nameSegments:
     - operationPrefix
@@ -226,7 +226,7 @@
   noSpawn: true
   components:
   - type: GameRule
-    minPlayers: 20 # Honk
+    minPlayers: 20 # Amour
     delay:
       min: 600
       max: 900
@@ -274,7 +274,7 @@
   noSpawn: true
   components:
   - type: GameRule
-    minPlayers: 30 # Honk
+    minPlayers: 30 # Amour
   - type: CultRule
   - type: AntagSelection
     definitions:
@@ -301,7 +301,7 @@
   noSpawn: true
   components:
   - type: GameRule
-    minPlayers: 20 # Honk
+    minPlayers: 20 # Amour
   - type: RandomMetadata
   - type: LoadMapRule
     gameMap: WizardShuttle
diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml
index 0399982c57..2686db6f6a 100644
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -8,8 +8,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     weight: 5
-  # reoccurrenceDelay: 30 # HONK EDIT
-    maxOccurrences: 1 # HONK EDIT
+  # reoccurrenceDelay: 30 # Amour EDIT
+    maxOccurrences: 1 # Amour EDIT
     duration: 1
   - type: LoadMapRule
     preloadedGrid: ShuttleCargoLost
@@ -24,8 +24,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     weight: 5
-  # reoccurrenceDelay: 30 # HONK EDIT
-    maxOccurrences: 1 # HONK EDIT
+  # reoccurrenceDelay: 30 # Amour EDIT
+    maxOccurrences: 1 # Amour EDIT
     duration: 1
   - type: LoadMapRule
     preloadedGrid: TravelingCuisine
@@ -40,8 +40,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     weight: 5
-  # reoccurrenceDelay: 30 # HONK EDIT
-    maxOccurrences: 1 # HONK EDIT
+  # reoccurrenceDelay: 30 # Amour EDIT
+    maxOccurrences: 1 # Amour EDIT
     duration: 1
   - type: LoadMapRule
     preloadedGrid: DisasterEvacPod
@@ -56,8 +56,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     weight: 2
-  # reoccurrenceDelay: 30 # HONK EDIT
-    maxOccurrences: 1 # HONK EDIT
+  # reoccurrenceDelay: 30 # Amour EDIT
+    maxOccurrences: 1 # Amour EDIT
     duration: 1
   - type: LoadMapRule
     preloadedGrid: Honki
@@ -72,9 +72,9 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     weight: 2
-  # reoccurrenceDelay: 30 # HONK EDIT
-    maxOccurrences: 1 # HONK EDIT
-    minimumPlayers: 30 # HONK EDIT
+  # reoccurrenceDelay: 30 # Amour EDIT
+    maxOccurrences: 1 # Amour EDIT
+    minimumPlayers: 30 # Amour EDIT
     duration: 1
   - type: LoadMapRule
     preloadedGrid: SyndieEvacPod
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
index 2b642b2627..fe1540e4cd 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -79,7 +79,7 @@
     back: ClothingBackpackDuffelFilled
 
 # Gloves
-- type: itemLoadout #Honk
+- type: itemLoadout # Amour
   id: AssistantHandsGlovesColorYellow
   equipment: AssistantHandsGlovesColorYellow
   effects:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
index 6116d99487..9c75a71cfe 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
@@ -26,7 +26,7 @@
 
 # Mask
 
-- type: itemLoadout # Honk
+- type: itemLoadout # Amour
   id: SecurityMaskBalaclava
   equipment: SecurityMaskBalaclava
 - type: startingGear
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 9308320eb1..a245afbe3a 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -745,7 +745,7 @@
   - GlovesColorBlack
   - GlovesFingerless
 
-- type: loadoutGroup #Honk
+- type: loadoutGroup # Amour
   id: AssistentGloves
   name: loadout-group-gloves
   minLimit: 0
@@ -1642,7 +1642,7 @@
   name: loadout-group-mask
   minLimit: 0
   loadouts:
-  - SecurityMaskBalaclava #Honk
+  - SecurityMaskBalaclava # Amour
   - SecurityMaskStandard
 
 - type: loadoutGroup # WD
@@ -1652,7 +1652,7 @@
   loadouts:
   - SecurityMaskStandard
   - SecurityMaskSwat
-  - SecurityMaskBalaclava #Honk
+  - SecurityMaskBalaclava # Amour
 
 - type: loadoutGroup # WD
   id: CommonSecurityNeck
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 2975cd2c82..890e78fbfb 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -68,7 +68,7 @@
   - AssistantJumpsuit
   - CommonBottom # WD
   - CommonBackpack
-  - AssistentGloves # Honk
+  - AssistentGloves # Amour
   - AssistantOuterClothing
   - CommonShoes # WD
   - AssistantPDA # WD
@@ -616,14 +616,14 @@
   - CommonUnderwearBottom
   - CommonUnderwearBra
   - CommonUnderwearSocks
-  - CommonSecurityMask #honk
+  - CommonSecurityMask # Amour
 
 - type: roleLoadout
   id: JobSecurityCadet
   groups:
   - CommonSecurityHead
   - CommonSecurityHeadsetFull # WD
-  - CommonSecurityMask #honk
+  - CommonSecurityMask # Amour
   - CommonSecurityNeck
   - SecurityCadetJumpsuit
   - CommonBottom # WD
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index f680041740..d76c5ff04d 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -64,7 +64,7 @@
     CrateArmoryLaser: 1.0
     CrateArmoryShotgun: 1.0
     CrateArmoryPistols: 1.0
-    CrateArmoryKLMG: 1.0 # HONK EDIT
+    CrateArmoryKLMG: 1.0 # AMOUR EDIT
     # rare armor
     ClothingOuterArmorRiot: 1.0
     # rare chemicals
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
index a816601b33..7fa7dc7e21 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
@@ -7,7 +7,7 @@
     - to: gauze
       steps:
       - material: Cloth
-        amount: 1 # Honk Edit due to different balance of the item
-        doAfter: 3 # Honk Edit Ahead of everyone
+        amount: 1 # Amour Edit due to different balance of the item
+        doAfter: 3 # Amour Edit Ahead of everyone
   - node: gauze
     entity: Gauze1
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 472532f5fd..484951d574 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -75,7 +75,7 @@
   result: Gauze1
   completetime: 1
   materials:
-    Cloth: 50 # Honk Edit due to different balance of the item
+    Cloth: 50 # Amour Edit due to different balance of the item
 
 - type: latheRecipe
   id: HandheldCrewMonitor
diff --git a/Resources/Prototypes/_White/Aspects/Aspects.yml b/Resources/Prototypes/_White/Aspects/Aspects.yml
index 1ddad845cd..4ceb13774b 100644
--- a/Resources/Prototypes/_White/Aspects/Aspects.yml
+++ b/Resources/Prototypes/_White/Aspects/Aspects.yml
@@ -365,7 +365,7 @@
 #        path: /Audio/White/Aspects/accent.ogg
 #    - type: SkeletonAspect
 
-#Honk Start
+# Amour Start
 - type: entity
   id: DeleteVendingMachineAspect
   parent: BaseGameRule
diff --git a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml
index 91d4b1b897..e69ca79243 100644
--- a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml
+++ b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml
@@ -157,7 +157,7 @@
   path:
     path: /Audio/Ambience/voyage_neverending.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: CosmicTemperance
   name: "Music - Cosmic Temperance"
   path:
@@ -175,139 +175,139 @@
   path:
     path: /Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: AnamnesisoftheworldsSin
   name: "Music - Anamnesis of the world's Sin"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: DarkMatterMoon
   name: "Music - Dark Matter Moon"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: EmptyOcean
   name: "Music - Empty Ocean"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: GoldenWinPiano
   name: "Music - Golden Win Piano"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: KillerXChase
   name: "Music - Killer X Chase"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: PathLootCrusaders
   name: "Music - PathLoot Crusaders"
   path:
     path: /Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: PristintheMirror
   name: "Music - Prist in the Mirror"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: StarJudgment
   name: "Music - Star Judgment"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: WheelofFaith
   name: "Music - Wheel of Faith"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: TheUnknown
   name: "Music - The Unknown"
   path:
     path: /Audio/_Honk/Jukebox/The_Unknown.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: EscapeintheNight
   name: "Music - Escape in the Night"
   path:
     path: /Audio/_Honk/Jukebox/Escape_in_the_Night.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: BossTheme
   name: "Music - Boss Theme"
   path:
     path: /Audio/_Honk/Jukebox/Boss_Theme.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: BattleThemeII
   name: "Music - Battle Theme II"
   path:
     path: /Audio/_Honk/Jukebox/Battle_Theme_II.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: GameOver
   name: "Music - Game_Over..."
   path:
     path: /Audio/_Honk/Jukebox/Game_Over.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: TryAgain
   name: "Music - Try Again?"
   path:
     path: /Audio/_Honk/Jukebox/Try_Again.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: BeastsandBetrayal
   name: "Music - Beasts_and_Betrayal"
   path:
     path: /Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: BattleThemeI
   name: "Music - Battle Theme I"
   path:
     path: /Audio/_Honk/Jukebox/Battle_Theme_I.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: HEAVENSAYSMANDELA
   name: "Music - HEAVEN SAYS MANDELA"
   path:
     path: /Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: CYBERSWORLD
   name: "Music - CYBERS WORLD?"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: BIGSHOT
   name: "Music - BIG SHOT"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: NOWSYOURCHANCETOBEA
   name: "Music - NOWS YOUR CHANCE TO BE A"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: PandoraPalace
   name: "Music - Pandora Palace"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg
 
-- type: jukebox # HONK
+- type: jukebox # Amour
   id: AttackoftheKillerQueen
   name: "Music - Attack of the Killer Queen"
   path:
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index f5873438d7..709135fa5c 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -33,7 +33,7 @@
   - extended
   - shittersafari
   name: extended-title
-  showInVote: true # HONK EDIT
+  showInVote: true # Amour EDIT
   description: extended-description
   rules:
   - BasicStationEventScheduler
@@ -46,7 +46,7 @@
   - greenshift
   - shittersafarideluxeedition
   name: greenshift-title
-  showInVote: true # HONK EDIT
+  showInVote: true # Amour EDIT
   description: greenshift-description
   rules:
   - BasicRoundstartVariation