Merge pull request #67 from Corvax-Frontier/Dwellers

Dwellers + Upstream

Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl

@@ -12,3 +12,20 @@ health-analyzer-window-scan-mode-text = Режим сканирования:
 health-analyzer-window-scan-mode-active = АКТИВЕН
 health-analyzer-window-scan-mode-inactive = НЕАКТИВЕН
 health-analyzer-window-malnutrition = Тяжёлое недоедание
+health-analyzer-window-damage-group-Brute = Механические
+health-analyzer-window-damage-type-Blunt = Ушибы
+health-analyzer-window-damage-type-Slash = Порезы
+health-analyzer-window-damage-type-Piercing = Уколы
+health-analyzer-window-damage-group-Burn = Ожоги
+health-analyzer-window-damage-type-Heat = Термические
+health-analyzer-window-damage-type-Shock = Электрические
+health-analyzer-window-damage-type-Cold = Обморожение
+health-analyzer-window-damage-type-Caustic = Кислотные
+health-analyzer-window-damage-group-Airloss = Нехватка воздуха
+health-analyzer-window-damage-type-Asphyxiation = Удушение
+health-analyzer-window-damage-type-Bloodloss = Кровопотеря
+health-analyzer-window-damage-group-Toxin = Токсины
+health-analyzer-window-damage-type-Poison = Яды
+health-analyzer-window-damage-type-Radiation = Радиация
+health-analyzer-window-damage-group-Genetic = Генетические
+health-analyzer-window-damage-type-Cellular = Клеточные

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -64,6 +64,6 @@
             CaesarLegionLegionnaireRecruit: [ 0, 6 ] # Corvax-Legion
             Overseer: [ 1, 1 ]
             VaultDoctor: [ 1, 1 ]
-            VaultDweller: [ 3, 3 ]
-            VaultEngineer: [ 1, 1 ]
-            VaultSecurity: [ 1, 1 ]
+            VaultDweller: [ 4, 4 ]
+            VaultEngineer: [ 2, 2 ]
+            VaultSecurity: [ 2, 2 ]

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/meta.yml

@@ -0,0 +1,14 @@
+- type: entity
+  noSpawn: true
+  parent: BaseBullet
+  id: N14Bullet50HEIAPMeta # for spawn turrets and fun
+  name: bullet (.50 HEIAP anti-materiel)
+  components:
+  - type: IgniteOnCollide
+    fireStacks: 1
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 500
+        Blunt: 500
+    ignoreResistances: true

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/turrets.yml

@@ -163,7 +163,7 @@
     - BrotherhoodWashington
 
 - type: entity
-  parent: BaseWeaponTurret
+  parent: N14BaseWeaponTurret
   id: N14WeaponTurretVaultSecureArea
   suffix: VaultSecureArea, Hostile
   components:
@@ -181,7 +181,7 @@
     - Vault
 
 - type: entity
-  parent: BaseWeaponTurret
+  parent: N14BaseWeaponTurret
   id: N14WeaponTurretNCRSecureArea
   suffix: NCRSecureArea, Hostile
   components:
@@ -190,11 +190,103 @@
     - NCRSecureArea
 
 - type: entity
-  parent: BaseWeaponTurret
+  parent: N14BaseWeaponTurret
   id: N14WeaponTurretNCR
   suffix: NCR, Hostile
   components:
   - type: NpcFactionMember
     factions:
     - NCR
 
+# Spawn Point Turrets
+# These are meta turrets designed to stop spawn point abuse
+- type: entity
+  parent: BaseStructure
+  id: N14BaseWeaponTurretMeta
+  name: ballistic turret
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: _Nuclear14/Structures/Machines/turrets.rsi
+      drawdepth: Mobs
+      state: turret_lethal
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Actions
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.45,-0.45,0.45,0.45"
+          density: 60
+          mask:
+            - MachineMask
+          layer:
+            - MachineLayer
+    - type: ContainerContainer
+      containers:
+        ballistic-ammo: !type:Container
+    - type: InteractionPopup
+      interactDelay: 0.2
+      successChance: 0.8
+      interactSuccessString: petting-success-generic
+      interactFailureString: petting-failure-generic
+      interactSuccessSound:
+        path: /Audio/Effects/double_beep.ogg
+    - type: CombatMode
+      toggleMouseRotator: false
+    - type: Gun
+      fireRate: 15
+      selectedMode: FullAuto
+      availableModes:
+        - FullAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
+    # TODO: Power ammo provider?
+    - type: BallisticAmmoProvider
+      proto: N14Bullet50HEIAPMeta
+      capacity: 50000
+    - type: HTN
+      rootTask:
+        task: TurretCompound
+      blackboard:
+        RotateSpeed: !type:Single
+          10
+        SoundTargetInLOS: !type:SoundPathSpecifier
+          path: /Audio/Effects/double_beep.ogg
+
+- type: entity
+  parent: N14BaseWeaponTurretMeta
+  id: N14WeaponTurretBrotherhoodMidwestSpawnpoint
+  suffix: BOS Midwest, Spawnpoint
+  components:
+  - type: NpcFactionMember
+    factions:
+    - BrotherhoodMidwestSecureArea
+
+- type: entity
+  parent: N14BaseWeaponTurretMeta
+  id: N14WeaponTurretBrotherhoodWashingtonSpawnpoint
+  suffix: BOS Washington, Spawnpoint
+  components:
+  - type: NpcFactionMember
+    factions:
+    - BrotherhoodWashingtonSecureArea
+
+- type: entity
+  parent: N14BaseWeaponTurretMeta
+  id: N14WeaponTurretVaultSpawnpoint
+  suffix: Vault, Spawnpoint
+  components:
+  - type: NpcFactionMember
+    factions:
+    - VaultSecureArea
+
+- type: entity
+  parent: N14BaseWeaponTurretMeta
+  id: N14WeaponTurretNCRSpawnpoint
+  suffix: NCR, Spawnpoint
+  components:
+  - type: NpcFactionMember
+    factions:
+    - NCRSecureArea

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodMidwest
       time: 3600 # 1 hour
   startingGear: BoSMidKnightGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   canBeAntag: false
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodMidwest
       time: 36000 # 10 hours
   startingGear: BoSMidPaladinCommanderGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   canBeAntag: false
   accessGroups:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodMidwest
       time: 18000 # 5 hours
   startingGear: BoSMidPaladinGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   canBeAntag: false
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodMidwest
       time: 3600 # 1 hour
   startingGear: BoSMidScribeGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   supervisors: job-supervisors-bos-mid
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml

@@ -5,6 +5,7 @@
   description: job-description-bos-mid-squire
   playTimeTracker: BoSMidSquire
   startingGear: BoSMidSquireGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   canBeAntag: false
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodWashington
       time: 18000 # 5 hours
   startingGear: BoSWashingtonCaptainGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   supervisors: job-name-bos-washington
   canBeAntag: false

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml

@@ -10,6 +10,7 @@
       time: 36000 # 10 hours
   weight: 10
   startingGear: BoSWashingtonCommanderGear
+  alwaysUseSpawner: true
   icon: "JobIconHeadOfSecurity"
   supervisors: job-supervisors-bos-washington-commander
   requireAdminNotify: true

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml

@@ -5,6 +5,7 @@
   description: job-description-bos-washington-recruit
   playTimeTracker: BoSWashingtonRecruit
   startingGear: BoSWashingtonRecruitGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   supervisors: job-supervisors-bos-washington-recruit
   canBeAntag: false

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodWashington
       time: 3600 # 1 hour as BosWashingtonRecruit
   startingGear: BoSWashingtonResearcherGear
+  alwaysUseSpawner: true
   icon: "JobIconScientist"
   supervisors: job-name-bos-washington
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml

@@ -9,6 +9,7 @@
       department: BrotherhoodWashington
       time: 3600 # 1 hour as BosWashingtonRecruit
   startingGear: BoSWashingtonSoldierGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   supervisors: job-supervisors-bos-washington
   canBeAntag: false

Resources/Prototypes/_Nuclear14/Roles/Jobs/Tribal/tribal.yml

@@ -5,6 +5,7 @@
   description: job-description-tribal
   playTimeTracker: Tribal
   startingGear: TribalGear
+  alwaysUseSpawner: true
   icon: "JobIconBotanist"
   supervisors: job-supervisors-tribal
   special:

Resources/Prototypes/_Nuclear14/Roles/Jobs/Tribal/tribalelder.yml

@@ -9,6 +9,7 @@
       department: Tribe
       time: 7200 # 2 hours
   startingGear: TribalElderGear
+  alwaysUseSpawner: true
   icon: "JobIconBotanist"
   supervisors: job-supervisors-tribal-elder
   special:

Resources/Prototypes/_Nuclear14/Roles/Jobs/Tribal/tribalfarmer.yml

@@ -5,6 +5,7 @@
   description: job-description-farmer
   playTimeTracker: TribalFarmer
   startingGear: TribalFarmerGear
+  alwaysUseSpawner: true
   icon: "JobIconBotanist"
   supervisors: job-supervisors-tribal
   special:

Resources/Prototypes/_Nuclear14/Roles/Jobs/Tribal/tribalhealer.yml

@@ -5,6 +5,7 @@
   description: job-description-tribal-healer
   playTimeTracker: TribalHealer
   startingGear: TribalHealerGear
+  alwaysUseSpawner: true
   icon: "JobIconBotanist"
   supervisors: job-supervisors-tribal
   special:

Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml

@@ -9,6 +9,7 @@
   playTimeTracker: Overseer
   weight: 20
   startingGear: OverseerGear
+  alwaysUseSpawner: true
   icon: "JobIconCaptain"
   requireAdminNotify: true
   joinNotifyCrew: true

Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml

@@ -4,6 +4,7 @@
   description: job-description-vault-doctor
   playTimeTracker: VaultDoctor
   startingGear: VaultDoctorGear
+  alwaysUseSpawner: true
   icon: "JobIconMedicalDoctor"
   supervisors: job-supervisors-overseer
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml

@@ -4,6 +4,7 @@
   description: job-description-vault-dweller
   playTimeTracker: VaultDweller
   startingGear: VaultDwellerGear
+  alwaysUseSpawner: true
   icon: "JobIconPassenger"
   supervisors: job-supervisors-overseer
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml

@@ -4,6 +4,7 @@
   description: job-description-vault-engineer
   playTimeTracker: VaultEngineer
   startingGear: VaultEngineerGear
+  alwaysUseSpawner: true
   icon: "JobIconStationEngineer"
   supervisors: job-supervisors-overseer
   access:

Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml

@@ -8,6 +8,7 @@
       department: Vault
       time: 7200 # 2 hours
   startingGear: VaultSecurityGear
+  alwaysUseSpawner: true
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-overseer
   canBeAntag: false

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/backpackncr.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/explorerpack.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/heavycarrier.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/hikingbackpack.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/military.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/packbotany.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/packchem.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/packgenetics.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,

Resources/Textures/_Nuclear14/Clothing/Back/Backpacks/packoverseer.rsi/meta.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
   "copyright": "Modified by Peptide90 from source Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
   "size": {
     "x": 32,