diff --git a/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl b/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl new file mode 100644 index 00000000000..7054bb7aeb3 --- /dev/null +++ b/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl @@ -0,0 +1,2 @@ +job-name-WanderingAlchemic-medieval = странствующий алхимик + .desc = Короб на спине заменяет ему целую лабораторию, хотя и постоянное место жительства ему не помешает. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/prototypes/entities/objects/specific/chemistry.ftl b/Resources/Locale/ru-RU/prototypes/entities/objects/specific/chemistry.ftl index 2e1e0676311..ba184e353ce 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/objects/specific/chemistry.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/objects/specific/chemistry.ftl @@ -14,7 +14,7 @@ ent-BluespaceBeaker = блюспейс мензурка .desc = Работает на экспериментальной блюспейс технологии. .suffix = { "" } ent-Dropper = пипетка - .desc = Используется для перемещения небольших объемов реагентов между емкостями. + .desc = Сделано из тонкой трубки и мочевого пузыря кролика. .suffix = { "" } ent-BaseSyringe = шприц .desc = Используется для забора образцов крови у существ, или для введения им реагентов. diff --git a/Resources/Prototypes/Imperial/Medieval/armor.yml b/Resources/Prototypes/Imperial/Medieval/armor.yml index 8ffe07d717f..c294370df9b 100644 --- a/Resources/Prototypes/Imperial/Medieval/armor.yml +++ b/Resources/Prototypes/Imperial/Medieval/armor.yml @@ -923,6 +923,21 @@ examine: explosion-resistance-contents-coefficient-value damageCoefficient: 0.025 +- type: entity + parent: MedievalAlchemicBelt + id: MedievalAlchemicBeltFull + components: + - type: StorageFill + contents: + - id: MedievalChemistryEmptyBottle01 + - id: MedievalChemistryEmptyBottle01 + - id: MedievalChemistryEmptyBottle02 + - id: MedievalChemistryEmptyBottle02 + - id: MedievalChemistryEmptyBottle03 + - id: MedievalChemistryEmptyBottle03 + - id: MedievalChemistryEmptyBottle04 + - id: MedievalChemistryEmptyBottle04 + - type: entity parent: Clothing id: MedievalClothingFeetSteel diff --git a/Resources/Prototypes/Imperial/Medieval/custom_departments.yml b/Resources/Prototypes/Imperial/Medieval/custom_departments.yml index 5c9934a519a..65012144b90 100644 --- a/Resources/Prototypes/Imperial/Medieval/custom_departments.yml +++ b/Resources/Prototypes/Imperial/Medieval/custom_departments.yml @@ -13,6 +13,7 @@ - MedievalChaplain - MedievalWanderMag - MedievalArchivist + - MedievalWanderingAlchemic - type: department id: Legion diff --git a/Resources/Prototypes/Imperial/Medieval/map.yml b/Resources/Prototypes/Imperial/Medieval/map.yml index bb4752b6a63..ac8fd35a4a5 100644 --- a/Resources/Prototypes/Imperial/Medieval/map.yml +++ b/Resources/Prototypes/Imperial/Medieval/map.yml @@ -21,6 +21,7 @@ MedievalInnkeeperN: [ 1, 1 ] MedievalChaplain: [ 7, 7 ] MedievalWanderMag: [ 4, 4 ] + MedievalWanderingAlchemic: [ 2, 2 ] # Legion (29 total) MedievalLegionJailed: [ 5, 5 ] MedievalLegionJailer: [ 1, 1 ] @@ -104,6 +105,7 @@ MedievalInnkeeperN: [ 1, 1 ] MedievalChaplain: [ 5, 5 ] MedievalWanderMag: [ 3, 3 ] + MedievalWanderingAlchemic: [ 1, 1 ] # Legion (22 total) MedievalLegionRecruit: [ 6, 6 ] MedievalLegionLegioner: [ 8, 8 ] @@ -185,6 +187,7 @@ MedievalInnkeeperN: [ 1, 1 ] MedievalChaplain: [ 3, 3 ] MedievalWanderMag: [ 2, 2 ] + MedievalWanderingAlchemic: [ 1, 1 ] # Legion (15 total) MedievalLegionRecruit: [ 3, 3 ] MedievalLegionLegioner: [ 5, 5 ] @@ -265,6 +268,7 @@ MedievalInnkeeperN: [ 1, 1 ] MedievalChaplain: [ 2, 2 ] MedievalWanderMag: [ 1, 1 ] + MedievalWanderingAlchemic: [ 1, 1 ] # Legion (11 total) MedievalLegionRecruit: [ 3, 3 ] MedievalLegionLegioner: [ 3, 3 ] @@ -340,6 +344,7 @@ MedievalInnkeeperN: [ 1, 1 ] MedievalChaplain: [ 1, 1 ] MedievalWanderMag: [ 1, 1 ] + MedievalWanderingAlchemic: [ 1, 1 ] # Legion (8 total) MedievalLegionRecruit: [ 2, 2 ] MedievalLegionLegioner: [ 2, 2 ] diff --git a/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml new file mode 100644 index 00000000000..7fa5f00fd56 --- /dev/null +++ b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml @@ -0,0 +1,69 @@ +# Странствующий алхимик + + +#### +- type: job + id: MedievalWanderingAlchemic + parent: MedievalTraveller + name: job-name-WanderingAlchemic-medieval + description: job-description-WanderingAlchemic-medieval + playTimeTracker: JobMedievalWanderingAlchemic + startingGear: MedievalWanderingAlchemicGear + icon: "JobIconMedievalWanderingAlchemic" + requirements: + - !type:SpeciesRequirement + species: + - Orc + - Skeleton + inverted: true + - !type:OverallPlaytimeRequirement + time: 14400 + special: + - !type:AddComponentSpecial + components: + - type: MedievalJobSpawn + spawnType: Default + +- type: jobIcon + parent: JobIcon + id: JobIconMedievalWanderingAlchemic + icon: + sprite: /Textures/Imperial/Medieval/Misc/job_icons.rsi + state: alc + jobName: job-name-WanderingAlchemic-medieval + +- type: playTimeTracker + id: JobMedievalWanderingAlchemic + +- type: startingGear + id: MedievalWanderingAlchemicGear + equipment: + pocket2: MedievalRevent50 + jumpsuit: MedievalClothingUniformJumpsuitShitCloth68 + belt: MedievalAlchemicBeltFull + back: MedievalClothingBackpackBox + storage: + back: + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalChemistryRecipe + - MedievalRecipeBook + - MedievalMortarNew + - MedievalMortarTool + - Dropper + +- type: roleLoadout + id: JobMedievalWanderingAlchemic + groups: + - TravellerHead + - MedievalNeck + - MedievalShoes + - MedievalTrinkets + - MedievalGloves diff --git a/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alc.png b/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alc.png new file mode 100644 index 00000000000..0de9f0f272e Binary files /dev/null and b/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alc.png differ diff --git a/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alchemic.png b/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alchemic.png deleted file mode 100644 index b0c14d23dcf..00000000000 Binary files a/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alchemic.png and /dev/null differ diff --git a/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/meta.json b/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/meta.json index 3fc739f5d9e..e002fd60d21 100644 --- a/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "this content is under ICLA licence, read more on https://wiki.imperialspace.net/icla", + "license": "this content is under ICLA licence, read more on https://wiki.imperialspace.net/icla, resprite alc of Ledniky", "copyright": "by zhenya28 and dantanat for imperial space", "size": { "x": 8, @@ -53,7 +53,7 @@ "name": "farmer" }, { - "name": "alchemic" + "name": "alc" }, { "name": "band_common"