Merge PR DeltaV-Station#58 from EndrAnimet

КПК, Скафандр мистагога, шлема сумеречников

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -459,7 +459,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Central Commander
+    jobTitle: Офицер ЦентКома
     jobIcon: JobIconNanotrasen
   - type: Access
     groups:
@@ -477,7 +477,7 @@
     - state: gold
     - state: ert_commander
   - type: IdCard
-    jobTitle: ERT Company Commander
+    jobTitle: Лидер ОБР
   - type: Item
     heldPrefix: gold
 
@@ -491,7 +491,7 @@
     - state: gold
     - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
   - type: IdCard
-    jobTitle: ERT Soul Officer
+    jobTitle: Священник ОБР
   - type: Item
     heldPrefix: blue
 
@@ -505,7 +505,7 @@
     - state: gold
     - state: ert_engineer
   - type: IdCard
-    jobTitle: ERT Field Engineer
+    jobTitle: Инженер ОБР
 
 - type: entity
   parent: ERTChaplainIDCard
@@ -517,7 +517,7 @@
     - state: gold
     - state: ert_janitor
   - type: IdCard
-    jobTitle: ERT Custodian
+    jobTitle: Уборщик ОБР
 
 - type: entity
   parent: ERTChaplainIDCard
@@ -529,7 +529,7 @@
     - state: gold
     - state: ert_medic
   - type: IdCard
-    jobTitle: ERT Medical Doctor
+    jobTitle: Медик ОБР
 
 - type: entity
   parent: ERTChaplainIDCard
@@ -541,7 +541,7 @@
     - state: gold
     - state: ert_security
   - type: IdCard
-    jobTitle: ERT Field Officer
+    jobTitle: Офицер ОБР
 
 - type: entity
   parent: IDCardStandard
@@ -556,7 +556,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Central Commander
+    jobTitle: Офицер ЦентКома
   - type: Access
     tags:
     - Maintenance
@@ -584,7 +584,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Centcom Agent
+    jobTitle: Агент ЦентКома
 
 - type: entity
   name: passenger ID card
@@ -797,7 +797,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Centcom Quarantine Officer
+    jobTitle: Офицер РХБЗЗ
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -4,6 +4,24 @@
   name: mystagogue's hardsuit
   description: Lightweight hardsuit that has a helmet with a galaxy-first psionic passthrough system.
   components:
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.5
+        Radiation: 0.1
+        Caustic: 0.2
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 0.95
+  - type: Sprite
+    sprite: Stray/Clothing/OuterClothing/Hardsuits/mystagogue.rsi
+  - type: Clothing
+    sprite: Stray/Clothing/OuterClothing/Hardsuits/mystagogue.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitMystagogue
 

Resources/Prototypes/SimpleStation14/Entities/Mobs/Species/shadowkin.yml

@@ -154,6 +154,7 @@
   - type: Hands
   - type: Internals
   - type: Inventory
+    speciesId: shadowkin
   - type: InventorySlots
   - type: FloatingVisuals
   - type: Climbing

Resources/Prototypes/Stray/Entities/Objects/Devices/pda.yml

@@ -0,0 +1,35 @@
+- type: entity
+  parent: CentcomPDA
+  id: OSOPDA
+  name: КПК ОСО
+  description: КПК офицера спецопераций.
+  components:
+  - type: Pda
+    id: CentcomIDCardOSO
+
+- type: entity
+  parent: CentcomPDA
+  id: OCCPDA
+  name: КПК Оператора ЦК
+  description: КПК ходячей бюрократии.
+  components:
+  - type: Pda
+    id: CentcomIDCardOCC
+
+- type: entity
+  parent: CentcomPDA
+  id: OffCCPDA
+  name: КПК представителя ЦК
+  description: КПК ходячей бюрократии.
+  components:
+  - type: Pda
+    id: CentcomIDCardOffCC
+
+- type: entity
+  parent: CentcomPDA
+  id: CHCCPDA
+  name: КПК НШЦК
+  description: КПК ходячей бюрократии.
+  components:
+  - type: Pda
+    id: CentcomIDCardCHCC

Resources/Prototypes/Stray/Entities/Objects/Misc/identification_cards.yml

@@ -0,0 +1,51 @@
+- type: entity
+  parent: CentcomIDCard
+  id: CentcomIDCardOSO
+  name: ID карта ОСО
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+  - type: Item
+    heldPrefix: blue
+  - type: IdCard
+    jobTitle: Офицер спецопераций
+
+- type: entity
+  parent: CentcomIDCard
+  id: CentcomIDCardOCC
+  name: ID карта оператора ЦентКома
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+  - type: Item
+    heldPrefix: blue
+  - type: IdCard
+    jobTitle: оператор ЦентКома
+
+- type: entity
+  parent: CentcomIDCard
+  id: CentcomIDCardOffCC
+  name: ID карта представителя ЦентКома
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+  - type: Item
+    heldPrefix: blue
+  - type: IdCard
+    jobTitle: представитель ЦентКома
+
+- type: entity
+  parent: CentcomIDCard
+  id: CentcomIDCardCHCC
+  name: ID карта начальника штаба ЦентКома
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+  - type: Item
+    heldPrefix: blue
+  - type: IdCard
+    jobTitle: Начальник штаба ЦентКома

Resources/Prototypes/Stray/Roles/Jobs/Command/CentralCommander.yml

@@ -7,7 +7,7 @@
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterCoatHoSGreatcoat
     mask: ClothingMaskGasSecurity
-    id: DeathsquadPDA
+    id: OSOPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityWebbing
     pocket1: CombatKnife
@@ -26,7 +26,7 @@
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTCentcomm
     mask: ClothingMaskGasCentcom
-    id: CentcomPDA
+    id: OffCCPDA
     ears: ClothingHeadsetAltCentCom
     belt: WeaponTaser
     pocket1: BoxFolderBlack
@@ -44,7 +44,7 @@
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesHop
     outerClothing: ClothingOuterArmorBasicSlim
-    id: CentcomPDA
+    id: OCCPDA
     ears: ClothingHeadsetAltCentCom
     belt: WeaponPistolN1984
     pocket1: RubberStampCentcom
@@ -60,7 +60,7 @@
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCentcomNaval
     outerClothing: ClothingOuterArmorBasicSlim
-    id: CentcomPDA
+    id: CHCCPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSheathFilled
     pocket1: RubberStampChiefCentComm

Resources/Textures/Stray/Clothing/OuterClothing/Hardsuits/mystagogue.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}