From be37fc1777a1ce8795c6c8956975c0ee5f6083bf Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Thu, 5 Mar 2026 16:00:24 +0500 Subject: [PATCH 1/8] =?UTF-8?q?=D0=BC=D1=8F=D1=8F=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/hypospray.yml | 10 +++++----- .../ADT/Recipes/Cooking/medical_recipes.yml | 20 +++++++++---------- .../Catalog/Fills/Items/firstaidkits.yml | 4 ++++ .../Objects/Specific/Medical/hypospray.yml | 20 +++++++++---------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml index 120c1b023ab..50c6d1e9dee 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml @@ -118,7 +118,7 @@ pen: maxVol: 20 reagents: - - ReagentId: Inaprovaline + - ReagentId: Epinephrine Quantity: 10 - ReagentId: DexalinPlus Quantity: 10 @@ -146,8 +146,8 @@ reagents: - ReagentId: Lacerinol Quantity: 10 - - ReagentId: TranexamicAcid - Quantity: 5 + - ReagentId: ADTStypticPowder + Quantity: 10 - type: Tag tags: - ADTMedipen @@ -172,8 +172,8 @@ reagents: - ReagentId: Bruizine Quantity: 10 - - ReagentId: TranexamicAcid - Quantity: 5 + - ReagentId: ADTStypticPowder + Quantity: 10 - type: Tag tags: - ADTMedipen diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml index 20c2e31ee40..be339be1311 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml @@ -23,8 +23,8 @@ solids: ADTBlankMediPen: 1 reagents: - Ultravasculine: 10 - Epinephrine: 5 + Diphenhydramine: 10 + Dylovene: 10 recipeType: MedicalAssembler - type: microwaveMealRecipe @@ -36,8 +36,8 @@ solids: ADTBlankMediPen: 1 reagents: - Bicaridine: 15 - TranexamicAcid: 5 + Bicaridine: 10 + ADTStypticPowder: 10 recipeType: MedicalAssembler - type: microwaveMealRecipe @@ -76,7 +76,7 @@ ADTBlankMediPen: 1 reagents: Puncturase: 10 - TranexamicAcid: 5 + ADTStypticPowder: 10 recipeType: MedicalAssembler - type: microwaveMealRecipe @@ -101,8 +101,8 @@ solids: ADTBlankMediPen: 1 reagents: - Saline: 20 - DexalinPlus: 20 + Saline: 10 + DexalinPlus: 10 recipeType: MedicalAssembler #Frontier pen recipes @@ -142,7 +142,7 @@ solids: ADTBlankMediPen: 1 reagents: - Inaprovaline: 10 + Epinephrine: 10 DexalinPlus: 10 recipeType: MedicalAssembler @@ -156,7 +156,7 @@ ADTBlankMediPen: 1 reagents: Lacerinol: 10 - TranexamicAcid: 5 + ADTStypticPowder: 10 recipeType: MedicalAssembler - type: microwaveMealRecipe @@ -169,7 +169,7 @@ ADTBlankMediPen: 1 reagents: Bruizine: 10 - TranexamicAcid: 5 + ADTStypticPowder: 10 recipeType: MedicalAssembler - type: microwaveMealRecipe diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index e295e9c1f07..a0f8caef1ac 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -23,6 +23,8 @@ amount: 2 - id: PillCanisterKelotane - id: PillCanisterDermaline + - id: BurnAutoInjector #ADT-Tweak + - id: ADTPatchBurn #ADT-Tweak - type: entity id: MedkitBruteFilled @@ -35,6 +37,8 @@ - id: Gauze - id: PillCanisterIron - id: PillCanisterCopper + - id: BruteAutoInjector #ADT-Tweak + - id: ADTPatchHealing #ADT-Tweak - type: entity id: MedkitToxinFilled diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 8b968373dc8..20282b4d33c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -228,12 +228,12 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 15 + maxVol: 20 #ADT-Tweak 15 > 20 reagents: - - ReagentId: Ultravasculine + - ReagentId: Diphenhydramine #ADT-Tweak Ultravasculine > Diphenhydramine Quantity: 10 - - ReagentId: Epinephrine - Quantity: 5 + - ReagentId: Dylovene #ADT-Tweak Epinephrine > Dylovene + Quantity: 10 #ADT-Tweak 5 > 10 #ADT Tweak Start - type: Tag tags: @@ -278,9 +278,9 @@ maxVol: 20 reagents: - ReagentId: Bicaridine - Quantity: 15 - - ReagentId: TranexamicAcid - Quantity: 5 + Quantity: 10 #ADT-Tweak 15 > 10 + - ReagentId: ADTStypticPowder #ADT-Tweak TranexamicAcid > ADTStypticPowder + Quantity: 10 #ADT-Tweak 5 > 10 #ADT Tweak Start - type: Tag tags: @@ -420,8 +420,8 @@ reagents: - ReagentId: Puncturase Quantity: 10 - - ReagentId: TranexamicAcid - Quantity: 5 + - ReagentId: ADTStypticPowder #ADT-Tweak TranexamicAcid > ADTStypticPowder + Quantity: 10 #ADT-Tweak 5 > 10 #ADT Tweak Start - type: Tag tags: @@ -515,7 +515,7 @@ - ReagentId: Saline Quantity: 10 - ReagentId: DexalinPlus - Quantity: 20 + Quantity: 10 #ADT-Tweak 20 > 10 #ADT Tweak Start - type: Tag tags: From c4a6992eb8da32efabb081852cb8e6b57b3e56af Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Thu, 5 Mar 2026 16:03:55 +0500 Subject: [PATCH 2/8] =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Specific/Medical/hypospray.ftl | 6 +++--- .../entities/objects/specific/medical/hypospray.ftl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl index 31a83c9378b..1b34abf7f99 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl @@ -11,13 +11,13 @@ ent-ADTStimulantAutoInjector = автоинъектор стимулятора .desc = Серьёзная доза сильнодействующих стимуляторов и регулирующих веществ. Содержит дезоксиэфедрин и диловен. Используйте с особой осторожностью. ent-ADTCrisisAutoInjector = аварийный автоинъектор - .desc = Экспресс-Доза стабилизаторов и сосудорасширяющих средств для лечения пациентов с последствиями от гипоксии. Содержит инапровалин и дексалин плюс. + .desc = Экспресс-Доза стабилизаторов и сосудорасширяющих средств для лечения пациентов с последствиями от гипоксии. Содержит эпинефрин и дексалин плюс. ent-ADTLacerAutoInjector = автоинъектор лацеринола - .desc = Экспресс-доза лацеринола и транексамовой кислоты, предназначенная для применения в боевых условиях. + .desc = Экспресс-доза лацеринола и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. ent-ADTBruizAutoInjector = автоинъектор бруизина - .desc = Экспресс-доза бруизина и транексамовой кислоты, предназначенная для применения в боевых условиях. + .desc = Экспресс-доза бруизина и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. ent-ADTEthylredoxrazineAutoInjector = автоинъектор этилредоксразина .desc = Экспресс-доза нейтрализаторов этанола и антитоксинов для клиентов, которые, возможно, не расчитали своих сил. Содержит этилредоксразин и диловен. "Лучший друг бармена". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 699eefd7d85..2133d7285bc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -12,15 +12,15 @@ ent-ChemicalMedipen = химический медипен ent-EmergencyMedipen = экстренный медипен .desc = Быстрый и безопасный способ стабилизации состояния пациентов в критическом состоянии для персонала без глубоких медицинских знаний. Будьте осторожны, так как легко получить передозировку эпинефрином и транексамовой кислотой. ent-AntiPoisonMedipen = автоинъектор противоядия - .desc = Экспресс-доза противоядия. Содержит ультраваскулин и эпинефрин. + .desc = Экспресс-доза противоядия. Содержит дифенгидрамин и диловен. ent-BruteAutoInjector = автоинъектор мех-повреждений - .desc = Экспресс-доза бикаридина и транексамовой кислоты, предназначенная для применения в боевых условиях. + .desc = Экспресс-доза бикаридина и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. ent-BurnAutoInjector = автоинъектор физ-повреждений .desc = Экспресс-доза дермалина и лепоразина, предназначенная для применения в боевых условиях. ent-RadAutoInjector = автоинъектор рад-повреждений .desc = Экспресс-доза антирадиационного препарата. Содержит аритразин и бикаридин. ent-PunctAutoInjector = автоинъектор пунктураза - .desc = Экспресс-доза пунктураза и транексамовой кислоты, предназначенная для применения в боевых условиях. + .desc = Экспресс-доза пунктураза и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. ent-PyraAutoInjector = автоинъектор пиразина .desc = Экспресс-доза пиразина и дермалина, предназначенная для применения в боевых условиях. ent-AirlossAutoInjector = автоинъектор удушения From 4fdd77f23e7afddbdbc6fad1421039bf371ca490 Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Thu, 5 Mar 2026 16:30:51 +0500 Subject: [PATCH 3/8] =?UTF-8?q?=D0=B1=D0=B0=D0=B3=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Specific/Medical/hypospray.yml | 4 ++-- Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml index 50c6d1e9dee..afbc4432044 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml @@ -142,7 +142,7 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 15 + maxVol: 20 reagents: - ReagentId: Lacerinol Quantity: 10 @@ -168,7 +168,7 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 15 + maxVol: 20 reagents: - ReagentId: Bruizine Quantity: 10 diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index a0f8caef1ac..0366b2ed944 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -35,8 +35,8 @@ contents: - id: Brutepack - id: Gauze - - id: PillCanisterIron - - id: PillCanisterCopper + - id: PillCanisterBicaridine #ADT-Tweak PillCanisterIron > PillCanisterBicaridine + - id: PillCanisterTricordrazine #ADT-Tweak PillCanisterCopper > PillCanisterTricordrazine - id: BruteAutoInjector #ADT-Tweak - id: ADTPatchHealing #ADT-Tweak From cd01cbdad242adff79c5f832ed01a5bac33ecddd Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Thu, 5 Mar 2026 17:34:51 +0500 Subject: [PATCH 4/8] =?UTF-8?q?=D1=82=D0=B0=D0=B0=D0=B0=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/hypospray.ftl | 16 +++-- .../objects/specific/medical/hypospray.ftl | 6 +- .../Objects/Specific/Medical/hypospray.yml | 60 ++++++++++++++++++ .../ADT/Recipes/Cooking/medical_recipes.yml | 26 ++++++++ .../Objects/Specific/Medical/hypospray.yml | 8 +-- .../Medical/medipen.rsi/diphenhydramine.png | Bin 0 -> 315 bytes .../medipen.rsi/diphenhydramine_empty.png | Bin 0 -> 409 bytes .../Specific/Medical/medipen.rsi/meta.json | 20 +++++- .../medipen.rsi/polypyrylium_oligomers.png | Bin 0 -> 328 bytes .../polypyrylium_oligomers_empty.png | Bin 0 -> 416 bytes .../Specific/Medical/medipen.rsi/sigynate.png | Bin 0 -> 320 bytes .../Medical/medipen.rsi/sigynate_empty.png | Bin 0 -> 416 bytes 12 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine.png create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine_empty.png create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers.png create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers_empty.png create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate.png create mode 100644 Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate_empty.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl index 1b34abf7f99..3cfbf38b283 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl @@ -4,20 +4,26 @@ ent-ADTCombatHypospray = боевой гипоспрей ent-ADTBlankMediPen = пустой медипен .desc = Пустой медипен с бесконечным потенциалом. Любые отклонения от рецептуры Nanotrasen недопустимы. Заправляется исключительно с помощью медицинского ассемблера. -ent-ADTHemostasisAutoInjector = гемостатический автоинъектор +ent-ADTHemostasisAutoInjector = автоинъектор от кровопотери .desc = Ощутимая доза коагулянтов и жидкостей для кровообращения. Содержит транексамовую кислоту и физиологический раствор. ent-ADTStimulantAutoInjector = автоинъектор стимулятора .desc = Серьёзная доза сильнодействующих стимуляторов и регулирующих веществ. Содержит дезоксиэфедрин и диловен. Используйте с особой осторожностью. ent-ADTCrisisAutoInjector = аварийный автоинъектор - .desc = Экспресс-Доза стабилизаторов и сосудорасширяющих средств для лечения пациентов с последствиями от гипоксии. Содержит эпинефрин и дексалин плюс. + .desc = Экспресс-доза стабилизаторов и сосудорасширяющих средств для лечения пациентов с последствиями от гипоксии. Содержит эпинефрин и дексалин плюс. -ent-ADTLacerAutoInjector = автоинъектор лацеринола +ent-ADTLacerAutoInjector = автоинъектор от порезов .desc = Экспресс-доза лацеринола и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. -ent-ADTBruizAutoInjector = автоинъектор бруизина +ent-ADTBruizAutoInjector = автоинъектор от ушибов .desc = Экспресс-доза бруизина и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. -ent-ADTEthylredoxrazineAutoInjector = автоинъектор этилредоксразина +ent-ADTEthylredoxrazineAutoInjector = автоинъектор отрезвителя .desc = Экспресс-доза нейтрализаторов этанола и антитоксинов для клиентов, которые, возможно, не расчитали своих сил. Содержит этилредоксразин и диловен. "Лучший друг бармена". + +ent-ADTSigynateAutoInjector = автоинъектор хим-повреждений + .desc = Экспресс-доза сигината и дермалина, предназначенная для применения в боевых условиях. + +ent-ADTPolypyryliumOligomersAutoInjector = продвинутый автоинъектор мех-повреждений + .desc = Экспресс-доза олигомер полипирилия и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 2133d7285bc..b824eabd2a7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -19,11 +19,11 @@ ent-BurnAutoInjector = автоинъектор физ-повреждений .desc = Экспресс-доза дермалина и лепоразина, предназначенная для применения в боевых условиях. ent-RadAutoInjector = автоинъектор рад-повреждений .desc = Экспресс-доза антирадиационного препарата. Содержит аритразин и бикаридин. -ent-PunctAutoInjector = автоинъектор пунктураза +ent-PunctAutoInjector = автоинъектор от уколов .desc = Экспресс-доза пунктураза и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. -ent-PyraAutoInjector = автоинъектор пиразина +ent-PyraAutoInjector = автоинъектор от ожогов .desc = Экспресс-доза пиразина и дермалина, предназначенная для применения в боевых условиях. -ent-AirlossAutoInjector = автоинъектор удушения +ent-AirlossAutoInjector = автоинъектор от удушения .desc = Экспресс-доза физраствора и дексалина плюс, предназначенная чтобы быстро поднять кого-нибудь на ноги. ent-SpaceMedipen = космический медипен .desc = Содержит смесь химических веществ, которые защитят вас от смертельного воздействия космоса. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml index afbc4432044..a64387f4e20 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml @@ -139,6 +139,8 @@ map: ["enum.SolutionContainerLayers.Fill"] - type: SolutionContainerVisuals emptySpriteName: lacerpen_empty + - type: Hypospray + transferAmount: 20 - type: SolutionContainerManager solutions: pen: @@ -165,6 +167,8 @@ map: ["enum.SolutionContainerLayers.Fill"] - type: SolutionContainerVisuals emptySpriteName: bruizpen_empty + - type: Hypospray + transferAmount: 20 - type: SolutionContainerManager solutions: pen: @@ -205,3 +209,59 @@ - type: Tag tags: - ADTMedipen + +- type: entity + name: sigynate auto-injector + parent: ChemicalMedipen + id: ADTSigynateAutoInjector + description: A rapid dose of sigynate, intended for combat applications. + components: + - type: Sprite + sprite: ADT/Objects/Specific/Medical/medipen.rsi + layers: + - state: sigynate + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + emptySpriteName: sigynate_empty + - type: Hypospray + transferAmount: 20 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Sigynate + Quantity: 15 + - ReagentId: Dermaline + Quantity: 5 + - type: Tag + tags: + - ADTMedipen + +- type: entity + name: sigynate auto-injector + parent: ChemicalMedipen + id: ADTPolypyryliumOligomersAutoInjector + description: A rapid dose of polypyrylium oligomers and styptic powder, intended for combat applications. + components: + - type: Sprite + sprite: ADT/Objects/Specific/Medical/medipen.rsi + layers: + - state: polypyrylium_oligomers + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + emptySpriteName: polypyrylium_oligomers_empty + - type: Hypospray + transferAmount: 20 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: PolypyryliumOligomers + Quantity: 10 + - ReagentId: ADTStypticPowder + Quantity: 10 + - type: Tag + tags: + - ADTMedipen diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml index be339be1311..c1ef6be9d09 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml @@ -184,3 +184,29 @@ Ethylredoxrazine: 15 Dylovene: 5 recipeType: MedicalAssembler + +- type: microwaveMealRecipe + id: RecipeSigynateAutoInjector + name: sigynate auto-injector + result: ADTSigynateAutoInjector + time: 5 + group: Medicinal + solids: + ADTBlankMediPen: 1 + reagents: + Sigynate: 15 + Dermaline: 5 + recipeType: MedicalAssembler + +- type: microwaveMealRecipe + id: RecipePolypyryliumOligomersAutoInjector + name: polypyrylium oligomers auto-injector + result: ADTPolypyryliumOligomersAutoInjector + time: 5 + group: Medicinal + solids: + ADTBlankMediPen: 1 + reagents: + PolypyryliumOligomers: 10 + ADTStypticPowder: 10 + recipeType: MedicalAssembler diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 20282b4d33c..6536118aa1a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -217,14 +217,14 @@ color: "#573d9e" - state: base-colorB-inhand-right - type: Sprite - sprite: Objects/Specific/Medical/medipen.rsi + sprite: ADT/Objects/Specific/Medical/medipen.rsi #ADT-Tweak layers: - - state: penacid + - state: diphenhydramine #ADT-Tweak map: ["enum.SolutionContainerLayers.Fill"] - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false - emptySpriteName: penacid_empty + emptySpriteName: diphenhydramine_empty #ADT-Tweak - type: SolutionContainerManager solutions: pen: @@ -416,7 +416,7 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 15 + maxVol: 20 #ADT-Tweak 15 > 20 reagents: - ReagentId: Puncturase Quantity: 10 diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine.png b/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine.png new file mode 100644 index 0000000000000000000000000000000000000000..d04bf2a5d68872a4e74c392a2bd4a24c9fa44df9 GIT binary patch literal 315 zcmV-B0mS}^P)Px#^+`lQR9J=W(!CDBP#6Z_mttTLgC@jaG>C}7W|DN#8*m9$qoteC$R)Ue8d>aO z5DAGyQb!_ANe7J(KZB%FJxy!|-?N?f{Jh_A073{M*jcKYb2 zi>@Jr103fIoXvyqQNu8BvTyITDWL^PeAYC8-0KeKTzEz}z+t&Up;~ceo82A&z!<|B z5hrKtB7E49d)=`tOStX(2g=>H_Ydr^0DwUPx$Q%OWYR9J=WlP^!hKp4iKj$vjhR$Tc8Xo9KgwlwMdM3GY{1d0zpCP+Z>0Z1n5 zyJVs$)S*#Js*W2FN|zJVY~&E6$CCadWDDkg<}P{ez3096eGgD56bi*Zqm>Cx=!1fo22$hPUs8Mw(xX!kK>mm z48y>6lS}<{rK8cPETp8@>*f5KbwSh4K+9eq$1(c-K1@B8`Vnuz^Sr{?@pz0gJ;fz& zAqaxPGr0s@*Ugvu>h^o>c0nn{NBSux`o4qFXjFJPr4-QHpp+txt z24f71*Pj-!m0ozUG&SrTx{JOsA)kmivVD2<_d*Ep#Xp{xwC*Xdz=>Z00000NkvXXu0mjf DDw(=Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/meta.json index 3e3dc11ddd6..7c32eb86763 100644 --- a/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/meta.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "license": "CC-BY-SA-3.0", "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka", "size": { @@ -45,6 +45,24 @@ }, { "name": "barkeepersfriend_empty" + }, + { + "name": "sigynate" + }, + { + "name": "sigynate_empty" + }, + { + "name": "polypyrylium_oligomers" + }, + { + "name": "polypyrylium_oligomers_empty" + }, + { + "name": "diphenhydramine" + }, + { + "name": "diphenhydramine_empty" } ] } diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers.png b/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers.png new file mode 100644 index 0000000000000000000000000000000000000000..5fa86122581ecaccda8165a46164650c56f6b9d2 GIT binary patch literal 328 zcmV-O0k{5%P)Px$0!c(cR9J=WlCes|Kpcm^NH5goqPo6Jc3W)(pj?V zev2T8h=U@>MT84@(iDYa9g5MkS8){lf7|`;fA{@34g^6E1mVBaTD6fy#cVN)vU9>P z%8B09PdoL!o$lAcH7%rR9EDA zP8JojqlaFjgtx%s>orwSdN0*lykn49YyOB;`teCt#`&-z`orRclH|D%lHWZ zV+_^wD>ugY?VrT+8Rwi=<}EOK9=3p`Kd|W>N-6HDUY)J0;z$318lq4DEIz*=2!bH| a2|fTLpI10q3r=PL0000Px$T1iAfR9J=WlRrztKpcjjl!6_Kb*L2T>LAiiF5R_VnhzjUbaLw_@B@@MxwttA z7W@F|R`+Ib5IZqw{I(YAX@0&MwpwVbFnt#Sf5-xV0 zgXy{>s|G+21Q-Qt0O+NteJP*?}dCeC>y;f7STCLc# z-ENn=g90ay3fs10_e26To6ShoZ(ISeOC2EuYVs9oLX5F2D|WaL0w^Ga!1KK20`z*l zNKNh1Zv)haNGb6rGfhevJ9tI~DJ4p&M(Ya z<HmwQ?LYn-b#!(b?zvabr>FKR!(~fqUS6KWw~Y@r z#rQaIxW0KY^)pX?U9rKBA3qFgDtZfMH_VhgymsmBjZrJa-kwZ2vi5MnyVs&^y3yMV z=FHmlXMbdwN|*8ms|VjExAVNWuRoOa;_>l*$$j+|?9c1#{>*5+?8m-5ij9}!@3XVg zY^Gs_Jf;z{AO3vRX3Lg!7TIVnf8W>u2yAM9O=%Q7S@?dQ-O(&dnGA<7HGh6gY;GKCb;O`IRHVMN8`}WB#uZ4T@U;`t=`MW_kTc=)e0EPmCr>mdK II;Vst0FWAr*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate_empty.png b/Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..fd2e67617115531aaecb6020cf39192c1961ace8 GIT binary patch literal 416 zcmV;R0bl-!P)Px$T1iAfR9J=Wls!wsP#A@u6o*2QR?KL@tqu-4Rd8@>JEZ@htI%B>+Nq-%#9eTW zzn~c$MI16I)+LZZxCDfzrL~me6c>{U`Dl@d%YBvvPTu#Ndq@Hji9{m#XOtx2PQUhp z`$ng&0QkO-q9l&|id>plDeqD#?}lNrHct)E=(Lr`*QYSZ&qlIj<&li8?jP?TVv9G1 zI|Wo#Wpw`>>f0v=)3iv{w=WL>)M_<^5G*F+P@4&XuIsVOg%E6hUp>!TFMw&9k(z=A zhJfq3D6@}H8@q1o;($FAT-Rkfovs%k&Ri{SF>q|=`68BOQ4q^z^UwFxc?-Zv)>8un z<^jE4FZ1s(@%6ntJqyhTj?MYaRrWstRx~hhY=A#Amq;WM3BVWPV|BT(n&!Fy0000< KMNUMnLSTZIrnp@I literal 0 HcmV?d00001 From af5b43051423b021a358773b9f45a44f297bf391 Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Thu, 5 Mar 2026 17:41:27 +0500 Subject: [PATCH 5/8] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B5=D0=B7=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Recipes/Cooking/medical_recipes.yml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml index c1ef6be9d09..c1845df571a 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/medical_recipes.yml @@ -105,6 +105,32 @@ DexalinPlus: 10 recipeType: MedicalAssembler +- type: microwaveMealRecipe + id: RecipeSigynateAutoInjector + name: sigynate auto-injector + result: ADTSigynateAutoInjector + time: 5 + group: Medicinal + solids: + ADTBlankMediPen: 1 + reagents: + Sigynate: 15 + Dermaline: 5 + recipeType: MedicalAssembler + +- type: microwaveMealRecipe + id: RecipePolypyryliumOligomersAutoInjector + name: polypyrylium oligomers auto-injector + result: ADTPolypyryliumOligomersAutoInjector + time: 5 + group: Medicinal + solids: + ADTBlankMediPen: 1 + reagents: + PolypyryliumOligomers: 10 + ADTStypticPowder: 10 + recipeType: MedicalAssembler + #Frontier pen recipes - type: microwaveMealRecipe @@ -184,29 +210,3 @@ Ethylredoxrazine: 15 Dylovene: 5 recipeType: MedicalAssembler - -- type: microwaveMealRecipe - id: RecipeSigynateAutoInjector - name: sigynate auto-injector - result: ADTSigynateAutoInjector - time: 5 - group: Medicinal - solids: - ADTBlankMediPen: 1 - reagents: - Sigynate: 15 - Dermaline: 5 - recipeType: MedicalAssembler - -- type: microwaveMealRecipe - id: RecipePolypyryliumOligomersAutoInjector - name: polypyrylium oligomers auto-injector - result: ADTPolypyryliumOligomersAutoInjector - time: 5 - group: Medicinal - solids: - ADTBlankMediPen: 1 - reagents: - PolypyryliumOligomers: 10 - ADTStypticPowder: 10 - recipeType: MedicalAssembler From 746082621e145f44253f6882054de37a733d2dc1 Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Fri, 6 Mar 2026 07:59:35 +0500 Subject: [PATCH 6/8] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Specific/Medical/hypospray.ftl | 2 +- .../ADT/Entities/Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Specific/Medical/hypospray.yml | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl index 3cfbf38b283..b82049ecf72 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl @@ -26,4 +26,4 @@ ent-ADTSigynateAutoInjector = автоинъектор хим-поврежден .desc = Экспресс-доза сигината и дермалина, предназначенная для применения в боевых условиях. ent-ADTPolypyryliumOligomersAutoInjector = продвинутый автоинъектор мех-повреждений - .desc = Экспресс-доза олигомер полипирилия и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. + .desc = Экспресс-доза олигомеров полипирилия и кровоостанавливающей пудры, предназначенная для применения в боевых условиях. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml index a64387f4e20..fcd098a6c9c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml @@ -239,7 +239,7 @@ - ADTMedipen - type: entity - name: sigynate auto-injector + name: polypyrylium oligomers auto-injector parent: ChemicalMedipen id: ADTPolypyryliumOligomersAutoInjector description: A rapid dose of polypyrylium oligomers and styptic powder, intended for combat applications. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 6536118aa1a..a409b568b30 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -225,6 +225,13 @@ maxFillLevels: 1 changeColor: false emptySpriteName: diphenhydramine_empty #ADT-Tweak + #ADT-Tweak-Start + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + #ADT-Tweak-End - type: SolutionContainerManager solutions: pen: @@ -410,7 +417,7 @@ emptySpriteName: punctpen_empty - type: Hypospray solutionName: pen - transferAmount: 15 + transferAmount: 20 #ADT-Tweak 15 > 20 onlyAffectsMobs: false injectOnly: true - type: SolutionContainerManager From 22c8d35bc637ae821e5fb1df98ffa5217719b40d Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Sun, 12 Apr 2026 19:59:48 +0500 Subject: [PATCH 7/8] =?UTF-8?q?=D1=82=D0=B0=D0=BA=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/WizdenContentFreeze/WizdenContentFreeze.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs index 0f8a12effb1..91d0bda4d0d 100644 --- a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs +++ b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs @@ -24,7 +24,7 @@ public async Task MicrowaveRecipesFreezeTest() var protoMan = server.ProtoMan; var recipesCount = protoMan.Count(); - var recipesLimit = 332; // ADT: Updated limit from 220 (Corvax пельмени <3 //218) + var recipesLimit = 335; // ADT: Updated limit from 220 (Corvax пельмени <3 //218) if (recipesCount > recipesLimit) { From fe2c3fd6cba4902ea129b2f04745bbcf3cbf9f4b Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Sun, 12 Apr 2026 20:27:35 +0500 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A2=D0=B0=D0=BA=3F=3F=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/WizdenContentFreeze/WizdenContentFreeze.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs index 91d0bda4d0d..82bb2a611fe 100644 --- a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs +++ b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs @@ -24,7 +24,7 @@ public async Task MicrowaveRecipesFreezeTest() var protoMan = server.ProtoMan; var recipesCount = protoMan.Count(); - var recipesLimit = 335; // ADT: Updated limit from 220 (Corvax пельмени <3 //218) + var recipesLimit = 334; // ADT: Updated limit from 220 (Corvax пельмени <3 //218) if (recipesCount > recipesLimit) {