From cf717a7661d0dd81c7dd292c54a67f57bd8e7c0b Mon Sep 17 00:00:00 2001 From: Fansana Date: Wed, 1 Jan 2025 08:40:12 +0100 Subject: [PATCH 1/4] up command time --- .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 12 ++++++------ .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 2 +- .../Roles/Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 4 +++- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 07104382ecd..2da8568c3ea 100644 --- 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 index 2a8d864acc4..b7f30ce6c27 100644 --- 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 index 32827f5dadd..f020d5eaf38 100644 --- 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 index 0b8c13d65b7..8fca8ac73eb 100644 --- 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 index efc4c7078d6..2fdf9b1ba00 100644 --- 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 index 61f94d3e57c..66582e6af3b 100644 --- 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 index b3ad19380ca..0fdcffe6895 100644 --- 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" From b8d97abd43d2b9404037a662dc118e59b0b6f734 Mon Sep 17 00:00:00 2001 From: Cprn-Sprkl Date: Thu, 2 Jan 2025 14:20:34 -0500 Subject: [PATCH 2/4] Added expected tag to prevent crash. Added the tag "GlassesNearsight" to the tag list in tags.yml and tagged the glasses prototype with it. The crafting graph for prescription huds expects this tag. --- Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml | 1 + Resources/Prototypes/tags.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 7a9175b3aac..9a7a0a57a17 100644 --- 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/tags.yml b/Resources/Prototypes/tags.yml index e475144c539..c0ed329c039 100644 --- 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 From e2a0afe27ad947ae4d4a552a18a1ba4cf2495d08 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Fri, 3 Jan 2025 03:27:19 +0000 Subject: [PATCH 3/4] Automatic Changelog Update (#449) --- Resources/Changelog/Floof.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 323da7587a7..2ff9df097a3 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -2075,3 +2075,10 @@ 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 From 27e10eca7b6d0b68da42da55da43ae9bd6331508 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:44:47 +0000 Subject: [PATCH 4/4] Automatic Changelog Update (#447) --- Resources/Changelog/Floof.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 2ff9df097a3..9bad6a66ec4 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -2082,3 +2082,14 @@ Entries: 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