From 489582312d07946bce97fa5529d82b3aa6c59ed6 Mon Sep 17 00:00:00 2001 From: Ledniky Date: Wed, 11 Feb 2026 17:56:50 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=88=D1=82=D1=80=D0=B8=D1=85=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Imperial/Medieval/travellerJobs/jobs.ftl | 2 + .../entities/objects/specific/chemistry.ftl | 2 +- .../Prototypes/Imperial/Medieval/armor.yml | 15 ++++ .../Imperial/Medieval/custom_departments.yml | 1 + .../Prototypes/Imperial/Medieval/map.yml | 5 ++ .../Imperial/Medieval/travellerJobs/jobs.yml | 69 ++++++++++++++++++ .../Medieval/Misc/job_icons.rsi/alc.png | Bin 0 -> 126 bytes .../Medieval/Misc/job_icons.rsi/alchemic.png | Bin 127 -> 0 bytes .../Medieval/Misc/job_icons.rsi/meta.json | 4 +- 9 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl create mode 100644 Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml create mode 100644 Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alc.png delete mode 100644 Resources/Textures/Imperial/Medieval/Misc/job_icons.rsi/alchemic.png 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..d2b5a852130 --- /dev/null +++ b/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl @@ -0,0 +1,2 @@ +ent-MedievalTraveller = странствующий алхимик + .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..30832d5c42a 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 = Сделано иp тонкой трубки и мочевого пузыря кролика. .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..5d18ad58db3 --- /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: alchemic + jobName: job-name-InsurgencyAlchemic-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 0000000000000000000000000000000000000000..0de9f0f272e1eb2fff480f2c060ffe361e974bfc GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFquAVNAArg|wIV-dOpKo9{P&^%K z9%j&BVB`?kpu?Cfyq+PYB)gVfLOGh*j8To#SZs;FvJO_24xNTI97ou+84Mk|HZU@r X@)w_DAi2^FXdr{9tDnm{r-UW|A-5m& literal 0 HcmV?d00001 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 b0c14d23dcfa8d682df999e11e8937deda040116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|EInNuLnNjq z=d8^Bf4+fzg8>kPn1>}y%~|_CA)(1|gQt;!frChbF{9eCmh*LwL?0A0bMIoXVqiGv WDB!?+nV}hI2!p4qpUXO@geCy<=p+IF 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" From 793e23151934d56e5f432845b65e3652d260965d Mon Sep 17 00:00:00 2001 From: Ledniky Date: Wed, 11 Feb 2026 18:04:10 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml index 5d18ad58db3..8841afb20f7 100644 --- a/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml +++ b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml @@ -22,14 +22,14 @@ - !type:AddComponentSpecial components: - type: MedievalJobSpawn - spawnType: Default + spawnType: Default - type: jobIcon parent: JobIcon id: JobIconMedievalWanderingAlchemic icon: sprite: /Textures/Imperial/Medieval/Misc/job_icons.rsi - state: alchemic + state: alc jobName: job-name-InsurgencyAlchemic-medieval - type: playTimeTracker From 5befaa20916f53d7f660ebae49eb7189807887a9 Mon Sep 17 00:00:00 2001 From: Ledniky Date: Wed, 11 Feb 2026 19:21:07 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=84=D1=82?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl | 2 +- Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl b/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl index d2b5a852130..7054bb7aeb3 100644 --- a/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl +++ b/Resources/Locale/ru-RU/Imperial/Medieval/travellerJobs/jobs.ftl @@ -1,2 +1,2 @@ -ent-MedievalTraveller = странствующий алхимик +job-name-WanderingAlchemic-medieval = странствующий алхимик .desc = Короб на спине заменяет ему целую лабораторию, хотя и постоянное место жительства ему не помешает. \ No newline at end of file diff --git a/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml index 8841afb20f7..7fa5f00fd56 100644 --- a/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml +++ b/Resources/Prototypes/Imperial/Medieval/travellerJobs/jobs.yml @@ -30,7 +30,7 @@ icon: sprite: /Textures/Imperial/Medieval/Misc/job_icons.rsi state: alc - jobName: job-name-InsurgencyAlchemic-medieval + jobName: job-name-WanderingAlchemic-medieval - type: playTimeTracker id: JobMedievalWanderingAlchemic From 7809099da2490c6060431c1453b0d74b2ca328b9 Mon Sep 17 00:00:00 2001 From: Ledniky <150331005+Ledniky@users.noreply.github.com> Date: Wed, 11 Feb 2026 19:40:17 +0300 Subject: [PATCH 4/4] Update chemistry.ftl --- .../ru-RU/prototypes/entities/objects/specific/chemistry.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30832d5c42a..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 = Сделано иp тонкой трубки и мочевого пузыря кролика. + .desc = Сделано из тонкой трубки и мочевого пузыря кролика. .suffix = { "" } ent-BaseSyringe = шприц .desc = Используется для забора образцов крови у существ, или для введения им реагентов.