From 2712744e811b6e24d0df67108fe86e09d75d7b87 Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 3 Feb 2024 05:34:39 +0300 Subject: [PATCH 1/5] added translation for combat department --- Resources/Locale/ru-RU/TS/job-misc.ftl | 6 +++++- Resources/Prototypes/TS/Roles/CombatMisc.yml | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/TS/job-misc.ftl b/Resources/Locale/ru-RU/TS/job-misc.ftl index 0ea427f904..21cb3515e9 100644 --- a/Resources/Locale/ru-RU/TS/job-misc.ftl +++ b/Resources/Locale/ru-RU/TS/job-misc.ftl @@ -24,4 +24,8 @@ JobPlatoonCommander = Командир взвода # Supervisors job-supervisors-platoon = Командиру взвода и Командиру отделения -job-supervisors-part-pc = Командиру взвода \ No newline at end of file +job-supervisors-part-pc = Командиру взвода + +# Departments +department-Combat = Военный гарнизон +department-combat-description = Сотрудники военное гарнизона выполняют разведовательные миссии за пределами станции, в других секторах. Не самые сильные во вселенной, но стрелять умеют. \ No newline at end of file diff --git a/Resources/Prototypes/TS/Roles/CombatMisc.yml b/Resources/Prototypes/TS/Roles/CombatMisc.yml index 6d9bc527d1..f003850acd 100644 --- a/Resources/Prototypes/TS/Roles/CombatMisc.yml +++ b/Resources/Prototypes/TS/Roles/CombatMisc.yml @@ -4,12 +4,13 @@ description: department-combat-description color: "#C3C3BD" roles: + - PlatoonCommander + - PartCommander - Marine - MarineMedic - MarineEngineer - MarinePilot - - PartCommander - - PlatoonCommander + # Jobs From 404aa52c7596bd4d63e1cea9705a3156989871f2 Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 3 Feb 2024 05:34:45 +0300 Subject: [PATCH 2/5] Update deterrent.yml --- Resources/Prototypes/Maps/deterrent.yml | 39 ++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Maps/deterrent.yml b/Resources/Prototypes/Maps/deterrent.yml index 3caf646236..dc05fe18ba 100644 --- a/Resources/Prototypes/Maps/deterrent.yml +++ b/Resources/Prototypes/Maps/deterrent.yml @@ -2,8 +2,9 @@ id: Deterrent mapName: 'Deterrent' mapPath: /Maps/deterrent.yml - minPlayers: 15 + minPlayers: 0 maxPlayers: 55 + fallback: true stations: Deterrent: stationProto: StandardNanotrasenStation @@ -19,5 +20,41 @@ overflowJobs: - Passenger availableJobs: +# service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 1, 1 ] +# combat + PlatoonCommander: [ 1, 1 ] + PartCommander: [ 3, 3 ] + Marine: [ 9, 9 ] + MarineMedic: [ 3, 3 ] + MarineEngineer: [ 3, 3 ] + MarinePilot: [ 2, 2 ] +# engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 3, 3 ] +# medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 1, 3 ] +# science + ResearchDirector: [ 1, 1 ] + Scientist: [ 2, 2 ] + ResearchAssistant: [ 1, 3 ] + Borg: [ 4, 4 ] +# security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] +# supply + Quartermaster: [ 1, 1 ] + CargoTechnician: [ 2, 2 ] +# civillian Passenger: [ -1, -1 ] From 8ec22500d2a8d2d3f52efb1941b60baa58ad97a8 Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 3 Feb 2024 05:38:38 +0300 Subject: [PATCH 3/5] changed time for first playtest --- .../Prototypes/TS/Roles/Combat/marine.yml | 6 +++--- .../TS/Roles/Combat/marine_engineer.yml | 14 +++++++------- .../TS/Roles/Combat/marine_medic.yml | 14 +++++++------- .../TS/Roles/Combat/marine_pilot.yml | 14 +++++++------- .../TS/Roles/Combat/part_commander.yml | 7 +++++-- .../TS/Roles/Combat/platoon_commander.yml | 19 +++++++++++-------- 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Resources/Prototypes/TS/Roles/Combat/marine.yml b/Resources/Prototypes/TS/Roles/Combat/marine.yml index ae893fcf85..23a6b528f4 100644 --- a/Resources/Prototypes/TS/Roles/Combat/marine.yml +++ b/Resources/Prototypes/TS/Roles/Combat/marine.yml @@ -3,9 +3,9 @@ name: job-name-marine description: job-description-marine playTimeTracker: JobMarine - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 #2 hrs +# requirements: # First Playtest time +# - !type:OverallPlaytimeRequirement +# time: 7200 #2 hrs startingGear: MarineBaseGear icon: "JobIconMarine" supervisors: job-supervisors-part-pc diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml b/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml index 5541fb6e37..570b6d622e 100644 --- a/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml +++ b/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml @@ -3,13 +3,13 @@ name: job-name-marine-engineer description: job-description-marine-engineer playTimeTracker: JobMarineEngineer - requirements: - - !type:DepartmentTimeRequirement - department: Combat - time: 7200 #2 hrs - - !type:DepartmentTimeRequirement - department: Engineering - time: 7200 #2 hrs +# requirements: # First Playtest time +# - !type:DepartmentTimeRequirement +# department: Combat +# time: 7200 #2 hrs +# - !type:DepartmentTimeRequirement +# department: Engineering +# time: 7200 #2 hrs startingGear: MarineEngineerGear icon: "JobIconMarineEngineer" supervisors: job-supervisors-part-pc diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml b/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml index f80352d426..4e2a5647b9 100644 --- a/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml +++ b/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml @@ -3,13 +3,13 @@ name: job-name-marine-medic description: job-description-marine-medic playTimeTracker: JobMarineMedic - requirements: - - !type:DepartmentTimeRequirement - department: Combat - time: 7200 #2 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 7200 #2 hrs +# requirements: # First Playtest time +# - !type:DepartmentTimeRequirement +# department: Combat +# time: 7200 #2 hrs +# - !type:DepartmentTimeRequirement +# department: Medical +# time: 7200 #2 hrs startingGear: MarineMedicGear icon: "JobIconJobMarineMedic" supervisors: job-supervisors-part-pc diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml b/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml index f8922ebbd0..3d464fed50 100644 --- a/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml +++ b/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml @@ -3,13 +3,13 @@ name: job-name-marine-pilot description: job-description-marine-pilot playTimeTracker: JobMarinePilot - requirements: - - !type:DepartmentTimeRequirement - department: Combat - time: 7200 #2 hrs - - !type:DepartmentTimeRequirement - department: Engineering - time: 7200 #2 hrs +# requirements: # First Playtest time +# - !type:DepartmentTimeRequirement +# department: Combat +# time: 7200 #2 hrs +# - !type:DepartmentTimeRequirement +# department: Engineering +# time: 7200 #2 hrs startingGear: MarinePilotGear icon: "JobIconMarinePilot" supervisors: job-supervisors-platoon diff --git a/Resources/Prototypes/TS/Roles/Combat/part_commander.yml b/Resources/Prototypes/TS/Roles/Combat/part_commander.yml index 0a98537672..1b31efcafc 100644 --- a/Resources/Prototypes/TS/Roles/Combat/part_commander.yml +++ b/Resources/Prototypes/TS/Roles/Combat/part_commander.yml @@ -4,9 +4,12 @@ description: job-description-part-commander playTimeTracker: JobPartCommander requirements: - - !type:DepartmentTimeRequirement +# - !type:DepartmentTimeRequirement +# department: Combat +# time: 36000 #10 hrs + - !type:DepartmentTimeRequirement # First Playtest time department: Combat - time: 36000 #10 hrs + time: 1800 #30 min startingGear: PartCommanderGear icon: "JobIconPartCommander" supervisors: job-supervisors-platoon diff --git a/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml b/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml index 58b31ebbfc..c8bb2cc87d 100644 --- a/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml +++ b/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml @@ -3,16 +3,19 @@ name: job-name-platoon-commander description: job-description-platoon-commander playTimeTracker: JobPlatoonCommander - requirements: + requirements: # First Playtest time - !type:DepartmentTimeRequirement department: Combat - time: 72000 #20 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 7200 #2 hrs - - !type:DepartmentTimeRequirement - department: Engineering - time: 7200 #2 hrs + time: 7200 #2 hrs +# - !type:DepartmentTimeRequirement +# department: Combat +# time: 72000 #20 hrs +# - !type:DepartmentTimeRequirement +# department: Medical +# time: 7200 #2 hrs +# - !type:DepartmentTimeRequirement +# department: Engineering +# time: 7200 #2 hrs startingGear: PlatoonCommanderGear icon: "JobIconPlatoonCommander" supervisors: job-supervisors-captain From 600059f5cd4489949ca71d8c94ffebb73f533846 Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 3 Feb 2024 06:12:57 +0300 Subject: [PATCH 4/5] Update highsec.yml --- .../Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index d799558df7..5544f5bebf 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -57,6 +57,7 @@ - type: Weldable time: 10 - type: Airlock + openUnlitVisible: true # Corvax-Resprite-Airlocks - type: NavMapDoor - type: DoorBolt - type: AccessReader From 08601caf26f4b9bfa14aee623fc4a47e068bce8c Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 3 Feb 2024 06:18:29 +0300 Subject: [PATCH 5/5] Update paper.yml --- Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml b/Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml index efcab111b5..bda9a12f59 100644 --- a/Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml +++ b/Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml @@ -16,7 +16,7 @@ - type: entity - id: BoxFolderGreyMission1 + id: BoxFolderGreyMission parent: BoxFolderGrey suffix: mission components: