Merge remote-tracking branch 'origin/upstream2' into upstream2

Lost-Paradise-Project · Nov 16, 2024 · edbf785 · edbf785
2 parents 45ce0cd + 11776f8
commit edbf785
Show file tree

Hide file tree

Showing 20 changed files with 88 additions and 6 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -2805,3 +2805,25 @@
   id: 147
   time: '2024-11-07T18:09:48.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/322
+- author: Kest
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0433\u0440\
+      \u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u043F\u043E \u0440\u043E\u0441\
+      \u0442\u0443 \u0434\u043B\u044F \u041A\u0430\u043F\u0438\u0442\u0430\u043D\u0430\
+      \ (\u043E\u0442 150\u0441\u043C)"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0433\u0440\
+      \u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u043F\u043E \u0440\u043E\u0441\
+      \u0442\u0443 \u0434\u043B\u044F \u043E\u0442\u0434\u0435\u043B\u0430 \u0421\u0411\
+      \ \u0438 \u041E\u0421\u0429 (\u043E\u0442 160\u0441\u043C)"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0432\u0435\u0440\u0445\
+      \u043D\u0438\u0435/\u043D\u0438\u0436\u043D\u0438\u0435 \u043F\u043E\u0440\u043E\
+      \u0433\u0438 \u0434\u043B\u044F \u0440\u043E\u0441\u0442\u0430 \u0443 \u043D\
+      \u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0440\u0430\u0441 \u0434\u043B\
+      \u044F \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044F\
+      \ \u0438\u043C\u0435\u044E\u0449\u0438\u043C\u0441\u044F \u043B\u043E\u0440\u0443"
+    type: Tweak
+  id: 148
+  time: '2024-11-16T12:47:09.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/329
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -4,6 +4,8 @@
   description: job-description-brigmedic
   playTimeTracker: JobBrigmedic
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:DepartmentTimeRequirement
       department: Medical
       min: 21600 # 6 hrs

diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -11,6 +11,12 @@
   maleFirstNames: names_vulpkanin_male
   femaleFirstNames: names_vulpkanin_female
   lastNames: names_vulpkanin_last
+  minHeight: 0.75
+  defaultHeight: 0.85
+  maxHeight: 1.1
+  minWidth: 0.65
+  defaultWidth: 0.85
+  maxWidth: 1.15
 
 - type: speciesBaseSprites
   id: MobVulpkaninSprites

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -4,6 +4,8 @@
   description: job-description-guard
   playTimeTracker: JobPrisonGuard
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterOverallTimeRequirement
       min: 18000
     - !type:DepartmentTimeRequirement

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -4,6 +4,8 @@
   description: job-description-captain
   playTimeTracker: JobCaptain
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 150
     - !type:CharacterAgeRequirement
       min: 25
       max: 80

diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -4,6 +4,8 @@
   description: job-description-detective
   playTimeTracker: JobDetective
   requirements:
+  - !type:CharacterHeightRequirement
+    min: 160
   - !type:CharacterDepartmentTimeRequirement
     department: Security
     min: 36000 # DeltaV - 10 hours

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -4,6 +4,8 @@
   description: job-description-hos
   playTimeTracker: JobHeadOfSecurity
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 14400 #DeltaV 4 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -4,6 +4,8 @@
   description: job-description-cadet
   playTimeTracker: JobSecurityCadet
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterOverallTimeRequirement
       min: 14400 # DeltaV - 4 hours
     # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -4,6 +4,8 @@
   description: job-description-security
   playTimeTracker: JobSecurityOfficer
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterDepartmentTimeRequirement
       department: Security
   startingGear: SecurityOfficerGear

diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -5,6 +5,8 @@
   playTimeTracker: JobSeniorOfficer
   setPreference: false # DeltaV - Disable Senior Roles round start selection
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 #6 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -4,6 +4,8 @@
   description: job-description-warden
   playTimeTracker: JobWarden
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work.
       tracker: JobSecurityOfficer
       min: 43200 # DeltaV - 12 hrs

diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml
@@ -13,6 +13,12 @@
   lastNames: names_arachnid_last
   sexes:
   - Unsexed
+  minHeight: 0.9
+  defaultHeight: 1
+  maxHeight: 1.45
+  minWidth: 0.80
+  defaultWidth: 1
+  maxWidth: 1.5
 
 - type: speciesBaseSprites
   id: MobArachnidSprites

diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
@@ -7,6 +7,12 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobHumanDummy
   skinColoration: HumanToned
+  minHeight: 0.8
+  defaultHeight: 1
+  maxHeight: 1.25
+  minWidth: 0.7
+  defaultWidth: 1
+  maxWidth: 1.25
 
 # The lack of a layer means that
 # this person cannot have round-start anything

diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml
@@ -11,6 +11,12 @@
   maleFirstNames: names_moth_first_male
   femaleFirstNames: names_moth_first_female
   lastNames: names_moth_last
+  minHeight: 0.8
+  defaultHeight: 0.9
+  maxHeight: 1.3
+  minWidth: 0.70
+  defaultWidth: 0.9
+  maxWidth: 1.35
 
 - type: speciesBaseSprites
   id: MobMothSprites

diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
@@ -11,12 +11,12 @@
   maleFirstNames: names_reptilian_male
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
-  minHeight: 0.7
-  defaultHeight: 0.95
-  maxHeight: 1.25
-  minWidth: 0.65
-  defaultWidth: 0.95
-  maxWidth: 1.3
+  minHeight: 0.8
+  defaultHeight: 1.15
+  maxHeight: 1.35
+  minWidth: 0.70
+  defaultWidth: 1.15
+  maxWidth: 1.40
 
 - type: speciesBaseSprites
   id: MobReptilianSprites

diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
@@ -8,6 +8,12 @@
   markingLimits: MobSlimeMarkingLimits
   dollPrototype: MobSlimePersonDummy
   skinColoration: Hues
+  minHeight: 0.7
+  defaultHeight: 0.8
+  maxHeight: 1.1
+  minWidth: 0.65
+  defaultWidth: 0.7
+  maxWidth: 1.15
 
 - type: speciesBaseSprites
   id: MobSlimeSprites

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Species/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Species/Tajaran.yml
@@ -11,6 +11,12 @@
   maleFirstNames: firstMaleTajaran
   femaleFirstNames: firstFemaleTajaran
   lastNames: TajaranLast
+  minHeight: 0.7
+  defaultHeight: 0.8
+  maxHeight: 1
+  minWidth: 0.60
+  defaultWidth: 0.8
+  maxWidth: 1.05
 
 - type: speciesBaseSprites
   id: MobTajaranSprites

diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml
@@ -4,6 +4,8 @@
   description: job-description-blueshieldofficer
   playTimeTracker: JobBlueShieldOfficer
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterAgeRequirement
       min: 25
       max: 80

diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml
@@ -4,6 +4,8 @@
   description: job-description-security-enginer
   playTimeTracker: LPPJobSecurityEnginer
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 36000

diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml
@@ -4,6 +4,8 @@
   description: job-description-secpilot
   playTimeTracker: JobPilot
   requirements:
+    - !type:CharacterHeightRequirement
+      min: 160
     - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 14400 # 4 hrs