From 0ed28288c407f673529754fab49f4a47fd284a36 Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Sat, 13 Apr 2024 03:53:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D0=BD=D0=B5=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=87=D0=B0=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 16 ++++++ Resources/Changelog/ChangelogADT.yml | 8 ++- .../ru-RU/ADT/Clothing/Hands/gloves.ftl | 7 ++- .../ADT/Entities/Clothing/Hands/gloves.yml | 54 ++++++++++++++++++ .../Markers/Spawners/Random/salvage.yml | 1 + .../Prototypes/Procedural/salvage_loot.yml | 3 + .../crusher_gauntlets.rsi/equipped-HAND.png | Bin 0 -> 465 bytes .../Gloves/crusher_gauntlets.rsi/icon-lit.png | Bin 0 -> 159 bytes .../crusher_gauntlets.rsi/icon-uncharged.png | Bin 0 -> 227 bytes .../Gloves/crusher_gauntlets.rsi/icon.png | Bin 0 -> 712 bytes .../crusher_gauntlets.rsi/inhand-left.png | Bin 0 -> 265 bytes .../crusher_gauntlets.rsi/inhand-right.png | Bin 0 -> 273 bytes .../Gloves/crusher_gauntlets.rsi/meta.json | 38 ++++++++++++ 13 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/equipped-HAND.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon-lit.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon-uncharged.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/meta.json diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 40229915f2e..eba6f1368eb 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -186,6 +186,15 @@ hands.ActiveHandEntity is { } held && return true; } + /// ADT gloves gun start + if (_inventory.TryGetSlotEntity(entity, "gloves", out var gloves) && + TryComp(gloves, out var glovesMelee)) + { + gunEntity = gloves.Value; + gunComp = glovesMelee; + return true; + } + /// ADT gloves gun end // Last resort is check if the entity itself is a gun. if (TryComp(entity, out gun)) { @@ -242,6 +251,13 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun) } ///ADT-Personal-Gun block end + /// ADT gloves gun start + if (EntityManager.TryGetComponent(user, out HandsComponent? hands) && hands != null && hands.ActiveHandEntity != null && _inventory.TryGetSlotEntity(user, "gloves", out var gloves) && gloves.Value == gunUid) + { + return; + } + /// ADT gloves gun end + var toCoordinates = gun.ShootCoordinates; if (toCoordinates == null) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index f4176bbc779..32d4888cba0 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1578,4 +1578,10 @@ Entries: changes: - { message: "Добавлен биозамок для скафандров ЯО. Его можно емагнуть и сбросить.", type: Add} id: 55720 #костыль отображения в Обновлениях - time: '2024-04-06T08:20:00.0000000+00:00' \ No newline at end of file + time: '2024-04-06T08:20:00.0000000+00:00' + +- author: Котя + changes: + - { message: "Добавлены протокинетические рукавицы в лут утилей.", type: Add} + id: 55721 #костыль отображения в Обновлениях + time: '2024-04-06T08:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl index 5cbb2b03372..4da7287c26e 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl @@ -1,3 +1,5 @@ +fibers-crusher = дюратканевые с наномашинами + ent-ADTClothingHandsNovaGloves = перчатки Новы .desc = Это перчатки Новы. Как она их получила? Секрет. ent-ADTClothingHandsRedjiGloves = Перчатки старика Реджи @@ -51,4 +53,7 @@ ent-ADTClothingHandsGlovesRed2 = { ent-ADTClothingHandsGlovesRed } ent-ADTClothingHandsGlovesSport = перчати серии STEP "Cold" .desc = Беспалые перчатки серии "Cold", в которых удобно заниматься спортом любой расе. ent-ADTClothingHandsGlovesSportStep = перчатки серии STEP "Ultra" - .desc = Перчатки "Ultra" серии STEP без пальцев и с мягкой подкладкой, закрывающей ладони, что делает их идеальными для передвижения на четвероногих или для подъема грузов. \ No newline at end of file + .desc = Перчатки "Ultra" серии STEP без пальцев и с мягкой подкладкой, закрывающей ладони, что делает их идеальными для передвижения на четвероногих или для подъема грузов. + +ent-ADTClothingHandsCrusherGauntlets = протокинетические рукавицы + .desc = Модернезированная версия кинетического крушителя, умещённая в форму весьма массивных перчаток. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml index 1cb1943be63..eee79aa18a6 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -290,3 +290,57 @@ sprite: ADT/Clothing/Hands/Gloves/gloves_sport_step.rsi - type: Clothing sprite: ADT/Clothing/Hands/Gloves/gloves_sport_step.rsi #спрайты от prazat911 + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsCrusherGauntlets + name: crusher gauntlets + description: lil miners' friend. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi + - type: AmmoCounter + - type: UseDelayOnShoot + - type: UseDelay + delay: 1.5 + - type: LeechOnMarker + leech: + groups: + Brute: -5 + Burn: -5 + Airloss: -5 + - type: Gun + soundGunshot: /Audio/Weapons/plasma_cutter.ogg + fireRate: 1.5 + useKey: false + - type: RechargeBasicEntityAmmo + rechargeCooldown: 0.75 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: BulletCharge + capacity: 1 + count: 1 + - type: MeleeWeapon + attackRate: 2.5 + wideAnimationRotation: -135 + animation: WeaponArcFist + damage: + types: + Blunt: 8 + Structural: 25 + - type: UnpoweredFlashlight + - type: PointLight + color: "#ffeead" + enabled: false + radius: 6 + - type: Tool + qualities: + - Prying + speed: 0.25 + - type: Prying + pryPowered: true + - type: Fiber + fiberMaterial: fibers-crusher diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml index 3cbeed9dd29..e541705d982 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml @@ -126,6 +126,7 @@ - WeaponCrusher - WeaponCrusherDagger - WeaponCrusherGlaive + - ADTClothingHandsCrusherGauntlets - MiningDrill - AdvancedCapacitorStockPart - NanoManipulatorStockPart diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 180b26201ea..3025c89c311 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -89,6 +89,9 @@ - proto: ADTWeaponWarhammer cost: 5 prob: 0.3 + - proto: ADTClothingHandsCrusherGauntlets + cost: 3 + prob: 0.4 - proto: CrateSyndicateSuperSurplusBundle cost: 5 prob: 0.01 diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb9730204cd8ea4c5f3259ff78a7cd9888f3afe GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zyFFbTLn`LH zy|ppxP=E;AgZ;A1Tuo22tTZ}rX*M-C&DMXgSfoahy;dl8NwoX|i!D#m0xz|!O1^g6 zam$sqip9R!r~j|r`TU={`Nn7>l3Ug*`Q1sbTd7k6Y z^&?*y0)$dalkX~W)iN}EiR-&2b6WqF>6#_0w@%MBy^^=r?_cSqqYw8ss4wqulAoI9 zz51os=2nd_4^L{geRo=|rdeNZ+-9&fizhKjHCE*9tgyOAj6P|MZgaI55;Vo5c;8&> zwF>n~YYg)Z`WK{^z#%-lU~TAT&g%v(ol9fp%;it`?KR!S^6K{*ud_>^2}2zWrv3`A zbi3Ye{D1lJ_Q~$|@4uY0PiXn!cBb+^jW2?&c1-2}R3(1Qc$u!4m%sdWaC`02iLV$w z?L72veq+r#0qJGd$L(G3+-tOUw+p}VzkkAcQKQrB8)~_l>tcIvdmXi%7=8NW8{UrF zx3@`U-3iOOu>SbB$(*;d{>02^^M2jl0R;b=%Gb?Y-g*75@ls$MF?hQAxvX#sLBcYh_FMF+Z^fU$r`|PU@M+CFyW}dt2T^s$C zA@jrC#;oMR1K#`k=S+H4?)fx*+&&t;uc GLK6VIZ8}x} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon-uncharged.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon-uncharged.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c54a58b76ea1e9764d390162cb2459442106ee GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IdeT-978f1 z-`?2BdDuXp_2F}YJ?#aFZy&f-@4Uw6_b~QKM*9*DN!Q4StU4|a{=d5XafjP+PX-1a zvz@K{D_d2w?D${%dYyb#UCi8~`s#DtuBY2}M_bH4zD25Z{gkMPMJayQ=QXUpz69t5 z^KV{ZUO!iUe5xI(&!WJ<$l=iNknzp=jN9APJT0Faes7G^```DyHh)q`wrsIH&}sG0 Zxi3b_1a@6w=mYW?JYD@<);T3K0RTS8T0sB+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ab133dac6592744a24b960b67f5c7d462d20ca3b GIT binary patch literal 712 zcmV;(0yq7MP)Px%f=NU{R9J=Wl|N_`VHn1LSDh|tph?J)Ub2`{ZJ?C6xky%Zb5U_h3f%$@g_1)5 zsGxM{;yDSXQcSO1+}b%)r^4ZK?UJdDC80?NlcS5CgM6Qte{ImEV4mr_kN5qa=Y5{< z?qG-^h8W_1hawiGQfZ)u<)sxD;MMDw%2l=QD%-x7;AgH&up^4n`eFF zf?DmIO68PR>$~hR&3X6G_5p)O)YF04?3^nm1bDP~A0?B--LTopn37!J>62%!Y0kTW zzyZRk+3cJZa`{ykz_M&2kuf5XG2VO`VShJIZs8$c@1&_zPSN$K6zKDfQa_7v z@yW$l+vCBDO+LT7DW8@@2xJEr1w!Ln>rZJcmof^cGjlkzc6(?RvCG^%x+ zrb8?dZ;PYr680l677Qh*g*waG-Z7POr6KQ)uv&=q5{tDLZ32V~onl08-hD5ES_svz z%1OO7USbik_q;9#iUmU{77XR2eB4!Ryj_+1mq85DDWVtpehE9LzHDC{E^fQ16IqM> uUTzNjGr9_mYQ2j&#=cHlL)+swTLip9jOP2(0IC}omzgcwOPc7Px z6Q~&oI+mSi7OmV6e|P@l7ovB(!ooY3WyZ`g^j-W)D^PoSGhI%zP{#b&SmX# ztj+xNi<7$os|CaN$in>$s)UUUOo5dkJZ({qg|#S{yQ$)GhzCK zl#`Qzx`Ch}@L6-J-HrX9BeFgJJzse)@kOYZ-&T>kYF8#rZM|&pWpd$UX$8;F%PY_N z8qRGw!=7Cne6?ir#^pO3jx2qAX!rMQvws{(XCxtp0m%agkH$G0{I<1AeJTHEV(c}( zGc_B&{kpQ4Gy0iu|B{H^#6tFvwhIuQqp_)_S4b P6l9jCtDnm{r-UW|&8Bs@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/meta.json new file mode 100644 index 00000000000..3993d29c6d2 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/blob/2f8d21c269208ddb977f944bde3da96a72bdb155/icons/obj/mining.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-lit" + }, + { + "name": "icon-uncharged", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} \ No newline at end of file