From 3b7c001e30c19d4776c3c2f53830aaa6ff195abd Mon Sep 17 00:00:00 2001 From: Zakvielian Date: Mon, 3 Aug 2026 20:18:45 +0300 Subject: [PATCH 1/3] Hot fix --- .../Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs | 2 ++ .../Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs b/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs index 07da5576d1f..05a447fc131 100644 --- a/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs +++ b/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs @@ -35,6 +35,8 @@ private void OnTargetCaptured(TargetOverlayShootEvent args) var performer = GetEntity(args.Performer); var sender = GetEntity(args.Sender.Value); + if (!PassesSpellPrerequisites(sender, performer, Transform(performer).Coordinates)) return; + if (!TryComp(performer, out var spellCasterComponent)) return; if (!TryComp(sender, out var actionComponent)) return; if (actionComponent.Cooldown.HasValue && actionComponent.Cooldown.Value.End >= _timing.CurTime) return; diff --git a/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs b/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs index ac42ed12671..08454d3316e 100644 --- a/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs +++ b/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs @@ -109,7 +109,7 @@ protected bool PassesSpellPrerequisites(EntityUid spell, EntityUid performer, En RaiseLocalEvent(spell, ref ev); if (_handsSystem.TryGetEmptyHand(performer, out _) == false) // TODO: Если в игре появятся магические катализаторы (посохи, палочки), что дают баффы при сотворении чар, то нужно будет добавить их в исключение - return ev.Cancelled; + return false; return !ev.Cancelled; } From b12fb7beeb9e3431d1ebf5f656f244a2c96f54e2 Mon Sep 17 00:00:00 2001 From: Zakvielian Date: Wed, 5 Aug 2026 21:17:58 +0300 Subject: [PATCH 2/3] resprite --- .../blood_splatter_1.rsi/blood_splatter.png | Bin 1186 -> 1554 bytes .../blood_splatter_2.rsi/blood_splatter.png | Bin 799 -> 926 bytes .../blood_splatter_3.rsi/blood_splatter.png | Bin 680 -> 368 bytes .../blood_splatter_4.rsi/blood_splatter.png | Bin 714 -> 368 bytes .../Decoration/bonfire.rsi/bonfire.png | Bin 652 -> 1130 bytes .../Decoration/bonfire.rsi/burning.png | Bin 2049 -> 3921 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png index b148bd88d30d545613ebd034b4cbacd56fc0616e..0fabfdb3549f0074c0875f207b4fc42f44ed0950 100644 GIT binary patch delta 1524 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 diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png index 1d7b13b504b333654f9a390a663aede23ceae3e3..12d758c2521acf616d09b9675df4234ffca35430 100644 GIT binary patch delta 329 zcmV-P0k;0i1@HopFn<9mNklmI|rUuVX`o2W^b z9mAF!$I|?Nc09`fYr+Y#lRhGE16U)<$ces2lo2+^OUh3CWq(h;y1-|~Qb07}cx$43CL0K~(3J@#;tcQ^I`C`nwn2YlVcCyU;KJ{!aU3D&KU9I`8ir#T~*i_gWpYq_v0~2 z^>K;UvdcUd0Pxl{w*8&(D&nAAq7_PEndbn2vaY+axR~xbCgcB0Y7aQiGP}_l^DMJh zTs|Z_&obL4AAj0O7(C{MpM{rngD0P^DilfqfX!yJF0QvA^kc^UEG8wX1l$=TR%MBu zF|k``0RXGAg#R^ylcZbbd6ygkC%#ouqEO0zk3WmWZOk_$)q=Kd=cpg}sw~kQ4l%}X zE{0W7io?f;004OxX8lxBS|#PBDr*6V5bdX{vSnSn?|&@-;kCb$lT-y9kza|RWcYQf zx9938Dee7Yf&0Y*%RCQJ1-lk^qct{K<8{9W+C8C{khV~&zgPXP{{2k8x+YZt$5Pg{ zKM}^56t=hbL#P(it3D`{!duhWY&H|_AZVHA*l3MHDbX%OLmmWme`m^7&&LG3eJ7LK zOOVhDfq!d5`$;bz)@#2-9L%|-^DFFUucw-@Ou!rFCY8S*(p430viW;KckpG7NB@!_ zr?AesM;{jic^nf16EH0?C)!Dzm+kf>e&9u*f1h97bCSu2lm|}X`IYx&yT#6!;Qxg1 zRm(XwJO!m|*!Gb}@CCc9>yy@d;8WI{!xoe-Y9A9}%q}U}z1_9`0IYe^tyN=S;{X5v M07*qoM6N<$f{t!SLI3~& diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png index 81418d83ee025ccde90364726cd93ccaa12697ea..772e013e4e068e887206069b9114b491a5285c1a 100644 GIT binary patch delta 1110 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 literal 2049 zcmb7F`#;l-7ysa4H{{- zGiQC!z(px+Iz4h}5O=r7@OYf+y~spQ2sXpeMJeaooq^#o&mftf`hIFg0iCV7|9L^5 z-C?5e#jz8~MN2^r?aN?jRLu9~U)GeQiP#AV(f0OEA|{odmg?(G@N1+GI<47B0`fEi zuWHKRb!Elyvtd->J(~uP_53vjsRN=*?DXY)5h{#W3K5v1I^6z7!5Xc7T~l6kHdg|r zb1pXvt?b&~UM)4OJFJbGr`(viY{(qD~&hM@)R5Uf;I&*MA zgOW4)RYLm0SAI#VTw%USLA;P6F&M@a)%~kG@^N9~Do!o7KSQQu8DS|@Ur^vvFB=+l zVUQsL)V++-SeOm_x;N1^REnG+#2xa-7!;nZHkV|uWHO0%dygdC-g4WJE-)>c5eV3f zQf~N?;-EuL%eakIu9dT+F4N7)Rf%5%`H4d4p*gw)OiphrsWGqaZg1_A&lz6k|71;X zUkc4~3Sx@x#TBbHgn^&tEe%+Gl3lTNdn#gkS|SGCpdlm2)(Ugpan00eJ)Hf0em<0W zB%lDXIdmBoKD`0-fVPB&UOqS-?jNE`ohrsZ(>_7h4mDl0N*luTZ3%#}o3EDz-G;RN ztmFpM=bDb9V;QA6U@();{Q=EU^%RZPLtAV(Q5{EeS>39lOQ(=NCTxqI68k(o zno)LiJ3QQ1AAObYNL5Ygmd$Y{z#fz~yFVK*Qr#RbOQ(R!D<2l&x9F)v*(-X;0%v?Z zzgavq!-?k&KLs;E6Uh_aRTk^SOsOK}TdlmE74qKhk7gpaZ-=nbw@(m`gn zoCB3FQ8>BuK=?Rk$#PC>SR<>}ALC}K$uc4dY5sfA_>QE`c{l0+X9?q+$pps(Il!y8 z+K&1D%B_onX+E2q3A{Yfh)#H1p1;w4wB}tb>KMo{Wxek8Io{c9ZfoNWoWZ3#9sKBa z$zqk?fh~kE1%dl5WFG#AGNeY1$2vE|eMI{e@4K))^2j%5n=we1q|EKs3VESy?}bD4 z{cfXPYfScOzn!Vdt_V1v99?3erejJST^Hiq!=$&As6c8&nW73d+iazi^n_ewJ^B>N zTV`}7%R|b>*m~`b-V5&dk~ODrDZkHU@1$JDn8NkTb-zt5>G5r|8n2oKgE^fNrcySg zlo^kNdO#4m`=PSH&4eHbd=;a^JK3u;Qf^Ws0P);PVj+*PikBl(S9)!mpF&^&^!F4z z2qUmLge7)j`H5*zoWd*N3WhC$)3GlGBu?@wXU%sedpj9u=)1eleu$GG7;n- znr*5CZzX3|xZeJIMdJR`nW|9mg6C&Qj(hQ5)hS(O)FT4a)_eo7>i0?;#M^NX+d z1!J8A+PlEUxXJm+*vyAyLD{SArGA`4r&A7QARf=heFZQ%yUIHw!MNjJ=*ec%tHiW} zdMlP_ykV^ebXv@acNSQeTAgwaBJ+f!d(pRJzwd|0)nDiKFT#(^iwNUMN2#L-aDhCj z0J|w(uRoa3L{i4T0uJ5_5*p+_Lw)&%b=;-dprIne7zG+AAee~nidM319e-RjdIQTd zS-*Qxoqt|h{Mwfd%G}Sl$3|u&7Kt~@{xrt1g8f)@ zk1Ja=Q0ibaP~w03^bbE|bsrFz*|q+rHa9ef5vm#SAqfBztjOUF?{M^5u*++(E@(>`PLHc zu^-0>w6Y=wR7Y8{p0Z7Dg>RLc`81LLt4^A;4|L?Z+IRR&B^zh72N#dtxZnBHK4vC= zqYXx5Ya4=Xo?uURT9K~oq`6EV7H<PrIg9VIjq7o*Ch}%I`Vii|5yFYbkJ&_)#yr333E{>smRAEY&;J57NnK}mwEtgp5U~r& YLMMtS`0B3&>vj6}9 From 83dda479056556b131b79b4ffe9896f23d66509d Mon Sep 17 00:00:00 2001 From: Zakvielian Date: Wed, 5 Aug 2026 22:36:23 +0300 Subject: [PATCH 3/3] bedT2 --- .../ru-RU/Imperial/Medieval/medieval.ftl | 6 ++ .../Prototypes/Imperial/Medieval/decor.yml | 55 ++++++++++++++++++ .../Prototypes/Imperial/Medieval/lathes.yml | 1 + .../Decor/medieval_decor.rsi/bedT2.png | Bin 0 -> 348 bytes .../Decor/medieval_decor.rsi/meta.json | 3 + 5 files changed, 65 insertions(+) create mode 100644 Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png diff --git a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl index 39cf908a2e3..0734ae06604 100644 --- a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl +++ b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl @@ -1319,6 +1319,12 @@ ent-MedievalGallows = виселица ent-MedievalMedicalBed2Craft = заготовка роскошной кровати .desc = Кликните с заготовкой в активной руке по месту, куда вы хотите разместить объект, чтобы смастерить старинную кровать. .suffix = { "Средневековье" } +ent-MedievalBedT2 = кровать + .desc = Обычная кровать. + .suffix = { "Средневековье, декор" } +ent-MedievalBedT2Craft = заготовка кровати + .desc = Кликните с заготовкой в активной руке по месту, куда вы хотите разместить объект, чтобы смастерить кровать. + .suffix = { "Средневековье, декор" } ent-MedievalGoldOre = золотая руда .desc = Драгоценный металл. .suffix = { "Средневековье, ресурс" } diff --git a/Resources/Prototypes/Imperial/Medieval/decor.yml b/Resources/Prototypes/Imperial/Medieval/decor.yml index ec577d8d452..febb3f75080 100644 --- a/Resources/Prototypes/Imperial/Medieval/decor.yml +++ b/Resources/Prototypes/Imperial/Medieval/decor.yml @@ -1361,6 +1361,61 @@ - type: MedievalPlagueHealStrapped level: 2 +- type: entity + parent: Bed + id: MedievalBedT2 + components: + - type: Strap + buckleTime: 0.5 + unbuckleTime: 0.5 + buckleSound: + path: /Audio/Imperial/Medieval/Effects/lay_on_bed1.ogg + unbuckleSound: + path: /Audio/Imperial/Medieval/Effects/lay_on_bed2.ogg + - type: Buckle + - type: BloodRegenBed + bloodRegenMultiplier: 2.0 + - type: Sprite + sprite: Imperial/Medieval/Decor/medieval_decor.rsi + state: bedT2 + - type: HealOnBuckle + damage: + groups: + Brute: -0.2 + Burn: -0.2 + Airloss: -0.4 + types: + Poison: -0.16 + Caustic: -0.05 + Radiation: -0.07 + - type: MedievalPlagueHealStrapped + +- type: entity + id: MedievalBedT2Craft + parent: BaseItem + components: + - type: RDWeight + value: 25 + - type: Item + size: Normal + - type: SpawnAfterInteract + prototype: MedievalBedT2 + doAfter: 15 + deleteOnInteract: true + - type: Sprite + sprite: Imperial/Medieval/CraftBosses/stockade.rsi + state: icon + +- type: CP14Recipe + id: MedievalBedT2Recipe + craftTime: 10 + stacks: + Cloth: 10 + WoodPlank: 10 + MedievalGrass: 3 + Cotton: 2 + result: MedievalBedT2Craft + - type: entity id: MedievalDecorAnons parent: MedievalBannerBase diff --git a/Resources/Prototypes/Imperial/Medieval/lathes.yml b/Resources/Prototypes/Imperial/Medieval/lathes.yml index e9a28f2534f..5b59d775917 100644 --- a/Resources/Prototypes/Imperial/Medieval/lathes.yml +++ b/Resources/Prototypes/Imperial/Medieval/lathes.yml @@ -962,6 +962,7 @@ - MedievalCartRecipe - MedievalDecorBoxEmptyRecipe - MedievalFlagpoleShipRecipe + - MedievalBedT2Recipe - type: entity parent: MedievalFoundry diff --git a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png new file mode 100644 index 0000000000000000000000000000000000000000..8d70cdc8a4bdb62f2e26bb335915e00841859c96 GIT binary patch literal 348 zcmV-i0i*s>Nk&Fg0RRA3MM6+kP&iCT0RR9mAHW9?C&3_+q(+AT4B%f{&N;)s4K|V_ zrx8Y+Db)X8#&#s8VjW3Rs>3A<@(+jr_;Y_Q^B*+Xtq-;A09^or+KX=z4;)(Cm_G_} zx)Y2!N$36eajn-|_fKJ#+mBBleeL=}8$0lJ+UL6fz~_$N-kbk{b8owTzWqDnN0@=N zHjQI|B-?h{D9p?#E1>=F(QQy>J-j!f{|ei-ZKTd59e1SvonwDp4Q7du`(1Uw%-}kw z%?4uux~_v*%-fv}pxR1euR|XgH^r?)D(tth*JTV0YH_g|rDV@`o(r;(txmS@hy^;mVfytQvt!^z=G>eA^tKjRE-hIz@bZ+nr(6 uN7`HLQK#5RlR4PyOZGQZJ)B-Tj^}hrc6CsId?2_@mOhvWUBz^@v9>M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json index ca89ac4f3b9..dda4f3d6457 100644 --- a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json +++ b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json @@ -115,6 +115,9 @@ { "name": "bed2" }, + { + "name": "bedT2" + }, { "name": "wheat2" },