From aea14074cc7822da712ecbe0e1867ade3d49d62e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 4 Dec 2019 01:00:15 +0100
Subject: [PATCH] Make soviet vending machine use cyrillic.

---
 .../Entities/buildings/vending_machines.yml        | 14 ++------------
 Resources/Prototypes/VendingMachines/nazi.yml      |  5 -----
 Resources/Prototypes/VendingMachines/soviet.yml    |  4 ++--
 3 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 Resources/Prototypes/VendingMachines/nazi.yml

diff --git a/Resources/Prototypes/Entities/buildings/vending_machines.yml b/Resources/Prototypes/Entities/buildings/vending_machines.yml
index f7b39f9e61..7d862b6735 100644
--- a/Resources/Prototypes/Entities/buildings/vending_machines.yml
+++ b/Resources/Prototypes/Entities/buildings/vending_machines.yml
@@ -180,16 +180,6 @@
   - type: Icon
     sprite: Buildings/VendingMachines/mining.rsi
 
-- type: entity
-  parent: VendingMachine
-  id: vending_machine_nazi
-  name: Nazivend
-  components:
-  - type: VendingMachine
-    pack: Nazivend
-  - type: Icon
-    sprite: Buildings/VendingMachines/nazi.rsi
-
 - type: entity
   parent: VendingMachine
   id: vending_machine_nutri
@@ -273,10 +263,10 @@
 - type: entity
   parent: VendingMachine
   id: vending_machine_soviet
-  name: KomradeVendtink
+  name: Товарищ-vend
   components:
   - type: VendingMachine
-    pack: KomradeVendtink
+    pack: soviet
   - type: Icon
     sprite: Buildings/VendingMachines/soviet.rsi
 
diff --git a/Resources/Prototypes/VendingMachines/nazi.yml b/Resources/Prototypes/VendingMachines/nazi.yml
deleted file mode 100644
index 64927c71ca..0000000000
--- a/Resources/Prototypes/VendingMachines/nazi.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: vendingMachineInventory
-  id: Nazivend
-  name: Nazivend
-  description: "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorillions lost.\""
-  spriteName: nazi
diff --git a/Resources/Prototypes/VendingMachines/soviet.yml b/Resources/Prototypes/VendingMachines/soviet.yml
index c0151f477c..fa2b9e4656 100644
--- a/Resources/Prototypes/VendingMachines/soviet.yml
+++ b/Resources/Prototypes/VendingMachines/soviet.yml
@@ -1,5 +1,5 @@
 - type: vendingMachineInventory
-  id: KomradeVendtink
-  name: KomradeVendtink
+  id: soviet
+  name: Товарищ-vend
   description: Rodina-mat' zovyot!
   spriteName: soviet