From e5ffd7afd6e2fc1a9fa9af1c207bc1887ad4fc7d Mon Sep 17 00:00:00 2001 From: RaMbUt878 Date: Sun, 9 Feb 2025 21:18:07 +0400 Subject: [PATCH] UZI gun (#1307) Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com> --- .../objects/weapons/guns/smgs/smgs.ftl | 3 ++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 49 ++++++++++++++++++ .../_Sunrise/Catalog/uplink_catalog.yml | 17 +++++- .../Weapons/Guns/SMGs/uzi.rsi/base.png | Bin 0 -> 381 bytes .../Weapons/Guns/SMGs/uzi.rsi/bolt-open.png | Bin 0 -> 403 bytes .../Weapons/Guns/SMGs/uzi.rsi/icon.png | Bin 0 -> 466 bytes .../Guns/SMGs/uzi.rsi/inhand-left .png | Bin 0 -> 641 bytes .../Guns/SMGs/uzi.rsi/inhand-right .png | Bin 0 -> 630 bytes .../Weapons/Guns/SMGs/uzi.rsi/mag-0.png | Bin 0 -> 142 bytes .../Weapons/Guns/SMGs/uzi.rsi/meta.json | 31 +++++++++++ .../Weapons/Guns/SMGs/vector.rsi/meta.json | 2 +- 11 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left .png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right .png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl index 39f9c203883..1024e51ae65 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl @@ -14,3 +14,6 @@ ent-WeaponSubMachineGunVector = Вектор ent-WeaponSubMachineGunWt550 = WT550 .desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто. .suffix = Пистолет-пулемёт + +ent-UplinkSubMachineGunUzi = Узи + .desc = Старая и любимая тарахтелка с далёких улиц Терра Групп. Использует 35 калибр, при стрельбе высокая скорострельность и низкая отдача может сломать палец. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 95cbc49c2fb..3ad58cae464 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -299,3 +299,52 @@ # steps: 6 # zeroVisible: true # - type: Appearance + +- type: entity + name: ent-UplinkSubMachineGunUzi-name + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] + id: UplinkSubMachineGunUzi + description: ent-UplinkSubMachineGunUzi-name + components: + - type: Sprite + sprite: Objects/Weapons/Guns/SMGs/uzi.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 15 + maxAngle: 16 + fireRate: 9 + soundGunshot: + collection: famas # Sunrise-Edit + params: + volume: 10 + availableModes: + - FullAuto + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 27cc75443ca..c07167ed614 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -1316,4 +1316,19 @@ conditions: - !type:BuyerJobCondition whitelist: - - Clown \ No newline at end of file + - Clown + +- type: listing + id: UplinkSubMachineGunUzi + name: uzi-name + description: uzi-desc + productEntity: UplinkSubMachineGunUzi + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 6 + cost: + Telecrystal: 12 + categories: + - UplinkWeaponry + conditions: + - !type:BuyerJobCondition \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..939208f23a90c2f615f0ded6b31adf6eb377dafe GIT binary patch literal 381 zcmV-@0fPRCP)Px$H%UZ6R9J=Wl)Y}lAQXiUQHDxgOD7~cdo?eSJaF<7wwRi^mY7N&AR8TQ2)2Px zyKaZ_Nftl8y614YHc%)O{yQYHZ!%(Xuz8|6LN5&G+%3AUTdZ#L3^{@(rkh3x5lzS# zb91E>Ud@MFf0DPPnWkxi`g>n|DyEcjV+bqC7y}DN+|6>%K`EUXvK25w2xzTGK{+tS zAfe&E00e-JRSt-tFwmP--H2RPVIHgkLqr~JAIN{RoQ8< zQcDdaleOrp@N~JX)tfPE!juUBsDIc*b`NYtRt4-8*!iy;*g`nl!0~VZ0G!U}jVu%j bg+JyCPP1a6AcbUd00000NkvXXu0mjf^{buK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..192e9d508730ecb86e36a7559d93e6707bf20e33 GIT binary patch literal 403 zcmV;E0c`$>P)Px$O-V#SR9J=Wm9cKaAP|Osq7Ie1mQF}?_G(@tnf$1pl9#Z>)XYU~?V@K>yd>sr5U(lZ@+5P_1T5#=50p|~ zMr$2Qp2X!Db3`S6Pg)^FGGW(sJ{CgY!+!hm5BZ#x37-w?haH&gh%pAOwZF%3MHypY zGsU&m;GBa}dL`sKV1*Dc#!MFFz!-y+^5#0FRBW1T!V#qu#+XF{Qc5qKx{t+4 zfENgjclA5IPH#CoN|FB+1c|-eOmTwY?A-mSPF}%yFnoJL>hTI7z|fsFY;G?Z3iklc zRTWBD0CwM>R{bJ+fnfKuoU6)((N5hfFq^E$(1q9Iac#XTQvU@}2>_`7SR(rjJc_Ii xxL4rfe;0T};cS83b_)R59}W*vC=?1$<^rmUY*F_rD6s$l002ovPDHLkV1j?Atp5N2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..89a0008006186d931f79dc1a9abf49ff05f4f8ce GIT binary patch literal 466 zcmV;@0WJQCP)Px$j7da6R9J=WmOpNTFcii=q70R?v});O$sG~d3Y~I-7yEC2q1IPz=P2+#A>i_@%07*qo IM6N<$g5QwOYybcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left .png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left .png new file mode 100644 index 0000000000000000000000000000000000000000..8ba6541a11deaecf53096e827eb40d42ccd8135a GIT binary patch literal 641 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4fi}<978JN-p(@gJM19fn(K1VG^mLCoP)Hh zQ^}kLwNxoThxQ4Jw#+%``p#iyc7THF&x`Vzsf}}E&%1T}^xw2k@!Oj--z{9zZm)Yi z>qJc8VI}4ji4z&GY&gM?6_LVVs$>+s(6J*Jp$I@8hSPw*CKSbBH0s(fjAp z&OXm8w|c&R^Nai8Qt3Ub)-(82MCojreEjQ<_d+3t4{A4O&JSNL_WW+y?9?XF{@+0Y zlb5dpYJG3Vw}*-0=mP0uJ_nxfSQlS&_PtO!^BRv5hIvvx8u3%9$tloU_;? za^$#Ga2I>%KIWqDEKib--j=xgO=(KNQ&EQJ?>JAeeiXRgwf(DCp*h20Z<4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right .png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right .png new file mode 100644 index 0000000000000000000000000000000000000000..fd4f4f9d0bc5b5b0c9a3b7e82377485b3b9c3221 GIT binary patch literal 630 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4fj1=978JN-p;bkJLDkH`c}hro#V{t0=B3Y zk&91RGBq-bno2Z;7Cq&OE@+<;qwK1(XnR$1uGznX-=uDyshRXOXG41Wy>+n_bF7~m zowW(Ln#6_^dsp7i(bGTuw6(q5b19?7pVu|#=A|3&KR@5ye@=GryQORo7G1x3O5DCQ zz(uzAw6?_Sw?R{D-;;#gk zYKya-II}q8<^#2`hClE9Wh@KlCEBKHFEn5{TKDGrQ6ZtDtUD^W_?@4$+e}>lMCzLG zHT5g|MC0_I_3vK%`(T}f4WAL)sZZRW*Dt!7UC3i}>`|-U&&c?ORbs|O<6BaDn)jEU zFX;GaB`vUhK^xoSggsZj>|#xD3jS})+Rr2Eus!c6|h{1<2BrZ$}M$Z5)m{J&Sb(B@(Y8+Ukl z`_dl;YS+4dUVist-(ODi2eazxqu;&y-Jo~lJ7dV!83?>I<)%K9nv9;A-9#2({4;pE u`njxgN@)7qVDzDmA&P;Q-GO_-Lxv1S6B!2GhG)Xjv$Ukor`1&;s|5h%010vc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..78acbd8fe082532b04a1be17df6d17c7b04a62e4 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY;~ z2@