From 9411c016ff56f205bfe8c066aaaf8f580e985326 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:45:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AF=20=D0=BA=D0=B0=D0=BA=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=D0=B3=D0=B4=D0=B0=20=D0=BA=D1=83=D1=87=D1=83=20=D1=85?= =?UTF-8?q?=D1=83=D0=B9=D0=BD=D0=B8=20=D0=B2=20=D0=BE=D0=B4=D0=B8=D0=BD=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20=D1=81=D1=83=D1=8E=20(#766)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Systems/AdminVerbSystem.Antags.cs | 6 +- .../Locale/ru-RU/_white/wizard/wizard.ftl | 3 + Resources/Prototypes/Actions/changeling.yml | 80 +++++++++++++----- .../Actions/changeling.rsi/hive_head.png | Bin 570 -> 723 bytes .../White/Actions/changeling.rsi/meta.json | 2 +- 5 files changed, 67 insertions(+), 24 deletions(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 69fd4529d4..5c25a79684 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -160,7 +160,7 @@ public sealed partial class AdminVerbSystem { Text = "Сделать культистом", Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/White/Cult/interface.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Cult/interface.rsi"), "icon"), Act = () => { _antag.ForceMakeAntag(target, DefaultCultRule); @@ -174,7 +174,7 @@ public sealed partial class AdminVerbSystem { Text = Loc.GetString("admin-verb-text-make-changeling"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new ("/Textures/White/Actions/changeling.rsi/absorb.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Actions/changeling.rsi"), "absorb"), Act = () => { _antag.ForceMakeAntag(target, DefaultChangelingRule); @@ -188,7 +188,7 @@ public sealed partial class AdminVerbSystem { Text = Loc.GetString("admin-verb-text-make-wizard"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new ("/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/wizardhat.rsi"), "icon"), Act = () => { _antag.ForceMakeAntag(target, DefaultWizardRule); diff --git a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl index 53c65e230b..06778c0d4a 100644 --- a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl +++ b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl @@ -69,3 +69,6 @@ store-category-spells-attack = Атакующие заклинания store-category-spells-defence = Защитные заклинания store-category-spells-utility = Вспомогательные заклинания store-category-magic-items = Магические предметы + +ent-MobHulk = Халк + .desc = Зелёный. diff --git a/Resources/Prototypes/Actions/changeling.yml b/Resources/Prototypes/Actions/changeling.yml index 15f1271913..04edd39eef 100644 --- a/Resources/Prototypes/Actions/changeling.yml +++ b/Resources/Prototypes/Actions/changeling.yml @@ -18,7 +18,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/absorb.png + icon: + sprite: White/Actions/changeling.rsi + state: absorb event: !type:AbsorbDnaActionEvent canTargetSelf: false useDelay: 1 @@ -32,7 +34,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/transform.png + icon: + sprite: White/Actions/changeling.rsi + state: transform event: !type:TransformActionEvent useDelay: 1 @@ -44,7 +48,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/reviving_stasis.png + icon: + sprite: White/Actions/changeling.rsi + state: reviving_stasis event: !type:RegenerateActionEvent checkCanInteract: false checkConsciousness: false @@ -58,7 +64,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/lesser_form.png + icon: + sprite: White/Actions/changeling.rsi + state: lesser_form event: !type:LesserFormActionEvent useDelay: 1 checkCanInteract: false @@ -72,7 +80,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_extract.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_extract event: !type:ExtractionStingActionEvent canTargetSelf: false useDelay: 1 @@ -88,7 +98,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_transform.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_transform event: !type:TransformStingActionEvent canTargetSelf: false useDelay: 1 @@ -104,7 +116,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_blind.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_blind event: !type:BlindStingActionEvent canTargetSelf: false useDelay: 1 @@ -121,7 +135,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_mute.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_mute event: !type:MuteStingActionEvent canTargetSelf: false useDelay: 1 @@ -137,7 +153,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_hallucination.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_hallucination event: !type:HallucinationStingActionEvent canTargetSelf: false useDelay: 1 @@ -153,7 +171,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_cryo.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_cryo event: !type:CryoStingActionEvent canTargetSelf: false useDelay: 1 @@ -170,7 +190,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/adrenaline_sacs.png + icon: + sprite: White/Actions/changeling.rsi + state: adrenaline_sacs event: !type:AdrenalineSacsActionEvent useDelay: 1 checkConsciousness: false @@ -185,7 +207,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/fleshmend.png + icon: + sprite: White/Actions/changeling.rsi + state: fleshmend event: !type:FleshmendActionEvent useDelay: 1 checkConsciousness: false @@ -200,7 +224,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/arm_blade.png + icon: + sprite: White/Actions/changeling.rsi + state: arm_blade event: !type:ArmbladeActionEvent useDelay: 1 - type: LesserFormRestricted @@ -213,7 +239,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/shield.png + icon: + sprite: White/Actions/changeling.rsi + state: shield event: !type:OrganicShieldActionEvent useDelay: 1 - type: LesserFormRestricted @@ -226,7 +254,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/armor.png + icon: + sprite: White/Actions/changeling.rsi + state: armor event: !type:ChitinousArmorActionEvent useDelay: 1 - type: LesserFormRestricted @@ -239,7 +269,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/hive_head.png + icon: + sprite: White/Actions/changeling.rsi + state: hive_head event: !type:HiveHeadActionEvent useDelay: 1 checkCanInteract: false @@ -253,7 +285,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/tentacle_arm.png + icon: + sprite: White/Actions/changeling.rsi + state: tentacle_arm event: !type:TentacleArmActionEvent useDelay: 1 - type: LesserFormRestricted @@ -267,7 +301,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/biodegrade.png + icon: + sprite: White/Actions/changeling.rsi + state: biodegrade event: !type:BiodegradeActionEvent useDelay: 1 @@ -280,7 +316,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/augmented_eyesight.png + icon: + sprite: White/Actions/changeling.rsi + state: augmented_eyesight event: !type:AugmentedEyesightActionEvent - type: entity @@ -292,7 +330,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/dissonant_shriek.png + icon: + sprite: White/Actions/changeling.rsi + state: dissonant_shriek event: !type:DissonantShriekActionEvent useDelay: 1 - type: LesserFormRestricted diff --git a/Resources/Textures/White/Actions/changeling.rsi/hive_head.png b/Resources/Textures/White/Actions/changeling.rsi/hive_head.png index 510f56bd4245578b2fad2fc4e8fecf590dbca6f3..f1c0abf800c8396038b66d118aa25818d153bac4 100644 GIT binary patch delta 679 zcmV;Y0$BaJ1k(kOIDZ0#NklY+|t3|@D>FYo=o$OI&k-sY+6W1iqVbz>Y^snQB5W;s%r0xnK1nS1TSgI@wy{L-q z*+~I-j_uh=p%+!LR9P14#=NlR2aSO(aPE9+K?b0)(*WS%$6o;KuihY4NZE5b2Rbh@ zGojis5y&2ZRDU6bQJ_cACu)0nfW&X(R5Or z)tk0``IR}l1y1a*{;{9Oa(fuNkH`b%Q1k%;&g#ubG@TT;o?Hcb9dN?w26X%XUmUPR zSVzjw0Vj;zZoS`uem9*M>Yp%{+as3S^L*}yAaWQognt&CmILTT)fS-_)t(jvkq;#x zzcR1KT08A~&LxnKZT@Xzt#e+B3$vpoam<20<<@fjb_UiY*-9tzRoMH4k z4OR`{q-NUWgEHW9z?$H7wZ=7xmmhurU@UF{5UZ9j7Pp91O8~rmddKs&JY1_qyu`R1 zIIA}!nSW|lJnm#&izvr3P@Ykb}Q(s+|lWztTMGi&S53f0jBHJSRG4^*tmjiK4LOC97_kJ+V zHi{w>pOIX(u{#h-fFw<07^k5ZHH=fwFpezXA|Nr;YxzZB><(NC_zM~?SWAtlAZh>r N002ovPDHLkV1g@NMQi{7 delta 525 zcmV+o0`mRS1-b-~IDY}`Nkl3uDLWqS}qzo8rgm|-Y!rtA^-mb30m&6)y9YARe13S5FFoUaDSio?nA~JKsI08aw7jN z?_Wj6{q|mD+;V#Y0#1q}gy1|_fPA=+GbclWkj?QMj&Y3%L;@gwTo>n0P-P%{M|tr( zyz522(HPeP0%()~Ky!ppO?FO$iRrYY41qX-N>M;mYipAb^xF>D2v5%a3cxIt3ZTmY zmE^fK>?OBveUdo(5&z4Mp<^n+P_Oa@`Xrp_AMLP#AyrYbI#7Ds$|pfo5*%Ex-+MBZ4rIY%WYb<8NID@PAE!zX!uz056Plqh7z|#G0BAl!cXoX7AbGreQ_fY^0eXs&xv4RU<_i#l2o-b< z0KRJ;2Z=x^o@NPvX_<2n@f(o