From a69587c1cdbbec6bbdd526640442f04a0540ff02 Mon Sep 17 00:00:00 2001 From: KommissarRed Date: Sun, 12 Jan 2025 17:10:32 +0500 Subject: [PATCH] test PR taser --- .../weapon/battery/battery_guns.ftl | 2 + .../Locale/ru-RU/store/uplink-catalog.ftl | 2 + .../Prototypes/Catalog/uplink_catalog.yml | 19 +++++++++ .../Weapons/Guns/Battery/battery_guns.yml | 36 ++++++++++++++++++ .../Guns/Battery/syndicate_taser.rsi/base.png | Bin 0 -> 566 bytes .../Guns/Battery/syndicate_taser.rsi/icon.png | Bin 0 -> 570 bytes .../syndicate_taser.rsi/inhand-left.png | Bin 0 -> 595 bytes .../syndicate_taser.rsi/inhand-right.png | Bin 0 -> 594 bytes .../syndicate_taser.rsi/mag-unshaded-0.png | Bin 0 -> 395 bytes .../syndicate_taser.rsi/mag-unshaded-1.png | Bin 0 -> 399 bytes .../Battery/syndicate_taser.rsi/meta.json | 31 +++++++++++++++ 11 files changed, 90 insertions(+) create mode 100644 Resources/Locale/ru-RU/_corvaxnext/weapon/battery/battery_guns.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/base.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/icon.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/inhand-left.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/inhand-right.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_corvaxnext/weapon/battery/battery_guns.ftl b/Resources/Locale/ru-RU/_corvaxnext/weapon/battery/battery_guns.ftl new file mode 100644 index 00000000000..f11eeb80af8 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/weapon/battery/battery_guns.ftl @@ -0,0 +1,2 @@ +ent-WeaponTaserAspid = Аспид + .desc = Однозарядный, самозаряжающийся тазер. Шокируй всех своим присутствием. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 9489574ba5c..45b14e7e3a0 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -17,6 +17,8 @@ uplink-fire-axe-flaming-name = Пылающий топор uplink-fire-axe-flaming-desc = Классическое оружие, оснащённое передовой атмос-технологией, позволяющей ему поджигать цели. Теперь с прочной прорезиненной рукояткой! uplink-gloves-north-star-name = Перчатки Полярной звезды uplink-gloves-north-star-desc = Пара перчаток, которые значительно сокращают время между ударами, позволяя избивать людей до смерти шквалом ударов. +uplink-syndicate-taser-name = Аспид +uplink-syndicate-taser-desc = Однозарядный, самозаряжающийся тазер. Шокируй всех своим присутствием. # Explosives uplink-explosive-grenade-name = Разрывная граната uplink-explosive-grenade-desc = Простая граната с 3,5-секундным запалом, ориентированная на поражение личного состава. Наносит минимальные повреждения стенам и полу. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f31d85414d4..b576135041b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -213,6 +213,25 @@ Telecrystal: 30 categories: - UplinkWeaponry + +- type: listing + id: UplinkSyndicateTaser #corvax-next + name: uplink-syndicate-taser-name + description: uplink-syndicate-taser-desc + icon: { sprite: /Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi, state: icon } + productEntity: WeaponTaserAspid + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 6 + cost: + Telecrystal: 10 + categories: + - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink # Explosives diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 00000000000..3e6c57adf4d --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,36 @@ +- type: entity + name: aspid + parent: [ BaseWeaponBatterySmall, BaseSyndicateContraband] + id: WeaponTaserAspid + description: A single-shot, self-recharging taser. Shock everyone with your presence. + components: + - type: Sprite + sprite: _CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-1 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + quickEquip: false + slots: + - Belt + - suitStorage + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletTaser + fireCost: 100 + - type: Battery + maxCharge: 100 + startingCharge: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 20 + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: true + - type: Appearance \ No newline at end of file diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/base.png b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..5e535d27b6fcb2fa25cb9b19e29efc74af4e9abc GIT binary patch literal 566 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STXEHFTsi_+18;1r*+F09rxcf*+N~IesvJDxT82Es66cA^&vw+1jfNT)(lw@Rh0Sp2djbbGOP+|f*0}D`{fswHR;{u48 zAp2MsK+Ks0WP<<`&{QU{${n)SUE|$Hw#Qz;i;TBh9Tph<$IwSJ1qqM*Y%jeD<``nLx zbW`{wee7dchR{^IW_KgOw`*im4%jGPI3^_Gx%0$Y!&9B28dopnJF@l&tUO}1ZmUFN z&^p6KHzX3*H2f)O(RjLffwYakLDLKA3DP|i;(a$*uQ^})gd_h4>%y(p`_||!7T08N P0y)^z)z4*}Q$iB}{&|;% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/icon.png b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7f28af9c5cb5d5bdddf637ec006d557c03a90833 GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUXEHFTsi~e>#Sj`CX=82w{|1ABzOj^~w2HFY_Hv`y(K7YM4D}2Q z(JDX<3=Me-F+hsHB*-uLKMG*Da%aXupcH3;M`SSr1Gg{;GcwGYBLNf?D{+k|3C>R| zDNig)We7;j%q!9Ja}7~2)ieCw{CzS|#g^0v&ooa@Ed~xChm}E!k(GfF$npYWX($`y zKMh7^us9QtZOF*Pzz3wGfHkRGyRBTHkDUP<k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xs;Q~YWMDARHx3Psl#-O59W7&HZC`K9AR(ayR5DG>VHuF(Dhcun z{tp8To6hK*2a0kQctjR6Fz_7$VMb96uLhu?Scz*yNpOBzNqJ&XDnmeGW?qS&pKFMM zsh;8Y=I@h%Dz>CXc&2%JYB6vCIjjs)jI0cdK$aH}OGDWpzi2QrgTb$b#xJG%x_k%1TA7JjcnJ3uGSiba4!caDO}PB43LF4-4Z(>wo{-bGJ%) zZ9j5k`st;UC8QT9|2VYl+a!UO2F`=}+(FYGsqB_7QaiOs{Zh~psgGxFJ@~%6>6WzG z-*pLZd9K7S-QsZ2%YR*}^}iIq=#?Qg6<3gTe~DWM4f7CWuu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..419706825ec39c8727d1f4d24ee9ae6159ae5886 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%x&SYRvQ&SBMjx^9WmXeg79W7&HZC`K9AR(ayRPv)pH3Ud;l?3?( z|AzsFO=on@14TItJR*x382Ao>Fr%o3R|8N`ti&~6n999M?Mpgz!Aj=DgrJ-z)Uo;q*!QxCnwjm=E10Rr% z0^-be7O;2*kPQN#$`~150KE*OQLJPDN=#s9U;(N#Ffuk^TmUf>WFPASh&hvhY!F}q zn#u%L8DwbzWI=Tq8W@0NWu+okp5tWA1u~C%x;TbJxWAotTIjF>himP!r~m7B#0f>o z-?(^k+2w~hAw0)lu*uv#!lK5Y_CvAp^Ya}&(>tVcBrqi~ z2{Q=)S^6OMyXcj*dOueF=6V&D|2OHw!&xR@nruvcW=(h)XMA`KXC_PO-F!#kk1~rE x@P?J{cb(NCc=lB3{^VOOEB0?~=JauJ`NCB1)2pm!w)YOmbDpk#F6*2UngHr*t-1gJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-0.png b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e36b5af0541087dfda7f1646c9063f8fce225f95 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^P^`o?q9iy!t)x7$D3u`~F*C13&(AeP!Bo%i zd-M0nKowh3BRtbQJ+&A(fE-o^DMnTXMj*=zh^3)ykXtkunZe>rK(-+x69XTRjsoJ$ zb{4RB29ON`o|23VFPITDij@pNi3#isEI@SzM#ct=3m|5K>|e#stG_o)oOuAGFGS$=7&t;uc GLK6T(A5eY( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-1.png b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..92ad5596fd1b6f7cb078be13bc2f4fe953d1319a GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^P^`o?q9iy!t)x7$D3u`~F*C13&(AeP!Bo%i zd-M0nKowh3BRtbQJ+&A(fE-o^DMnTXMj*=zh^3)ykXtkunZe>rK(-+x69XTRjsoJ$ zb{4RB29ON`o|23VFPITDij@pNi3#isEI@SzM#ct=3m|5K>|mdKI;Vst E0K&LUYXATM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/meta.json new file mode 100644 index 00000000000..b62bdfb0eee --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KommissarRed", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}