diff --git a/Resources/Locale/uk-UA/_Pirate/job/department-desc.ftl b/Resources/Locale/uk-UA/_Pirate/job/department-desc.ftl index 649b284a24ee..86f478596ea5 100644 --- a/Resources/Locale/uk-UA/_Pirate/job/department-desc.ftl +++ b/Resources/Locale/uk-UA/_Pirate/job/department-desc.ftl @@ -1 +1,3 @@ -department-Interdyne-description = Корпорація медично-наукової направленості. \ No newline at end of file +department-Interdyne-description = Корпорація медично-наукової направленості. + +department-dday-description = Нормандія. \ No newline at end of file diff --git a/Resources/Locale/uk-UA/_Pirate/job/department.ftl b/Resources/Locale/uk-UA/_Pirate/job/department.ftl index 25090e6c13ed..5b22ffd78ad7 100644 --- a/Resources/Locale/uk-UA/_Pirate/job/department.ftl +++ b/Resources/Locale/uk-UA/_Pirate/job/department.ftl @@ -1 +1,3 @@ -department-Interdyne = Корпорація Інтердайн \ No newline at end of file +department-Interdyne = Корпорація Інтердайн + +department-dday = Нормандія \ No newline at end of file diff --git a/Resources/Prototypes/_Pirate/Entities/Markers/jobs.yml b/Resources/Prototypes/_Pirate/Entities/Markers/jobs.yml index 942711a54783..40a8a0a517f3 100644 --- a/Resources/Prototypes/_Pirate/Entities/Markers/jobs.yml +++ b/Resources/Prototypes/_Pirate/Entities/Markers/jobs.yml @@ -11,3 +11,48 @@ - state: green - sprite: _Pirate/Markers/jobs.rsi state: adminassistant + + +# DDay Нормандія + +- type: entity + id: SpawnPointUSAEfreitor + parent: SpawnPointJobBase + name: "Ефрейтор США" + suffix: Dday, Job + components: + - type: SpawnPoint + job_id: USAEfreitor + - type: Sprite + layers: + - state: green + - sprite: Interface/Misc/job_icons.rsi + state: Unknown + +- type: entity + id: SpawnPointUSALeutenant + parent: SpawnPointJobBase + name: "Лейтенант США" + suffix: Dday, Job + components: + - type: SpawnPoint + job_id: USALeutenant + - type: Sprite + layers: + - state: green + - sprite: Interface/Misc/job_icons.rsi + state: Unknown + +- type: entity + id: SpawnPointGEREfreitor + parent: SpawnPointJobBase + name: "Ефрейтор Німці" + suffix: Dday, Job + components: + - type: SpawnPoint + job_id: USAEfreitor + - type: Sprite + layers: + - state: green + - sprite: Interface/Misc/job_icons.rsi + state: Unknown \ No newline at end of file diff --git a/Resources/Prototypes/_Pirate/Loadouts/dday.yml b/Resources/Prototypes/_Pirate/Loadouts/dday.yml new file mode 100644 index 000000000000..5b2be652a8aa --- /dev/null +++ b/Resources/Prototypes/_Pirate/Loadouts/dday.yml @@ -0,0 +1,166 @@ +# Лоадаути + +# США +# Ефрейтор +- type: startingGear + id: USAEfreitorGear + equipment: + jumpsuit: USAClothingUniformJumpsuitMercenary + back: USAWeaponSniperMosin + shoes: USAClothingShoesBootsMerc + head: USAClothingHeadHelmetMerc + gloves: USAClothingHandsGlovesMercFingerless + outerClothing: USAClothingOuterVestWebMerc + pocket1: USASpeedLoaderLightRifle + pocket2: USASpeedLoaderLightRifle + storage: + outerClothing: + - USASpeedLoaderLightRifle + - USASpeedLoaderLightRifle + - USASpeedLoaderLightRifle + +# Лейтенант +- type: startingGear + id: USALeutenantGear + equipment: + jumpsuit: USAClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain + back: USAWeaponSniperMosin + shoes: USAClothingShoesBootsMerc + head: USAClothingHeadHatBeretMerc + gloves: USAClothingHandsGlovesMercFingerless + outerClothing: USAClothingOuterVestWebMerc + pocket1: USASpeedLoaderLightRifle + pocket2: USASpeedLoaderLightRifle + storage: + outerClothing: + - USASpeedLoaderLightRifle + +# Німці + +- type: startingGear + id: GEREfreitorGear + equipment: + jumpsuit: GERClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary + back: GERWeaponSniperMosin + shoes: GERClothingShoesBootsJack + belt: GERClothingBeltMilitaryWebbing + head: GERClothingHeadHelmetMerc + gloves: USAClothingHandsGlovesMercFingerless + outerClothing: GERClothingOuterArmorBasic + pocket1: GERSpeedLoaderLightRifle + pocket2: GERSpeedLoaderLightRifle + storage: + belt: + - GERSpeedLoaderLightRifle + - GERSpeedLoaderLightRifle + - GERSpeedLoaderLightRifle + + +# Речі +# США +# Ефрейтор +- type: entity + parent: ClothingUniformJumpsuitMercenary + id: USAClothingUniformJumpsuitMercenary + categories: [HideSpawnMenu] + name: "Військова уніформа США" + +- type: entity + parent: ClothingOuterVestWebMerc + id: USAClothingOuterVestWebMerc + categories: [HideSpawnMenu] + name: "Бронежилет США" + +- type: entity + parent: ClothingHandsGlovesMercFingerless + id: USAClothingHandsGlovesMercFingerless + categories: [HideSpawnMenu] + name: "Зелені рукавиці" + +- type: entity + parent: ClothingShoesBootsMerc + id: USAClothingShoesBootsMerc + categories: [HideSpawnMenu] + name: "Зелені Боти" + +- type: entity + parent: WeaponSniperMosin + id: USAWeaponSniperMosin + categories: [HideSpawnMenu] + name: "Springfield M1903" + +- type: entity + parent: ClothingHeadHelmetMerc + id: USAClothingHeadHelmetMerc + categories: [HideSpawnMenu] + name: "Військовий шолом" + +- type: entity + parent: SpeedLoaderLightRifle + id: USASpeedLoaderLightRifle + categories: [HideSpawnMenu] + name: "обойма" + +# Лейтенант: +- type: entity + parent: ClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain + id: USAClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain + categories: [HideSpawnMenu] + name: "Військова лейтенантська уніформа США" + +- type: entity + parent: ClothingHeadHatBeretMerc + name: "Військовий берет" + id: USAClothingHeadHatBeretMerc + categories: [HideSpawnMenu] + + +# НІМЦІ +# Ефрейтор(13-16ролей): +- type: entity + parent: ClothingOuterArmorBasic + name: "Німецька бронепластинна куртка" + id: GERClothingOuterArmorBasic + categories: [HideSpawnMenu] + +- type: entity + parent: ClothingOuterCoatJacketLeather + name: "Темна німецька куртка" + id: GERClothingOuterCoatJacketLeather + categories: [HideSpawnMenu] + +- type: entity + parent: ClothingHeadHelmetMerc + name: "Військовий шолом" + id: GERClothingHeadHelmetMerc + categories: [HideSpawnMenu] + +- type: entity + parent: WeaponSniperMosin + name: "Kar98k" + id: GERWeaponSniperMosin + categories: [HideSpawnMenu] + +- type: entity + parent: ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary + name: "Sumpftarn" + id: GERClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary + categories: [HideSpawnMenu] + +- type: entity + parent: ClothingBeltMilitaryWebbing + name: "Військовий ремінь" + id: GERClothingBeltMilitaryWebbing + categories: [HideSpawnMenu] + +- type: entity + parent: ClothingShoesBootsJack + name: "Німецькі Чоботи" + id: GERClothingShoesBootsJack + categories: [HideSpawnMenu] + +- type: entity + parent: SpeedLoaderLightRifle + name: "обойма" + id: GERSpeedLoaderLightRifle + categories: [HideSpawnMenu] diff --git a/Resources/Prototypes/_Pirate/Roles/Jobs/dday.yml b/Resources/Prototypes/_Pirate/Roles/Jobs/dday.yml new file mode 100644 index 000000000000..11e0e9306383 --- /dev/null +++ b/Resources/Prototypes/_Pirate/Roles/Jobs/dday.yml @@ -0,0 +1,47 @@ +# США +# Ефрейтор + +- type: job + id: USAEfreitor + name: "Ефрейтор США" + icon: JobIconUnknown + canBeAntag: false + playTimeTracker: JobUSAEfreitor + goobcoins: 30 #Goob content + startingGear: USAEfreitorGear + requirements: + - !type:SpeciesRequirement + species: + - Human + +# Лейтенант + +- type: job + id: USALeutenant + name: "Лейтенант США" + icon: JobIconUnknown + canBeAntag: false + playTimeTracker: JobUSALeutenant + goobcoins: 30 #Goob content + startingGear: USALeutenantGear + requirements: + - !type:SpeciesRequirement + species: + - Human + + +# Німці +# Ефрейтор + +- type: job + id: GEREfreitor + name: "Ефрейтор Німці" + icon: JobIconUnknown + canBeAntag: false + playTimeTracker: JobGEREfreitor + goobcoins: 30 #Goob content + startingGear: GEREfreitorGear + requirements: + - !type:SpeciesRequirement + species: + - Human \ No newline at end of file diff --git a/Resources/Prototypes/_Pirate/Roles/Jobs/departments.yml b/Resources/Prototypes/_Pirate/Roles/Jobs/departments.yml index 4c98c192cbb4..4a0a094c97ad 100644 --- a/Resources/Prototypes/_Pirate/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Pirate/Roles/Jobs/departments.yml @@ -3,6 +3,7 @@ name: department-Interdyne description: department-Interdyne-description color: "#2d650e" + editorHidden: true roles: - CaptainInterdyne - InterdyneSecure @@ -12,4 +13,15 @@ - Interdyne - InterdyneMed - InterdynePilot - - InterdyneShaftMiners \ No newline at end of file + - InterdyneShaftMiners + +- type: department + id: Dday + name: department-dday + description: department-dday-description + editorHidden: false + color: "#2d650e" + roles: + - USAEfreitor + - USALeutenant + - GEREfreitor \ No newline at end of file diff --git a/Resources/Prototypes/_Pirate/Roles/play_time_trackers.yml b/Resources/Prototypes/_Pirate/Roles/play_time_trackers.yml index 7749877f6e80..29fcc0089bdd 100644 --- a/Resources/Prototypes/_Pirate/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Pirate/Roles/play_time_trackers.yml @@ -27,3 +27,12 @@ - type: playTimeTracker id: JobAdministrativeAssistant + +- type: playTimeTracker + id: JobUSAEfreitor + +- type: playTimeTracker + id: JobUSALeutenant + +- type: playTimeTracker + id: JobGEREfreitor \ No newline at end of file diff --git a/Resources/Prototypes/_Pirate/SquidGame/departments.yml b/Resources/Prototypes/_Pirate/SquidGame/departments.yml index a4699cac7d4d..17f0eea3203d 100644 --- a/Resources/Prototypes/_Pirate/SquidGame/departments.yml +++ b/Resources/Prototypes/_Pirate/SquidGame/departments.yml @@ -3,6 +3,7 @@ name: department-name-squidgame description: department-desc-squidgame color: "#FF1744" + editorHidden: true roles: - SquidGamePlayer - SquidGameGuardCircle