From 30689a6e6a7b05c4e6e95b2f79c0fe9e19b81b9a Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 5 Jan 2025 23:52:33 +0300 Subject: [PATCH 1/8] stuff --- .../_White/Entities/Objects/Weapons/chaplain_weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml index da9dfef6ae..0bee7647ac 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -347,7 +347,7 @@ - type: MeleeWeapon soundHit: path: /Audio/White/Items/hit/chainhit.ogg - range: 1.5 + range: 2 attackRate: 0.5 damage: types: From 785a6c8d1aeef53a0154eaf16e194932d7f03d5a Mon Sep 17 00:00:00 2001 From: keslik Date: Mon, 6 Jan 2025 12:05:42 +0300 Subject: [PATCH 2/8] Add: fluff ghost --- .../Prototypes/_White/Ghosts/custom_ghosts.yml | 9 +++++++++ .../Feda_Plevajecki-ghost.rsi/animated.png | Bin 0 -> 14917 bytes .../Ghosts/Feda_Plevajecki-ghost.rsi/meta.json | 15 +++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png create mode 100644 Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 283385766c..558ae3349d 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -492,3 +492,12 @@ alpha: 0.9 ghostName: nekovich ghostDescription: Law's Left Hand. + +#Feda_Plevajecki +- type: customGhost + id: Feda_Plevajecki-ghost + ckey: Feda_Plevajecki + sprite: White/Ghosts/Feda_Plevajecki-ghost.rsi + alpha: 0.9 + ghostName: Шарки + ghostDescription: Буль-буль. diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png new file mode 100644 index 0000000000000000000000000000000000000000..0c62580a94690f44e8745031d55c11b016a66365 GIT binary patch literal 14917 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json new file mode 100644 index 0000000000..6debd6afad --- /dev/null +++ b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", +"copyright": "Made by Dosharus", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "animated", + "directions": 4 + } + ] +} From 8aa5d138d5b2570087342b4e6a31395eb28e27b7 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 6 Jan 2025 13:25:12 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=9A=D0=B5=D0=BF=D0=BA=D0=B0=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D1=87=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Justice/inspector.yml | 2 -- .../flipped-equipped-HELMET-hamster.png | Bin 375 -> 1946 bytes .../cargosoft.rsi/flipped-equipped-HELMET.png | Bin 293 -> 1962 bytes .../Soft/cargosoft.rsi/flipped-inhand-left.png | Bin 276 -> 1877 bytes .../cargosoft.rsi/flipped-inhand-right.png | Bin 277 -> 1882 bytes .../Head/Soft/cargosoft.rsi/icon_flipped.png | Bin 258 -> 1838 bytes 6 files changed, 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml index 03f5c13fb8..30dba1e91c 100644 --- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml @@ -17,14 +17,12 @@ - !type:SpeciesRequirement species: - Human - - Felinid weight: 10 icon: "JobIconInspector" arrivalNotificationPrototype: InspectorArrivalNotification supervisors: job-supervisors-captain whitelistedSpecies: - Human - - Felinid canBeAntag: true access: - Service diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png index f5372ea5a3b66f97015499e4944ab8ec114c6ee3..cb151419b46fc6db79b206c5e54951b5c6ad1a24 100644 GIT binary patch literal 1946 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 delta 277 zcmZ3*zm#c$WIZzj1H;_yjcNS%G~10G|-o z&TRhmy;9dUYec%S1I4zh6-oms){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0N32s4Umcr^e8 z`#fD7Ln7SYPIKgIP~c(lKK=i`4)=_D4zUXl4jw+|I{Rv4boe7Rd2W^~<^1aTZk(&6 zj$iVxno92fNJovoi5dple-mN^&fU?A=kc%Rf@l#5U@&7flw+M`*OBv#&vF*f OZ492SelF{r5}E*)=UyWK diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png index 0ca7b1c25b402edf3b242564b513429e194de38c..1ddb63fa5271639d04ff1d1001749167a658392f 100644 GIT binary patch literal 1877 zcmbVNeQeZZ9PZ71$jBIhISmk2x<44+di}WF?XK*+eH`v1+?a5LF%jvt@9jG7+Fsl3 zZVM1Xh=3mfWCRCpPJ<26%m-hspwz^2sj4Ax3}Ac8I(wqwr|_# zeSW{^_tgzmm8EH^Q&JHGNh>dN&4>3w{d_VRUOyB<7vXK3T(($6kO?RC)3DVzVJd$l@m5atZJY zWlaiL&{XN+nwE2R9&0K(Xtlcv zEs+#}+D#PBktBuY!&RP@w%P5uC{5C4g0vE}1*b`dq!^0@jU5;?r|>>zzU%pzG5F-b z{F){+1Q8C0O<}W1QfdjxZnqO8P0%zB5xCkYYHS1-)$CCQ7f?AxkTpRPQJs%6>_cRKN5u z)bY<_48YjB-EkWa^(7dLn^3hm4NyibAP+^Wo<i)yPbV0$5E_ zJdzX`%~aK>%P4IzQE1L0LFA>dI_rTAz{P67fx)ch;iMg>Z633& zXc&5Dj(XvCGv%VHu_6b`T@DOtHVFdH*x7v6YR?Ba@1=O$Y|Eo?yCvTXrFdDMw&t@u zXB*w`lDK+3v!na@|G9sjBEZ&S1CPz4H=JG)OqrmB|o` zHLuS|z-Ao#{$jJ8nL;GbO95^tatJ)2AO?+B|)2u`&7CgB#ZOzgtrgEP5v0 zyZ-&Ja$A0`J$FC6q~Y_!SqIJmU+e9*T-A-YpGw%3)KiTdT0LcaduA19=t-!{U0qZ7 zMpD)IUHg$bgC(;NZ}(w0)0tm$x`{hE`(D`7Gk7<&Zs&#f4jk=EUc7Qj!-|?UDW4p^ ze)ef&eQICwmO%ktOV^!ug}R>*doF)7sh}(LwPD$+aBIu#mj|!2uO9nRx&0T~|Je_S zb=a2q#i32xUs{u5bI$IwUHKEMd8GusZ9F}A?n>e1Ee)@ghBv;o_aZ-|t=B!2k}@>2 zVCALMy{TPg*FIw9GyAJg5Be;>pJ_ilH15ULf$Y$|frQt0Y%WN;6I$Hg*?LKuTXyQ! z^s@uSJ!bL-QQVR~@vgHy>;94N7V@i-AEkM0V9Xyc{E5ACPwd48+MIuw>>U^UpVEdV z=XNBgc`7pZmkz@UX>DHOrD>{vY}^ienNCawy+bG_=sP=)^E NE1y&8+E=`6&EIWZm9qc< delta 259 zcmcc0H-%|}WIZzj1H;_yjcNS%G~10G|-o z&TRhmy;9dUYec%S1I4zh6-oms){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0N32s4Umcr^e8 zYdu{YLn7SYUUTGYP~dU7c&X^W@odK$Aum>CA#t_O;bMomttae}WMt}KVEiJeu%d3U z#qPG#lR`|l#ut9`Wq8uKr0yGU_*$8puf9BDnXX{A{>pjpV44$rjF6*2UngGluT15Z= diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png index 1539d6af088baf86be4ab6158e3525f7b38694ae..1b1a96ff3d58ff86819b333a711d6150c1593d8e 100644 GIT binary patch literal 1882 zcmbVNeQeZZ9PVulx7!9fkp-Dp3z6~BYp-{`tz`$y-R7p;9NWP*2l0CCySuWxwzS>u zHZTka0V6PoS%#Z@XmAq5Nkm|vI1nO#06IdV2oX^ezXyZ`BQU_Xx7!5_O5~DW-@bj` z=l6SlUwyT#^x1Ut<7Naw(o2e6iot6J#H-L_!KgBS_w?h{Ex8Ku3MRFG^1A(#O3RDhf`ll6I4Br2quP z;wBYTG?jYzraGPxuvs(Fya)>kLO|!xNGK?2Y{ZF0d0DtNwh0W4Li9Q(mTwqDtK4O1 zfvf_Qu~>1QB&}!;T-hB|F2hVmDUz}gq=TSnoFZA$%F;9%`(eN}N{GVsU~IBO;taSS_TXDGC($I8LcogHhuGPk&)*8nu0a=%|fc!7i z@z-}5fU$ME<2LT;ODGgKq3MMUP(~~u_e5)+MgaF@i4Lla!^*G zVd$ML>V@0QmPne;NjxZVIWef&B8mdb<m{UQ%A4coGdU$(()$`5AR?V=x6VEl7wi8E`UjnNd(3(xLYqfl?$3Pd ztIW;_TerWZ;riH1MOnQmpP#O#+p3RN3}hjF+kdKAw)dv7pLC{X^Su2nS&nw!W&ixL z55^#$T*6l`_<6?7Z|5ytvcqy><-G1-0x~r*<(#$sDkTwXx;L5@YVY5AZ1Xa6JOgnJ aCsUuoclCCrA6Q|0{YnZ;UER-kU-=u6L5MH_ delta 260 zcmcb`HNS%G~10G|-o z&TRhmy;9dUYec%S1I4zh6-oms){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0N32s4Umcr^e8 z>pWc?Ln7SYUfammpup4e@Y1)x^CQ>SW;JapIQ5|5|AJ!^_#Y+d+N(J*2q`e=GVxr! z9CP>AuE^r=X8K=V`!g6ie9o?oUEC+~HEG#HmXaGE@4T12pbA#ZDbVnb{Yw6{K>6(4 z|8Ij9AL5v>_>gReg&J#8NW_1^mnw;UHx3vIVCg!08!Oq A{{R30 diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png index c110321c31b088592896c0e1f0f29ac90211100d..b3f0a7936b1d3dc66fa268ff0a1d24aa8bd1809e 100644 GIT binary patch literal 1838 zcmbVNdr%a09A7+CumE4B!l=t4PCoYbad*q@>Vd#nARH2$Bk3@*x4U<@akqQzF5GcU zjhc^qF^tJTIwn)rq<=)(V+tEzWoem?Ix&coTB9hLXo;z1*l&;HMjOk?o%!wW_uJp+ z_xZlRyQZ|{xug-PBOnM$DlD*hIlnC zz+hM~7&Hb=Mp^M-1WnTzPGTg90tBkoNg5kMB{gG^!7iwrA_g>3mSCNcb;&iF4FReS z*x(PuXeBl3C*UzG#0D_Ji0d{*fIJt&1!@#uL^#i3f=}=ZlBNPI5yJ+&vL>ru`Cq7G z#}5bqzI8ZaG9Idn-yaj9YIAFW8BvEk6sYhsB(?M33F?Kni;w^0VZD&SWQ-( zvg{j-ROz6~FljLo@G}cViI;=wwEHdyc2*N?2#A^)#c7nZIthxgWHBb|4BW)v_yE)) z^P;;h2DP9#f#Q^tFfjzpnCJ(fAZK`1V;>3TImRt3eij%k`dN>F1tbpw$K1%|%RX5F zf`N9Xh!ze9Qz)q#D{(@h-G%_0jiSgiggc9LQLGEKkQ9YdS!Oe8H4y@86kp4%w2Vkn~)`F}eCbkjuicXV zN$KKNLsM&kzh!Nei|rmd^7x72EZ>uc=O&KHd+Wt_c8+$8Xu3+RdA*>v>C?TV$^8B1 zyd82+a3wwW8Jup8US6TS4D~4R4!kWsh9jA6&&Rlo#Qro6;w~JGt!`6fM z`kzvh^IAVrhM%6Pc5P^Ub>xIlU&9q>#l&&v?!4QTlXiZ4{R*PmfM4z(Kg9CwijsBj zecVj-FPY|my|eZ$48|pFo%gfBF}Y#y}jIR9k)jRVcw+pEf`B&qG#^-d!+v@bJpf049% zSEBju(aqzA+%cpev*F4?=_o0V^VUY@Q0(F*65*x%2qTK+d#@`i)} delta 241 zcmZ3-*TghIvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e6Y zeXmq!HvhHF8j)`7K(Sq6KPCey){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0N32s4Umcr^e8 zvproLLoEE?p7Z8Apupi8xbjW?*{931_6Yc-%bM&p{^BC@=K}wp@`E3eqMrIp4?iQ9 z!7?F$;RP$x>35oZOIf@#Y#A;x&U3mWaMoh-18cQKA`BruzV~l3H3~)-v21gDU+m84 iv}cA?z;C96eT Date: Mon, 6 Jan 2025 18:15:28 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DirectBallsHit/DirectBallsHitComponent.cs | 4 ++-- .../_Engi/DirectBallsHit/DirectBallsHitSystem.cs | 15 +++++++++++---- .../_White/Mood/generic_negativeEffects.yml | 6 ++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs index 8c7d981789..03deb5b847 100644 --- a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs +++ b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitComponent.cs @@ -9,10 +9,10 @@ public sealed partial class DirectBallsHitComponent : Component public TimeSpan KnockdownTime = TimeSpan.FromSeconds(2.0f); [DataField] - public TimeSpan JitterTime = TimeSpan.FromSeconds(2.0f); + public TimeSpan JitterTime = TimeSpan.FromSeconds(4.0f); [DataField] - public TimeSpan StutterTime = TimeSpan.FromSeconds(2.0f); + public TimeSpan StutterTime = TimeSpan.FromSeconds(4.0f); [DataField] public SharedStandingStateSystem.DropHeldItemsBehavior KnockDownBehavior = SharedStandingStateSystem.DropHeldItemsBehavior.AlwaysDrop; diff --git a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs index 49d2feb519..d558a3992c 100644 --- a/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs +++ b/Content.Server/_White/_Engi/DirectBallsHit/DirectBallsHitSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Content.Shared._White.Implants.NeuroControl; using Robust.Shared.Timing; using Content.Server.Chat.Systems; +using Content.Server._White.Mood; namespace Content.Server._White._Engi.DirectBallsHit; @@ -21,6 +22,7 @@ public sealed class DirectBallsHitSystem : EntitySystem [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly MoodSystem _mood = default!; public override void Initialize() { @@ -42,10 +44,15 @@ public sealed class DirectBallsHitSystem : EntitySystem foreach (var uid in args.HitEntities) { - _popupSystem.PopupEntity( - Loc.GetString("direct-balls-hit", ("uid", uid)), - uid, - PopupType.SmallCaution); + if (TryComp(uid, out var mood)) + { + _popupSystem.PopupEntity( + Loc.GetString("direct-balls-hit", ("uid", uid)), + uid, + PopupType.SmallCaution); + + _mood.ApplyEffect(uid, mood, "GotHitInTheBalls"); + } Timer.Spawn(TimeSpan.FromSeconds(0.5f), () => _chat.TryEmoteWithChat(uid, "Scream")); diff --git a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml index 296b3b4465..aef085a1d9 100644 --- a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml +++ b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml @@ -41,3 +41,9 @@ id: MobHighPressure description: "На меня оказывается огромное давление!" moodChange: enum.MoodChangeLevel.Medium + +- type: moodEffect + id: GotHitInTheBalls + description: "Господи... Как же больно..." + moodChange: enum.MoodChangeLevel.Large + timeout: 1 From 0fb846f7b7f4cbdd3f49b2f98e643a9a31e40b72 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 6 Jan 2025 20:01:20 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B4=20=D0=B8=20?= =?UTF-8?q?=D0=B6=D0=B0=D0=B6=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Nutrition/EntitySystems/HungerSystem.cs | 2 +- .../Nutrition/EntitySystems/ThirstSystem.cs | 6 +++-- .../_White/Mood/moodEffects_needs.yml | 24 +++++++++++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs index 82273f8784..42ee21d746 100644 --- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs @@ -136,7 +136,7 @@ public sealed class HungerSystem : EntitySystem return; //WD start - if (_net.IsServer && component.CurrentThreshold != HungerThreshold.Overfed) + if (_net.IsServer) { var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold); RaiseLocalEvent(uid, ev); diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index 6190e7aa36..144ec5f538 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -10,6 +10,7 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared._White.Mood; using Robust.Shared.Utility; +using Robust.Shared.Network; namespace Content.Shared.Nutrition.EntitySystems; @@ -22,6 +23,7 @@ public sealed class ThirstSystem : EntitySystem [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + [Dependency] private readonly INetManager _net = default!; // WD edit [ValidatePrototypeId] private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated"; @@ -65,7 +67,7 @@ public sealed class ThirstSystem : EntitySystem UpdateEffects(uid, component); TryComp(uid, out MovementSpeedModifierComponent? moveMod); - _movement.RefreshMovementSpeedModifiers(uid, moveMod); + _movement.RefreshMovementSpeedModifiers(uid, moveMod); } private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args) @@ -172,7 +174,7 @@ public sealed class ThirstSystem : EntitySystem } // WD start - if (component.CurrentThirstThreshold != ThirstThreshold.OverHydrated) + if (_net.IsServer) { var ev = new MoodEffectEvent("Thirst" + component.CurrentThirstThreshold); RaiseLocalEvent(uid, ev); diff --git a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml index f99aac0ebc..b09f63408a 100644 --- a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml +++ b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml @@ -1,8 +1,9 @@ #Hunger - type: moodEffect id: HungerOverfed - description: "Во мне столько жира..." - moodChange: enum.MoodChangeLevel.Small + description: "Мой желудок полон!" + moodChange: enum.MoodChangeLevel.Medium + positive: true category: "Hunger" - type: moodEffect @@ -24,11 +25,18 @@ moodChange: enum.MoodChangeLevel.Big category: "Hunger" +- type: moodEffect + id: HungerDead + description: "Умираю от голода!" + moodChange: enum.MoodChangeLevel.Huge + category: "Hunger" + #Thirst - type: moodEffect id: ThirstOverHydrated - description: "СЛИШКОМ МНОГО ВОДЫ..." - moodChange: enum.MoodChangeLevel.Small + description: "Не хочу пить." + moodChange: enum.MoodChangeLevel.Medium + positive: true category: "Thirst" - type: moodEffect @@ -46,10 +54,16 @@ - type: moodEffect id: ThirstParched - description: "ВОДЫ!" + description: "Хочу пить!" moodChange: enum.MoodChangeLevel.Big category: "Thirst" +- type: moodEffect + id: ThirstDead + description: "Умираю от жажды!" + moodChange: enum.MoodChangeLevel.Huge + category: "Thirst" + #Health - type: moodEffect id: HealthNoDamage From 7ee4eafb57cbf33d90936411f353cd8660883949 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 6 Jan 2025 20:15:14 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BB=D1=8F=D1=86=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_White/Entities/Objects/Specific/Chemical/containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml index 5daf7fc4d4..4385dab3ad 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/containers.yml @@ -32,7 +32,7 @@ - type: Spillable solution: beaker - type: StaticPrice - price: 150 + price: 15 - type: Label originalName: химический картридж - type: Tag From 08af896554cbbe8e374eed6663c0bbb44303b402 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 6 Jan 2025 21:23:21 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/reagents/generic.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/ru-RU/reagents/generic.ftl b/Resources/Locale/ru-RU/reagents/generic.ftl index d7f970bf25..04acddaab0 100644 --- a/Resources/Locale/ru-RU/reagents/generic.ftl +++ b/Resources/Locale/ru-RU/reagents/generic.ftl @@ -7,3 +7,5 @@ generic-reagent-effect-tearing-up = Ваши глаза начинают сле generic-reagent-effect-nauseous = Вы чувствуете тошноту. generic-reagent-effect-parched = У вас першит в горле. generic-reagent-effect-thirsty = Вы чувствуете жажду. +generic-reagent-effect-sick = Вы чувствуете себя плохо после употребления этого... +generic-reagent-effect-slicing-insides = Вы чувствуете невероятно острую боль в животе! From 4c6c09d0dbd1a43260ad44a2c26c257c07f199a6 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Mon, 6 Jan 2025 21:04:56 +0000 Subject: [PATCH 8/8] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 31 ++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 96c53885ff..d3c2469178 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,13 +1,4 @@ Entries: -- author: Aviu - changes: - - message: "\u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\ - \u0439 \u043D\u043E\u0436 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432\ - \ \u0430\u043F\u043B\u0438\u043D\u043A." - type: Add - id: 153 - time: '2024-02-23T22:59:03.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/112 - author: Aviu changes: - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\ @@ -8899,3 +8890,25 @@ id: 652 time: '2025-01-05T20:40:31.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/872 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0440\ + \u0430\u0439\u0442 \u043A\u0435\u043F\u043A\u0438 \u0433\u0440\u0443\u0437\u0447\ + \u0438\u043A\u0430." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0432 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0435 \u043B\u043E\ + \u0433\u0438\u043A\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\ + \u044F \u043E\u0442 \u0433\u043E\u043B\u043E\u0434\u0430 \u0438 \u0436\u0430\ + \u0436\u0434\u044B." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0446\u0435\ + \u043D\u0430 \u0445\u0438\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043A\ + \u0430\u0440\u0442\u0440\u0438\u0434\u0436\u0435\u0439." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0435\ + \u043B\u043E\u0447\u0438." + type: Fix + id: 653 + time: '2025-01-06T21:03:52.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/874