ПДА для беженцев

Resources/Locale/ru-RU/_white/prototypes/entities/clothing/ears/headsets.ftl

@@ -6,3 +6,5 @@ ent-ClothingHeadsetRDAnotherSector = { ent-ClothingHeadsetRD }
     .desc = { ent-ClothingHeadsetRD.desc }
 ent-ClothingHeadsetCargoAnotherSector = { ent-ClothingHeadsetCargo }
     .desc = { ent-ClothingHeadsetCargo.desc }
+ent-ClothingHeadsetServiceContractor = { ent-ClothingHeadsetService }
+    .desc = { ent-ClothingHeadsetService.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl

@@ -41,3 +41,9 @@ ent-ClothingBackpackCluwne = проклятое Хихиканье Фон Хон
     .suffix = Неснимаемое
 ent-ClothingBackpackDeathSquadFilled = рюкзак отряда смерти
     .desc = Содержит набор самых опасных агентов Центкома.
+ent-ClothingBackpackMedicalAnotherSector = { ent-ClothingBackpackMedical }
+    .desc = { ent-ClothingBackpackMedical.desc }
+ent-ClothingBackpackCaptainAnotherSector = { ent-ClothingBackpackCaptain }
+    .desc = { ent-ClothingBackpackCaptain.desc }
+ent-ClothingBackpackScienceAnotherSector = { ent-ClothingBackpackScience }
+    .desc = { ent-ClothingBackpackScience.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl

@@ -26,3 +26,9 @@ ent-ClothingBackpackSatchelVirology = сумка вирусолога
     .desc = Сумка из гипоаллергенных волокон. Он разработан для того, чтобы помочь предотвратить распространение болезни. Пахнет обезьяной.
 ent-ClothingBeltStorageWaistbag = кожаная поясная сумка
     .desc = Кожаная поясная сумка, предназначенная для переноски мелких предметов.
+ent-ClothingBackpackSatchelMedicalAnotherSector = { ent-ClothingBackpackSatchelMedical }
+    .desc = { ent-ClothingBackpackSatchelMedical.desc }
+ent-ClothingBackpackSatchelCaptainAnotherSector = { ent-ClothingBackpackSatchelCaptain }
+    .desc = { ent-ClothingBackpackSatchelCaptain.desc }
+ent-ClothingBackpackSatchelScienceAnotherSector = { ent-ClothingBackpackSatchelScience }
+    .desc = { ent-ClothingBackpackSatchelScience.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl

@@ -93,3 +93,11 @@ ent-MaidPDA = ПДА прислуги
     .desc = Сияет от собственной чистоты.
 ent-BomzhPDA = убитый ПДА
     .desc = Жизнь прошла, и все что остаётся делать - это двигаться вперед.
+ent-CargoPDAAnotherSector = { ent-CargoPDA }
+    .desc = { ent-CargoPDA.desc }
+ent-CMOPDAAnotherSector = { ent-CMOPDA }
+    .desc = { ent-CMOPDA.desc }
+ent-CaptainPDAAnotherSector = { ent-CaptainPDA }
+    .desc = { ent-CaptainPDA.desc }
+ent-RnDPDAAnotherSector = { ent-RnDPDA }
+    .desc = { ent-RnDPDA.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl

@@ -98,3 +98,11 @@ ent-MaidIDCard = ID карта прислуги
     .desc = { ent-IDCardStandard.desc }
 ent-BomzhIDCard = грязная ID карта
     .desc = Старая и грязная карта дожившая до нашего времени.
+ent-CargoIDCardAnotherSector = { ent-CargoIDCard }
+    .desc = { ent-ent-CargoIDCard.desc }
+ent-CMOIDCardAnotherSector = { ent-CMOIDCard }
+    .desc = { ent-CMOIDCard.desc }
+ent-CaptainIDCardAnotherSector = { ent-CaptainIDCard }
+    .desc = { ent-CaptainIDCard.desc }
+ent-RDIDCardAnotherSector = { ent-RDIDCard }
+    .desc = { ent-RDIDCard.desc }

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -313,12 +313,12 @@
 - type: startingGear
   id: BananaClown
   equipment:
-    id: ClownPDA
+    id: ClownPDA # TODO
     back: ClothingBackpackClown
     shoes: ClothingShoesClownBanana
     jumpsuit: ClothingUniformJumpsuitClownBanana
     mask: ClothingMaskClownBanana
-    ears: ClothingHeadsetGrey # WD
+    ears: ClothingHeadsetServiceContractor # WD
     pocket1: BikeHorn
     pocket2: ClownRecorder
 
@@ -328,9 +328,9 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitClown
     shoes: ClothingShoesClown
-    id: ClownPDA
+    id: ClownPDA # TODO
     back: ClothingBackpackClown
-    ears: ClothingHeadsetGrey # WD
+    ears: ClothingHeadsetServiceContractor # WD
     mask: ClothingMaskClown
     pocket1: BikeHorn
     pocket2: ClownRecorder
@@ -342,7 +342,7 @@
     jumpsuit: ClothingUniformJumpsuitCargo
     shoes: ClothingShoesColorBlack
     head: ClothingHeadHatCargosoft
-    id: CargoPDA
+    id: CargoPDAAnotherSector # WD
     back: ClothingBackpackCargo
     ears: ClothingHeadsetCargoAnotherSector # WD
     pocket1: AppraisalTool
@@ -352,10 +352,10 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitCargo
     shoes: ClothingShoesBootsWinterCargo
-    head: ClothingHeadHatCargosoftAnotherSector # WD
+    head: ClothingHeadHatCargosoft
-    id: CargoPDA
+    id: CargoPDAAnotherSector # WD
     back: ClothingBackpackDuffelCargo
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetCargoAnotherSector # WD
     pocket1: AppraisalTool
     outerClothing: ClothingOuterWinterCargo
 
@@ -365,9 +365,9 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitChef
     shoes: ClothingShoesColorWhite
-    id: ChefPDA
+    id: ChefPDA # TODO
     back: ClothingBackpackSatchel
-  # ears: ClothingHeadsetService # WD
+    ears: ClothingHeadsetServiceContractor # WD
     belt: ClothingBeltChef
 
 #CMO Disaster Victim
@@ -378,7 +378,7 @@
     shoes: ClothingShoesColorBrown
     head: ClothingHeadMirror
     neck: ClothingCloakCmo
-    id: CMOPDA
+    id: CMOPDAAnotherSector # WD
     back: ClothingBackpackMedicalAnotherSector # WD
     ears: ClothingHeadsetCMOAnotherSector # WD
     belt: ClothingBeltMedical
@@ -391,7 +391,7 @@
     shoes: ClothingShoesColorBrown
     head: ClothingHeadHatBeretCmo
     neck: ClothingNeckMantleCMO
-    id: CMOPDA
+    id: CMOPDAAnotherSector # WD
     back: ClothingBackpackSatchelMedicalAnotherSector # WD
     ears: ClothingHeadsetCMOAnotherSector # WD
     belt: ClothingBeltMedical
@@ -407,7 +407,7 @@
     gloves: ClothingHandsGlovesCaptain
     head: ClothingHeadHatCaptain
     neck: ClothingNeckCloakCap
-    id: CaptainPDA
+    id: CaptainPDAAnotherSector # WD
     back: ClothingBackpackCaptainAnotherSector # WD
     ears: ClothingHeadsetAltCommandAnotherSector # WD
     outerClothing: ClothingOuterArmorCaptainCarapace
@@ -421,7 +421,7 @@
     gloves: ClothingHandsGlovesCaptain
     head: ClothingHeadHatCapcap
     neck: ClothingNeckMantleCap
-    id: CaptainPDA
+    id: CaptainPDAAnotherSector # WD
     back: ClothingBackpackSatchelCaptainAnotherSector # WD
     ears: ClothingHeadsetAltCommandAnotherSector # WD
     outerClothing: ClothingOuterArmorCaptainCarapace
@@ -434,7 +434,7 @@
     shoes: ClothingShoesColorBrown
     head: ClothingHeadHatBeretRND
     neck: ClothingNeckCloakRd
-    id: RnDPDA
+    id: RnDPDAAnotherSector # WD
     back: ClothingBackpackScienceAnotherSector # WD
     ears: ClothingHeadsetRDAnotherSector # WD
     outerClothing: ClothingOuterCoatRD
@@ -446,7 +446,7 @@
     shoes: ClothingShoesColorBrown
     head: ClothingHeadHatBeretRND
     neck: ClothingNeckMantleRD
-    id: RnDPDA
+    id: RnDPDAAnotherSector # WD
     back: ClothingBackpackSatchelScienceAnotherSector # WD
     ears: ClothingHeadsetRDAnotherSector # WD
     outerClothing: ClothingOuterCoatRD

Resources/Prototypes/Roles/play_time_trackers.yml

@@ -169,3 +169,15 @@
 
 - type: playTimeTracker
   id: JobMaid
+
+- type: playTimeTracker
+  id: JobCargoTechnicianAnotherSector
+
+- type: playTimeTracker
+  id: JobChiefMedicalOfficerAnotherSector
+
+- type: playTimeTracker
+  id: JobCaptainAnotherSector
+
+- type: playTimeTracker
+  id: JobResearchDirectorAnotherSector

Resources/Prototypes/Shuttles/shuttle_incoming_event.yml

@@ -5,7 +5,7 @@
 
 - type: preloadedGrid
   id: ShuttleCargoLost
-  path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml
+  path: /Maps/Shuttles/ShuttleEvent/White/lost_cargo.yml
   copies: 1 # WD from 2 to 1
 
 - type: preloadedGrid

Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml

@@ -1,23 +1,16 @@
 - type: entity
-  parent: ClothingHeadsetAlt
+  parent: ClothingHeadsetAltCommand
   id: ClothingHeadsetAltCommandAnotherSector
-  name: command over-ear headset
   suffix: Another Sector
   components:
   - type: ContainerFill
     containers:
       key_slots:
       - EncryptionKeyStationMasterAnotherSector
-  - type: Sprite
-    sprite: Clothing/Ears/Headsets/command.rsi
-  - type: Clothing
-    sprite: Clothing/Ears/Headsets/command.rsi
 
 - type: entity
   parent: ClothingHeadsetMedical
   id: ClothingHeadsetCMOAnotherSector
-  name: cmo headset
-  description: A headset used by the CMO.
   suffix: Another Sector
   components:
   - type: ContainerFill
@@ -30,8 +23,6 @@
 - type: entity
   parent: ClothingHeadsetScience
   id: ClothingHeadsetRDAnotherSector
-  name: rd headset
-  description: Lamarr used to love chewing on this...
   suffix: Another Sector
   components:
   - type: ContainerFill
@@ -42,10 +33,8 @@
       - EncryptionKeyCommon
 
 - type: entity
-  parent: ClothingHeadset
+  parent: ClothingHeadsetCargo
   id: ClothingHeadsetCargoAnotherSector
-  name: cargo headset
-  description: A headset used by supply employees.
   suffix: Another Sector
   components:
   - type: ContainerFill
@@ -53,7 +42,13 @@
       key_slots:
       - EncryptionKeyCargoAnotherSector
       - EncryptionKeyCommon
-  - type: Sprite
+
-    sprite: Clothing/Ears/Headsets/cargo.rsi
+- type: entity
-  - type: Clothing
+  parent: ClothingHeadsetService
-    sprite: Clothing/Ears/Headsets/cargo.rsi
+  id: ClothingHeadsetServiceContractor
+  noSpawn: true
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon

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

@@ -0,0 +1,41 @@
+- type: entity
+  parent: CargoPDA
+  id: CargoPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CargoIDCardAnotherSector
+    state: pda-cargo
+
+- type: entity
+  parent: CMOPDA
+  id: CMOPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CMOIDCardAnotherSector
+    state: pda-cmo
+
+- type: entity
+  parent: CaptainPDA
+  id: CaptainPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CaptainIDCardAnotherSector
+    state: pda-captain
+    penSlot:
+      startingItem: PenCap
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+
+- type: entity
+  parent: RnDPDA
+  id: RnDPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: RDIDCardAnotherSector
+    state: pda-rd

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

@@ -0,0 +1,31 @@
+- type: entity
+  parent: CargoIDCard
+  id: CargoIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: CargoTechnicianAnotherSector
+
+- type: entity
+  parent: CMOIDCard
+  id: CMOIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: ChiefMedicalOfficerAnotherSector
+
+- type: entity
+  parent: CaptainIDCard
+  id: CaptainIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: CaptainAnotherSector
+
+- type: entity
+  parent: RDIDCard
+  id: RDIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: ResearchDirectorAnotherSector

Resources/Prototypes/_White/Roles/Jobs/another_sector.yml

@@ -0,0 +1,34 @@
+- type: job
+  id: CargoTechnicianAnotherSector
+  name: job-name-cargotech
+  description: job-description-cargotech
+  playTimeTracker: JobCargoTechnicianAnotherSector
+  icon: "JobIconCargoTechnician"
+  supervisors: job-supervisors-qm
+
+- type: job
+  id: ChiefMedicalOfficerAnotherSector
+  name: job-name-cmo
+  description: job-description-cmo
+  playTimeTracker: JobChiefMedicalOfficerAnotherSector
+  icon: "JobIconChiefMedicalOfficer"
+  supervisors: job-supervisors-captain
+
+- type: job
+  id: CaptainAnotherSector
+  name: job-name-captain
+  description: job-description-captain
+  playTimeTracker: JobCaptainAnotherSector
+  icon: "JobIconCaptain"
+  supervisors: job-supervisors-centcom
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+- type: job
+  id: ResearchDirectorAnotherSector
+  name: job-name-rd
+  description: job-description-rd
+  playTimeTracker: JobResearchDirectorAnotherSector
+  icon: "JobIconResearchDirector"
+  supervisors: job-supervisors-captain