Merge pull request #275 from Xelasto/master

Борги

Resources/Locale/ru-RU/ADT/Tallrobot/tallrobot.ftl

@@ -0,0 +1,8 @@
+ent-ADTTallRobotMekaJani = киборг горничная
+    .desc = { ent-BaseBorgChassisNT.desc }
+ent-ADTTallRobotFMekaJani = { ent-ADTTallRobotMekaJani }
+    .desc = { ent-BaseBorgChassisNT.desc }
+ent-ADTTallRobotFMekaCargo = { ent-BorgChassisMining }
+    .desc = { ent-BaseBorgChassisNT.desc }
+ent-ADTTallRobotFMekaEng = { ent-BorgChassisEngineer }
+    .desc = { ent-BaseBorgChassisNT.desc }

Resources/Prototypes/ADT/Tallrobot/base.yml

@@ -0,0 +1,36 @@
+- type: entity
+  id: ADTTallRobotMekaBase
+  parent: BaseBorgChassisNT
+  suffix: TallRobot
+  abstract: true
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 150
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: BorgChassis
+    maxModules: 6
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2.5
+    baseSprintSpeed : 4.5
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      120: Critical
+      220: Dead
+
+- type: entity
+  id: ADTTallRobotFMekaBase
+  parent: ADTTallRobotMekaBase
+  suffix: TallRobot
+  abstract: true
+  components:
+  - type: Sprite
+    scale: 0.85, 0.85

Resources/Prototypes/ADT/Tallrobot/fmeka/fmekacargo.yml

@@ -0,0 +1,50 @@
+- type: entity
+  id: ADTTallRobotFMekaCargo
+  parent: ADTTallRobotFMekaBase
+  name: cargo cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekacargo.rsi
+    layers:
+    - state: fmekacargo
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekacargoe
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekacargoer
+      shader: unshaded
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleCargo
+    hasMindState: fmekacargoe
+    noMindState: fmekacargoer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekacargo
+      Critical:
+        Base: fmekacargo-wreck
+      Dead:
+        Base: fmekacargo-wreck
+  - type: Construction
+    node: mining
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall

Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaeng.yml

@@ -0,0 +1,50 @@
+- type: entity
+  id: ADTTallRobotFMekaEng
+  parent: ADTTallRobotFMekaBase
+  name: eng cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekaeng.rsi
+    layers:
+    - state: fmekaeng
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekaenge
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekaenger
+      shader: unshaded
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleEngineering
+    hasMindState: fmekaenge
+    noMindState: fmekaenger
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekaeng
+      Critical:
+        Base: fmekaeng-wreck
+      Dead:
+        Base: fmekaeng-wreck
+  - type: Construction
+    node: engineer
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Engineering"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall

Resources/Prototypes/ADT/Tallrobot/fmeka/fmekajani.yml

@@ -0,0 +1,51 @@
+- type: entity
+  id: ADTTallRobotFMekaJani
+  parent: ADTTallRobotFMekaBase
+  name: service cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekajani.rsi
+    layers:
+    - state: fmekajani
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekajanie
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekajanier
+      shader: unshaded
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleService
+      - BorgModuleJanitor
+    hasMindState: fmekajanie
+    noMindState: fmekajanier
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekajani
+      Critical:
+        Base: fmekajani-wreck
+      Dead:
+        Base: fmekajani-wreck
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall

Resources/Prototypes/ADT/Tallrobot/tallrobotjani.yml → Resources/Prototypes/ADT/Tallrobot/meka/mekajani.yml

@@ -1,10 +1,10 @@
 - type: entity
-  id: ADTTallRobotJani
-  parent: BaseBorgChassisNT
+  id: ADTTallRobotMekaJani
+  parent: ADTTallRobotMekaBase
   name: service cyborg
   components:
   - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/tallrobotjani.rsi
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekajani.rsi
     layers:
     - state: mekajani
       map: ["enum.DamageStateVisualLayers.Base"]
@@ -19,19 +19,7 @@
       visible: false
     - state: mekajanirest
       visible: false
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.45
-        density: 150
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
   - type: BorgChassis
-    maxModules: 6
     moduleWhitelist:
       tags:
       - BorgModuleGeneric

Resources/Textures/ADT/Mobs/Silicon/Bots/tallrobot/fmekacargo.rsi/meta.json

@@ -0,0 +1,99 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/bb8d8f968abdddc1dcf86ceda8d47001d531e321",
+  "states": [
+    {
+      "name": "fmekacargo",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "fmekacargo-rest",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "fmekacargoe",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "fmekacargoer",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "fmekacargo-tipped",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "fmekacargo-wreck",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}