Merge pull request #8 from 778b/vends

Vends

Resources/Prototypes/TS/Catalog/VendingMachines/Inventories/CombatVending.yml

@@ -0,0 +1,37 @@
+- type: vendingMachineInventory
+  id: MarineEngineerInventory
+  startingInventory:
+    GeigerCounter: 3
+    ClothingEyesGlassesMeson: 3
+    ClothingHandsGlovesColorYellow: 3
+    ClothingBeltChiefEngineerFilled: 3
+    CableApcStack: 3
+    CableMVStack: 3
+    CableHVStack: 3
+
+- type: vendingMachineInventory
+  id: MarineMedicInventory
+  startingInventory:
+    PillCanister: 9
+    Syringe: 9
+    ClothingEyesHudMedical: 3
+    HandheldHealthAnalyzer: 3
+    ClothingHandsGlovesLatex: 3
+    ClothingBeltMedicalFilled: 3
+    MedkitRadiationFilled: 3
+    MedkitAdvancedFilled: 3
+    MedkitOxygenFilled: 3
+    MedkitBurnFilled: 3
+    MedkitToxinFilled: 3
+    MedkitBruteFilled: 3
+
+- type: vendingMachineInventory
+  id: MarineDrobeInventory
+  startingInventory:
+    ClothingBackpackMarine: 5
+    ClothingUniformJumpsuitOperative: 5
+    ClothingShoesBootsCombat: 5
+    ClothingHandsGlovesCombat: 5
+    ClothingBeltMilitaryWebbing: 5
+    CombatKnife: 5
+    FlashlightSeclite: 5

Resources/Prototypes/TS/Entities/Clothing/Back/backpacks.yml

@@ -0,0 +1,8 @@
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackMarine
+  name: marine backpack
+  description: A backpack specially designed to repel stains and hazardous liquids.
+  components:
+  - type: Sprite
+    sprite: TS/Clothing/Back/Backpacks/marine.rsi

Resources/Prototypes/TS/Entities/Structures/ts_vending_machines.yml

@@ -0,0 +1,86 @@
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineMarineEng
+  name: BattleEnginner
+  description: 
+  components:
+  - type: VendingMachine
+    pack: MarineEngineerInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: TS/Structures/Machines/VendingMachines/battle_engineer.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1
+    energy: 1.3
+    color: "#ffb0b0"
+  - type: AccessReader
+    access: [["Engineering"],["Security"]]
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineMarineMed
+  name: BattleMedic
+  description: 
+  components:
+  - type: VendingMachine
+    pack: MarineMedicInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: TS/Structures/Machines/VendingMachines/battle_medic.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1
+    energy: 1.3
+    color: "#ffb0b0"
+  - type: AccessReader
+    access: [["Medical"],["Security"]]
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineMarineDrobe
+  name: MarineDrobe
+  description: 
+  components:
+  - type: VendingMachine
+    pack: MarineDrobeInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: TS/Structures/Machines/VendingMachines/marine_drobe.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1
+    energy: 1.3
+    color: "#ffb0b0"
+  - type: AccessReader
+    access: [["Security"]]

Resources/Prototypes/TS/Roles/Combat/marine_medic.yml

@@ -19,6 +19,7 @@
   - Maintenance
   - Service
   - External
+  - Medical
   - Chemistry
   special:
   - !type:AddImplantSpecial

Resources/Textures/TS/Structures/Machines/VendingMachines/expidition.rsi/meta.json → Resources/Textures/TS/Structures/Machines/VendingMachines/battle_engineer.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by github.com/starfort-station/station-14",
+    "copyright": "Created by 778b for https://github.com/FFATroop/TroopStation14",
     "size": {
       "x": 32,
       "y": 32

Resources/Textures/TS/Structures/Machines/VendingMachines/battle_medic.rsi/meta.json

@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by 778b for https://github.com/FFATroop/TroopStation14",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "normal-unshaded",
+        "delays": [
+          [
+            4.7,
+            0.1
+          ]
+        ]
+      },
+      {
+        "name": "deny-unshaded",
+        "delays": [
+          [
+            0.13,
+            0.13
+          ]
+        ]
+      },
+      {
+        "name": "off"
+      },
+      {
+        "name": "broken"
+      },
+      {
+        "name": "panel"
+      }
+    ]
+  }