Merge branch 'Fansana:master' into Nikko-Shackles

Fansana · Jan 3, 2025 · e928b1c · e928b1c
2 parents 24381fd + 27e10ec
commit e928b1c
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 12 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -2075,3 +2075,21 @@ Entries:
   id: 264
   time: '2024-12-31T20:02:02.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/446
+- author: sprkl
+  changes:
+    - type: Fix
+      message: Fixed a crash that occurred while trying to build prescription huds.
+  id: 265
+  time: '2025-01-03T03:26:50.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/449
+- author: Fansana
+  changes:
+    - type: Tweak
+      message: >-
+        Increased department playtime requirement for department heads to 16
+        hours.
+    - type: Fix
+      message: Fixed Head of Security not requiring any security playtime.
+  id: 266
+  time: '2025-01-03T15:44:09.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/447
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -82,6 +82,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - GlassesNearsight
 
 - type: entity
   parent: ClothingEyesBase

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -10,7 +10,7 @@
   #    time: 21600 #6 hrs
     - !type:CharacterDepartmentTimeRequirement
       department: Logistics # DeltaV - Logistics Department replacing Cargo
-      min: 14400 #Floofstation 4 hour
+      min: 57600 # Floofstation - 16 hour
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -7,22 +7,22 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Logistics # DeltaV - Logistics Department replacing Cargo
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
     - !type:CharacterDepartmentTimeRequirement
       department: Engineering
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
     - !type:CharacterDepartmentTimeRequirement
       department: Medical
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
     - !type:CharacterDepartmentTimeRequirement
       department: Security
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
     - !type:CharacterDepartmentTimeRequirement # DeltaV - Epistemics dept time requirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
     - !type:CharacterDepartmentTimeRequirement
       department: Command
-      min: 14400 # Floofstation - 4 hour
+      min: 28800 # Floofstation - 8 hour
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -7,7 +7,7 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement # DeltaV - Civilian dept time requirement
       department: Civilian
-      min: 14400 # Floofstation 4 hours
+      min: 57600 # Floofstation - 16 hour
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Engineering
-      min: 14400 # Floofstation - 4 hour
+      min: 57600 # Floofstation - 16 hour
 #    - !type:OverallPlaytimeRequirement
 #      time: 72000 # DeltaV - 20 hours
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -9,7 +9,7 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Medical
-      min: 14400 # Floofstation - 4 hour
+      min: 57600 # Floofstation - 16 hour
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -7,7 +7,7 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
-      min: 14400 # Floofstation - 4 hour
+      min: 57600 # Floofstation - 16 hour
     - !type:CharacterLogicOrRequirement
       requirements:
         - !type:CharacterSpeciesRequirement

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -7,7 +7,9 @@
     - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement
       department: Command
       min: 14400 # Floofstation - 4 hour
-    - !type:CharacterWhitelistRequirement
+    - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement
+      department: Security
+      min: 57600 # Floofstation - 16 hour
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
@@ -641,6 +641,9 @@
 - type: Tag
   id: GlassBeaker
 
+- type: Tag
+  id: GlassesNearsight
+
 - type: Tag
   id: GlassShard