Merge pull request Rxup#407 from Rinary1/master

Новые Шлюзы + Робототехник

Resources/Locale/en-US/backmen/job/job-names.ftl

@@ -1,2 +1,3 @@
 job-name-fugitive = fugitive
 job-name-prisoner = prisoner
+job-name-roboticist = roboticist

Resources/Locale/en-US/backmen/job/nyano-desc.ftl

@@ -1 +1,2 @@
 job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
+job-description-roboticist = Creation of robots. Create helpful workers or killing machines.

Resources/Locale/ru-RU/backmen/job/job-names.ftl

@@ -1,2 +1,3 @@
 job-name-fugitive = Беглец
 job-name-prisoner = Заключенный
+job-name-roboticist = Робототехник

Resources/Locale/ru-RU/backmen/job/nyano-desc.ftl

@@ -1 +1,2 @@
 job-description-prisoner = Сидеть в тюрьме. Играйте с сокамерниками. Поговорите с надзирателем. Напишите свои мемуары.
+job-description-roboticist = Создавайте услужливых работников или машин для убийств.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/eyes/glasses.ftl

@@ -1,2 +1,4 @@
 ent-ClothingEyesGlassesMonocle = Монокль аристократа.
     .desc = Монокль является признаком высокого происхождения и интелекта.
+ent-ClothingEyesGlassesWelding = Сварочные Очки
+    .desc = Это сварочные очки. Это небольшой предмет. Защищает глаза от сварщиков.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/head/soft.ftl

@@ -2,3 +2,7 @@ ent-ClothingHeadHatCargoPostalsoft = почтовый колпачок
     .desc = Это бейсболка, раскрашенная в цвета "Постал оф Карго".
 ent-ClothingHeadHatCargoPostalsoftFlipped = перевернутый почтовый колпачок
     .desc = Это бейсболка, раскрашенная в цвета "Постал оф Карго". Перевернутый.
+ent-ClothingHeadHatBlacksoft = Чёрная Кепка
+    .desc = Простая чёрная кепка, ничего нового.
+ent-ClothingHeadHatBlacksoftflipped = Повёрнутая Чёрная Кепка
+    .desc = Простая чёрная кепка, ничего нового. Повёрнута.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/markers/spawners/jobs.ftl

@@ -16,3 +16,5 @@ ent-SpawnPointDelivery = Доставщик
     .desc = { ent-SpawnPointJobBase.desc }
 ent-SpawnPointPrisoner = Заключенный
     .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointRoboticist = Робототехник
+    .desc = { ent-SpawnPointJobBase.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/Glass/double_glass_airlock.ftl

@@ -0,0 +1,2 @@
+ent-DoubleGlassAirlock = Двойной Шлюз
+    .desc = Он открывается, Он закрывается , и он может вас раздавить, но он больше, чем обычно.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/access.ftl

@@ -22,3 +22,18 @@ ent-AirlockCCEngineeringLocked = Шлюз ЦК
 ent-AirlockCCMedicalLocked = Шлюз ЦК
     .suffix = CentCom, Medical, Locked
     .desc = { ent-AirlockMedical.desc }
+ent-AirlockHatchCentcommLocked = Шлюз ЦК
+    .suffix = CentCom, Locked
+    .desc = { ent-AirlockHatchCentcomm.desc }
+ent-AirlockHatchMaintLocked = Технический Шлюз
+    .suffix = Maint, Locked
+    .desc = { ent-AirlockHatchMaint.desc }
+ent-AirlockHatchSyndicateLocked = Шлюз Синдиката
+    .suffix = Syndicate, Locked
+    .desc = { ent-AirlockHatchCentcomm.desc }
+ent-DoubleGlassAirlockCentcomLocked = Двойной Шлюз ЦК
+    .suffix = CentCom, Locked
+    .desc = { ent-DoubleGlassAirlock.desc }
+ent-DoubleGlassAirlockSyndicateLocked = Двойной Шлюз Синдиката
+    .suffix = Syndicate, Locked
+    .desc = { ent-DoubleGlassAirlock.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/hatches/airlock_hatch_centcomm.ftl

@@ -0,0 +1,2 @@
+ent-AirlockHatchCentcomm = Шлюз ЦК
+    .desc = Удерживает плохих снаружи, а хороших внутри.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/hatches/airlock_hatch_maint.ftl

@@ -0,0 +1,2 @@
+ent-AirlockHatchMaint = Технический Шлюз ЦК
+    .desc = Защищает Тех.Тонели в безопасности.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/hatches/hatches.ftl

@@ -0,0 +1,4 @@
+ent-AirlockHatchCentcomm = Шлюз ЦК
+    .desc = Удерживает плохих снаружи, а хороших внутри.
+ent-AirlockHatchMaint = Технический Шлюз ЦК
+    .desc = Защищает Тех.Тонели в безопасности.

Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/roles/jobs/Science/roboticist.ftl

@@ -0,0 +1,3 @@
+ent-RoboticistPDA = КПК Робототехника
+    .desc = Старый кпк чёрного цвета с пятнами машинного масла, царапинами и другими показателями старости.
+ent-RoboticistIDCard = ID Карта Робототехника

Resources/Prototypes/Backmen/Entities/Clothing/Eyes/glasses.yml

@@ -8,3 +8,21 @@
     sprite:  Backmen/Clothing/Eyes/Glasses/monocle.rsi
   - type: Clothing
     sprite:  Backmen/Clothing/Eyes/Glasses/monocle.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesWelding
+  name: Welding glasses
+  description: That's a welding goggles. It is a small item. Protects the eyes from welders.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/weldglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/weldglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon

Resources/Prototypes/Backmen/Entities/Clothing/Head/soft.yml

@@ -18,4 +18,26 @@
   - type: Sprite
     sprite: Backmen/Clothing/Head/Soft/cargopostalsoft_flipped.rsi
   - type: Clothing
-    sprite: Backmen/Clothing/Head/Soft/cargopostalsoft_flipped.rsi
+    sprite: Backmen/Clothing/Head/Soft/cargopostalsoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBaseButcherable
+  id: ClothingHeadHatBlacksoft
+  name: Black cap
+  description: "It's a Black baseball hat."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/blacksoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/blacksoft.rsi
+
+- type: entity
+  parent: ClothingHeadBaseButcherable
+  id: ClothingHeadHatBlacksoftFlipped
+  name: Black cap flipped
+  description: "It's a Black baseball hat. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi

Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml

@@ -119,6 +119,20 @@
       - state: brigmedic
       - state: jobicon
 
+- type: entity
+  id: SpawnPointRoboticist
+  parent: SpawnPointJobBase
+  name: Roboticist
+  components:
+  - type: SpawnPoint
+    job_id: Roboticist
+  - type: Sprite
+    sprite: Backmen/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: roboticist
+      - state: jobicon
+
 #- type: entity
 #  id: SpawnPointGladiator
 #  parent: SpawnPointJobBase

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

@@ -76,3 +76,34 @@
       state: pda-clear
     - type: Icon
       state: pda-clear
+
+- type: entity
+  parent: BasePDA
+  id: RoboticistPDA
+  name: Roboticist PDA
+  description:  An old black PDA with machine oil stains, scratches and other signs of age
+  components:
+    - type: Sprite
+      sprite: Backmen/Objects/Devices/pda.rsi
+      layers:
+      - map: [ "enum.PdaVisualLayers.Base" ]
+      - state: "light_overlay"
+        map: [ "enum.PdaVisualLayers.Flashlight" ]
+        shader: "unshaded"
+        visible: false
+      - state: "id_overlay"
+        map: [ "enum.PdaVisualLayers.IdLight" ]
+        shader: "unshaded"
+        visible: false
+    - type: Pda
+      id: RoboticistIDCard
+      state: pda-Roboticist
+      penSlot:
+        startingItem: Pen
+        priority: -1
+        whitelist:
+          tags:
+          - Write
+    - type: Icon
+      sprite: Backmen/Objects/Devices/pda.rsi
+      state: pda-Roboticist

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

@@ -9,6 +9,18 @@
     - type: PresetIdCard
       job: Prisoner
 
+- type: entity
+  parent: IDCardStandard
+  id: RoboticistIDCard
+  name: Roboticist ID Card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: idroboticist
+    - type: PresetIdCard
+      job: Roboticist
+
 - type: entity
   parent: IDCardStandard
   id: UnaffiliatedIDCard

Resources/Prototypes/Backmen/Entities/Structures/Doors/Airlocks/Glass/double_glass_airlock.yml

@@ -0,0 +1,49 @@
+- type: entity
+  id: DoubleGlassAirlock
+  parent: Airlock
+  name: Double Glass Airlock
+  description: It opens, it closes, and maybe crushes you, but it bigger than normal door.
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Effects/glass_hit.ogg"
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: Backmen/Structures/Doors/Airlocks/Glass/double_glass_airlock.rsi
+    snapCardinals: false
+    offset: 0.5,0
+  - type: AnimationPlayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,1.49,0.49" # don't want this colliding with walls or they won't close
+        density: 100
+        mask:
+        - FullTileMask
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
+  - type: LayerChangeOnWeld
+    unWeldedLayer: GlassAirlockLayer
+    weldedLayer: GlassLayer
+  - type: Rotatable
+    rotateWhileAnchored: true
+  - type: Transform
+    noRot: false
+  - type: Construction
+    graph: Airlock
+    node: glassAirlock
+  - type: PaintableAirlock
+    group: Glass
+  - type: RadiationBlocker
+    resistance: 2
+  - type: Tag
+    tags:
+      - GlassAirlock
+      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor

Resources/Prototypes/Backmen/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml

@@ -0,0 +1,25 @@
+- type: entity
+  id: AirlockHatchMaint
+  parent: Airlock
+  name: Maintenance Hatch
+  description: Protects maintenance tunnels.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Backmen/Structures/Doors/Airlocks/Hatches/maintenance_hatch.rsi
+  - type: Weldable
+    time: 10
+
+- type: entity
+  id: AirlockHatchCentcomm
+  parent: HighSecDoor
+  name: CentCom Hatch
+  description: Keeps the bad out and keeps the good in.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Backmen/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi
+  - type: Weldable
+    time: 10

Resources/Prototypes/Backmen/Entities/Structures/Doors/Airlocks/access.yml

@@ -109,3 +109,51 @@
   components:
     - type: AccessReader
       access: [["CentralCommand"]]
+
+#Hatches
+- type: entity
+  parent: AirlockHatchCentcomm
+  id: AirlockHatchCentcommLocked
+  name: CentCom Hatch
+  suffix: CentCom, Locked
+  components:
+    - type: AccessReader
+      access: [["CentralCommand"]]
+
+- type: entity
+  parent: AirlockHatchMaint
+  id: AirlockHatchMaintLocked
+  name: Maintenance Hatch
+  suffix: Maint, Locked
+  components:
+    - type: AccessReader
+      access: [["Maintenance"]]
+
+- type: entity
+  parent: AirlockHatchCentcomm
+  id: AirlockHatchSyndicateLocked
+  name: Syndicate Hatch
+  suffix: Syndicate, Locked
+  components:
+    - type: AccessReader
+      access: [["SyndicateAgent"]]
+
+#DoubleAirlocks
+
+- type: entity
+  parent: DoubleGlassAirlock
+  id: DoubleGlassAirlockCentcomLocked
+  name: Double Glass Airlock
+  suffix: CentCom, Locked
+  components:
+    - type: AccessReader
+      access: [["CentralCommand"]]
+
+- type: entity
+  parent: DoubleGlassAirlock
+  id: DoubleGlassAirlockSyndicateLocked
+  name: Double Glass Airlock
+  suffix: Syndicate, Locked
+  components:
+    - type: AccessReader
+      access: [["SyndicateAgent"]]

Resources/Prototypes/Backmen/Roles/Jobs/Science/roboticist.yml

@@ -0,0 +1,35 @@
+- type: job
+  id: Roboticist
+  name: job-name-roboticist
+  description: job-description-roboticist
+  playTimeTracker: JobRoboticist
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Science
+      time: 36000 #10 hrs
+  startingGear: RoboticistGear
+  icon: "JobIconRoboticist"
+  supervisors: job-supervisors-rd
+  access:
+  - Research
+  - Maintenance
+  #start-backmen: currency
+  minBankBalance: 150
+  maxBankBalance: 250
+  wageDepartment: Science
+  wage: 50
+  #end-backmen: currency
+
+- type: startingGear
+  id: RoboticistGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitRoboticist
+    back: ClothingBackpackScienceFilled
+    shoes: ClothingShoesColorBlack
+    eyes: ClothingEyesGlassesWelding
+    outerClothing: ClothingOuterCoatRnd
+    id: RoboticistPDA
+    ears: ClothingHeadsetScience
+  innerClothingSkirt: ClothingUniformJumpskirtRoboticist
+  satchel: ClothingBackpackSatchelScienceFilled
+  duffelbag: ClothingBackpackDuffelScienceFilled

Resources/Prototypes/Backmen/Roles/play_time_trackers.yml

@@ -45,3 +45,6 @@
 
 - type: playTimeTracker
   id: JobSAI
+
+- type: playTimeTracker
+  id: JobRoboticist

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -94,6 +94,7 @@
   color: "#D381C9"
   roles:
   - ResearchDirector
+  - Roboticist         #backmen: currency
   - Scientist
   - ResearchAssistant
   accountNumber: 1321  #backmen: currency