Merge branch 'master' into psb

Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml

@@ -0,0 +1,11 @@
+- type: vendingMachineInventory
+  id: BoxingDrobeInventory
+  startingInventory:
+    UniformShortsRed: 3
+    UniformShortsRedWithTop: 3
+    ClothingHandsGlovesBoxingRed: 2
+    ClothingHandsGlovesBoxingBlue: 2
+    ClothingHandsGlovesBoxingGreen: 2
+    ClothingHandsGlovesBoxingYellow: 2
+  emaggedInventory:
+    UniformJabroni: 2

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

@@ -28,3 +28,24 @@
     radius: 1.5
     energy: 1.6
     color: "#4b93ad"
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineBoxingDrobe
+  name: Boxing Drobe
+  description: Always short on stock.
+  components:
+  - type: VendingMachine
+    pack: BoxingDrobeInventory
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Machines/VendingMachines/boxingdrobe.rsi
+    layers:
+    - state: off
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: normal-unshaded
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: AccessReader
+    access: [["Service"]]

Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/boxingdrobe.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Hyenh#6078",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "normal-unshaded",
+      "delays": [
+        [
+          1.5,
+          0.1,
+          1.5,
+          0.1
+        ]
+      ]
+    }
+  ]
+}