Removes vending inventory desc and adds missing vending machine descriptions (#4493)

* Removes inventory descriptions

* Adds missing vending machine descriptions using inventory descriptions

* Woops missed a file

Content.Server/VendingMachines/VendingMachineComponent.cs

@@ -29,7 +29,7 @@ namespace Content.Server.VendingMachines
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
-    public class VendingMachineComponent : SharedVendingMachineComponent, IActivate, IExamine, IBreakAct, IWires
+    public class VendingMachineComponent : SharedVendingMachineComponent, IActivate, IBreakAct, IWires
     {
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -38,7 +38,6 @@ namespace Content.Server.VendingMachines
         private TimeSpan _animationDuration = TimeSpan.Zero;
         [DataField("pack")]
         private string _packPrototypeId = string.Empty;
-        private string? _description;
         private string _spriteName = "";
 
         private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered;
@@ -81,7 +80,6 @@ namespace Content.Server.VendingMachines
             }
 
             Owner.Name = packPrototype.Name;
-            _description = packPrototype.Description;
             _animationDuration = TimeSpan.FromSeconds(packPrototype.AnimationDuration);
             _spriteName = packPrototype.SpriteName;
             if (!string.IsNullOrEmpty(_spriteName))
@@ -162,12 +160,6 @@ namespace Content.Server.VendingMachines
             }
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
-        {
-            if(_description == null) { return; }
-            message.AddText(_description);
-        }
-
         private void TryEject(string id)
         {
             if (_ejecting || _broken)

Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -17,9 +17,6 @@ namespace Content.Shared.VendingMachines
         [DataField("name")]
         public string Name { get; } = string.Empty;
 
-        [DataField("description")]
-        public string Description { get; } = string.Empty;
-
         [DataField("animationDuration")]
         public double AnimationDuration { get; }
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: AmmoVendInventory
   name: Ammovend
-  description: A generic ammunition vending machine.
   spriteName: ammo
   startingInventory:
     BoxClRifleBox: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: BarDrobe
   name: BarDrobe
-  description: A stylish vendor to dispense the most stylish bar clothing!
   spriteName: bardrobe
   startingInventory:
     ClothingHeadHatTophat : 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: BoozeOMatInventory
   name: Booze-O-Mat
-  description: A vending machine containing multiple drinks for bartending.
   spriteName: boozeomat
   startingInventory:
     DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze.

Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml

@@ -1,5 +1,4 @@
 - type: vendingMachineInventory
   id: PTechInventory
   name: PTech
-  description: "PTech vending! Providing a ROBUST selection of PDA cartridges."
   spriteName: cart

Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: PietyVendInventory
   name: PietyVend
-  description: "A vending machine containing religious supplies and clothing. A label reads: \"A holy vendor for a pious man.\""
   spriteName: chapel
   startingInventory:
     ClothingOuterHoodieChaplain: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: CigaretteMachineInventory
   name: Cigarette machine
-  description: A vending machine containing smoking supplies.
   animationDuration: 2.1
   spriteName: cigs
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: HotDrinksMachineInventory
   name: Hot drinks machine
-  description: "Served boiling so it stays hot all shift!"
   animationDuration: 3.4
   spriteName: coffee
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: RobustSoftdrinksInventory
   name: Robust Softdrinks
-  description: A softdrink vendor provided by Robust Industries, LLC.
   animationDuration: 1.1
   spriteName: cola
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: DinnerwareInventory
   name: Dinnerware
-  description: A vending machine containing kitchen and restaurant equipment.
   spriteName: dinnerware
   startingInventory:
     ButchCleaver: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: DiscountDansInventory
   name: Discount Dan's
-  description: A vending machine containing discount snacks from the infamous 'Discount Dan' franchise.
   spriteName: discount
   startingInventory:
     FoodSnackCheesie: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/empty.yml

@@ -1,5 +1,4 @@
 - type: vendingMachineInventory
   id: EmptyVendingMachineInventory
   name: Empty vending machine
-  description: Just add capitalism!
   spriteName: empty

Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: EngiVendInventory
   name: Engi-Vend
-  description: Spare tool vending. What? Did you expect some witty description?
   animationDuration: 2.1
   spriteName: engivend
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: MagiVendInventory
   name: MagiVend
-  description: A mystical vending machine containing magical garments and magic supplies.
   animationDuration: 1.5
   spriteName: magivend
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: NanoMedPlusInventory
   name: NanoMed Plus
-  description: "It's a medical drug dispenser. Natural chemicals only!"
   animationDuration: 1.8
   spriteName: medical
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: DwarvenMiningEquipmentInventory
   name: Dwarven Mining Equipment
-  description: Get your mining equipment here, and above all keep digging!
   spriteName: mining
   startingInventory:
     Pickaxe: 4

Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: NutriMaxInventory
   name: NutriMax
-  description: A vending machine containing nutritional substances for plants and botanical tools.
   spriteName: nutri
   startingInventory:
     HydroponicsToolSpade: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: RobotechDeluxeInventory
   name: Robotech Deluxe
-  description: All the fine parts you need in one vending machine!
   spriteName: robotics
   startingInventory:
     #TO DO: add missing prototypes

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: SecTechInventory
   name: SecTech
-  description: "A vending machine containing Security equipment. A label reads \"SECURITY PERSONNEL ONLY\"."
   animationDuration: 2.8
   spriteName: sec
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: MegaSeedServitorInventory
   name: MegaSeed Servitor
-  description: For when you need seeds fast. Hands down the best seed selection on the station!
   animationDuration: 1.3
   spriteName: seeds
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/smartfridge.yml

@@ -1,5 +1,4 @@
 - type: vendingMachineInventory
   id: SmartFridgeInventory
   name: SmartFridge
-  description: A refrigerated storage unit for storing medicine and chemicals.
   spriteName: smartfridge

Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: GetmoreChocolateCorpInventory
   name: Getmore Chocolate Corp
-  description: A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars.
   animationDuration: 0.5
   spriteName: snack
   startingInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: BodaInventory
   name: BODA
-  description: An old vending machine containing sweet water.
   spriteName: sovietsoda
   startingInventory:
     DrinkColaCan: 10 #typically hacked product. Default product is "soda"

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: AutoDrobeInventory
   name: AutoDrobe
-  description: A vending machine containing costumes.
   spriteName: theater
   startingInventory:
     ClothingMaskJoy: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml

@@ -1,5 +1,4 @@
 - type: vendingMachineInventory
   id: VendomatInventory
   name: Vendomat
-  description: "Only the finest robust equipment in space!"
   spriteName: vendomat

Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: NanoMedInventory
   name: NanoMed
-  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
   spriteName: wallmed
   startingInventory:
     Brutepack: 5

Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml

@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: YouToolInventory
   name: YouTool
-  description: "A vending machine containing standard tools. A label reads: \"Tools for tools.\""
   animationDuration: 1.1
   spriteName: youtool
   startingInventory:

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -1,8 +1,8 @@
-# Vending machine descriptions are stored in vendingMachineInventory YAML files.
 - type: entity
   id: VendingMachine
   parent: BaseMachinePowered
   name: vending machine
+  description: Just add capitalism!
   abstract: true
   components:
   - type: Sprite
@@ -132,7 +132,7 @@
   parent: VendingMachine
   id: VendingMachineCart
   name: PTech
-  description: Cartridges for PDAs.
+  description: PTech vending! Providing a ROBUST selection of PDA cartridges.
   components:
   - type: VendingMachine
     pack: PTechInventory
@@ -218,7 +218,7 @@
   parent: VendingMachine
   id: VendingMachineCoffee
   name: Solar's Best Hot Drinks
-  description: A vending machine which dispenses hot drinks.
+  description: Served boiling so it stays hot all shift!
   components:
   - type: VendingMachine
     pack: HotDrinksMachineInventory
@@ -312,6 +312,7 @@
   parent: VendingMachine
   id: VendingMachineDiscount
   name: Discount Dan's
+  description: A vending machine containing discount snacks from the infamous 'Discount Dan' franchise.
   components:
   - type: VendingMachine
     pack: DiscountDansInventory
@@ -368,7 +369,7 @@
   parent: VendingMachine
   id: VendingMachineMedical
   name: NanoMed Plus
-  description: Medical drug dispenser.
+  description: It's a medical drug dispenser. Natural chemicals only!
   components:
   - type: VendingMachine
     pack: NanoMedPlusInventory
@@ -399,7 +400,7 @@
   parent: VendingMachine
   id: VendingMachineNutri
   name: NutriMax
-  description: A plant nutrients vendor.
+  description: A vending machine containing nutritional substances for plants and botanical tools.
   components:
   - type: VendingMachine
     pack: NutriMaxInventory
@@ -430,6 +431,7 @@
   parent: VendingMachine
   id: VendingMachineSec
   name: SecTech
+  description: A vending machine containing Security equipment. A label reads SECURITY PERSONNEL ONLY.
   components:
   - type: VendingMachine
     pack: SecTechInventory
@@ -459,6 +461,7 @@
   parent: VendingMachine
   id: VendingMachineSeeds
   name: MegaSeed Servitor
+  description: For when you need seeds fast. Hands down the best seed selection on the station!
   components:
   - type: VendingMachine
     pack: MegaSeedServitorInventory
@@ -488,6 +491,7 @@
   parent: VendingMachine
   id: VendingMachineSmartFridge
   name: SmartFridge
+  description: A refrigerated storage unit for storing medicine and chemicals.
   components:
   - type: VendingMachine
     pack: SmartFridgeInventory
@@ -515,6 +519,7 @@
   parent: VendingMachine
   id: VendingMachineSnack
   name: Getmore Chocolate Corp
+  description: A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars.
   components:
   - type: VendingMachine
     pack: GetmoreChocolateCorpInventory
@@ -544,6 +549,7 @@
   parent: VendingMachine
   id: VendingMachineSovietSoda
   name: BODA
+  description: An old vending machine containing sweet water.
   components:
   - type: VendingMachine
     pack: BodaInventory
@@ -573,6 +579,7 @@
   parent: VendingMachine
   id: VendingMachineTheater
   name: AutoDrobe
+  description: A vending machine containing costumes.
   components:
   - type: VendingMachine
     pack: AutoDrobeInventory
@@ -606,6 +613,7 @@
   parent: VendingMachine
   id: VendingMachineVendomat
   name: Vendomat
+  description: Only the finest robust equipment in space!
   components:
   - type: VendingMachine
     pack: VendomatInventory
@@ -636,6 +644,7 @@
   parent: VendingMachine
   id: VendingMachineWallMedical
   name: NanoMed
+  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
   components:
   - type: VendingMachine
     pack: NanoMedInventory
@@ -663,6 +672,7 @@
   parent: VendingMachine
   id: VendingMachineYouTool
   name: YouTool
+  description: "A vending machine containing standard tools. A label reads: Tools for tools."
   components:
   - type: VendingMachine
     pack: YouToolInventory