From 2918ba7a0b265b6c5d8e660645e25adb2a96d624 Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 03:53:03 +0100 Subject: [PATCH 1/9] renaming --- .../Weapons/Guns/Gunshots/nightshade.ogg | Bin 0 -> 9516 bytes .../Weapons/Guns/Gunshots/universal.ogg | Bin 0 -> 11292 bytes Resources/Audio/_Emberfall/license.txt | 2 + .../_emberfall/weapons/guns/ammunition.ftl | 289 ++++++++++++++++++ .../en-US/_emberfall/weapons/guns/weapons.ftl | 77 +++++ Resources/Migrations/emberfallMigration.yml | 5 + .../Guns/Ammunition/Magazines/magnum.yml | 5 + .../Guns/Ammunition/Magazines/pistol.yml | 18 +- .../Guns/Ammunition/Magazines/rifle.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 + .../Objects/Weapons/Guns/SMGs/smgs.yml | 47 ++- .../Ammunition/Cartridges/heavy_pistol.yml | 73 +++++ .../Ammunition/Magazines/heavy_pistol.yml | 162 ++++++++++ .../Ammunition/Projectiles/heavy_pistol.yml | 45 +++ .../Weapons/Guns/Pistols/heavy_pistols.yml | 46 +++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 10 + .../Objects/Weapons/Guns/Rifles/rifles.yml | 213 +++++++++++++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 33 ++ Resources/Prototypes/_Emberfall/tags.yml | 9 + .../Weapons/Guns/Pistols/m23.rsi/base.png | Bin 0 -> 910 bytes .../Guns/Pistols/m23.rsi/bolt-open.png | Bin 0 -> 937 bytes .../Guns/Pistols/m23.rsi/equipped-BELT.png | Bin 0 -> 725 bytes .../Pistols/m23.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 846 bytes .../Weapons/Guns/Pistols/m23.rsi/icon.png | Bin 0 -> 933 bytes .../Guns/Pistols/m23.rsi/inhand-left.png | Bin 0 -> 853 bytes .../Guns/Pistols/m23.rsi/inhand-right.png | Bin 0 -> 938 bytes .../Weapons/Guns/Pistols/m23.rsi/mag-0.png | Bin 0 -> 548 bytes .../Weapons/Guns/Pistols/m23.rsi/meta.json | 39 +++ .../Weapons/Guns/Pistols/m25.rsi/base.png | Bin 0 -> 1063 bytes .../Guns/Pistols/m25.rsi/bolt-open.png | Bin 0 -> 1073 bytes .../Guns/Pistols/m25.rsi/equipped-BELT.png | Bin 0 -> 724 bytes .../Pistols/m25.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 929 bytes .../Weapons/Guns/Pistols/m25.rsi/icon.png | Bin 0 -> 1081 bytes .../Guns/Pistols/m25.rsi/inhand-left.png | Bin 0 -> 873 bytes .../Guns/Pistols/m25.rsi/inhand-right.png | Bin 0 -> 876 bytes .../Weapons/Guns/Pistols/m25.rsi/mag-0.png | Bin 0 -> 561 bytes .../Weapons/Guns/Pistols/m25.rsi/meta.json | 39 +++ .../Weapons/Guns/Pistols/pollock.rsi/base.png | Bin 0 -> 842 bytes .../Guns/Pistols/pollock.rsi/bolt-open.png | Bin 0 -> 831 bytes .../Pistols/pollock.rsi/equipped-BELT.png | Bin 0 -> 674 bytes .../pollock.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 674 bytes .../Weapons/Guns/Pistols/pollock.rsi/icon.png | Bin 0 -> 854 bytes .../Guns/Pistols/pollock.rsi/inhand-left.png | Bin 0 -> 809 bytes .../Guns/Pistols/pollock.rsi/inhand-right.png | Bin 0 -> 846 bytes .../Guns/Pistols/pollock.rsi/mag-0.png | Bin 0 -> 532 bytes .../Guns/Pistols/pollock.rsi/meta.json | 39 +++ .../Guns/Rifles/carbinenogl.rsi/base.png | Bin 0 -> 969 bytes .../Guns/Rifles/carbinenogl.rsi/bolt-open.png | Bin 0 -> 963 bytes .../carbinenogl.rsi/equipped-BACKPACK.png | Bin 0 -> 1578 bytes .../carbinenogl.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1578 bytes .../Guns/Rifles/carbinenogl.rsi/icon.png | Bin 0 -> 1021 bytes .../Rifles/carbinenogl.rsi/inhand-left.png | Bin 0 -> 1066 bytes .../Rifles/carbinenogl.rsi/inhand-right.png | Bin 0 -> 1081 bytes .../Guns/Rifles/carbinenogl.rsi/mag-0.png | Bin 0 -> 189 bytes .../Guns/Rifles/carbinenogl.rsi/meta.json | 39 +++ .../Guns/Rifles/nightshade.rsi/base.png | Bin 0 -> 1015 bytes .../Guns/Rifles/nightshade.rsi/bolt-open.png | Bin 0 -> 1010 bytes .../nightshade.rsi/equipped-BACKPACK.png | Bin 0 -> 1566 bytes .../nightshade.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1566 bytes .../Guns/Rifles/nightshade.rsi/icon.png | Bin 0 -> 1013 bytes .../Rifles/nightshade.rsi/inhand-left.png | Bin 0 -> 1049 bytes .../Rifles/nightshade.rsi/inhand-right.png | Bin 0 -> 1107 bytes .../Guns/Rifles/nightshade.rsi/mag-0.png | Bin 0 -> 722 bytes .../Guns/Rifles/nightshade.rsi/meta.json | 39 +++ .../Weapons/Guns/Rifles/tenebra.rsi/base.png | Bin 0 -> 843 bytes .../Guns/Rifles/tenebra.rsi/bolt-open.png | Bin 0 -> 822 bytes .../Rifles/tenebra.rsi/equipped-BACKPACK.png | Bin 0 -> 1650 bytes .../tenebra.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1650 bytes .../Weapons/Guns/Rifles/tenebra.rsi/icon.png | Bin 0 -> 886 bytes .../Guns/Rifles/tenebra.rsi/inhand-left.png | Bin 0 -> 1274 bytes .../Guns/Rifles/tenebra.rsi/inhand-right.png | Bin 0 -> 1461 bytes .../Weapons/Guns/Rifles/tenebra.rsi/mag-0.png | Bin 0 -> 581 bytes .../Weapons/Guns/Rifles/tenebra.rsi/meta.json | 39 +++ .../Weapons/Guns/Rifles/vulcan.rsi/base.png | Bin 0 -> 891 bytes .../Guns/Rifles/vulcan.rsi/bolt-open.png | Bin 0 -> 787 bytes .../Rifles/vulcan.rsi/equipped-BACKPACK.png | Bin 0 -> 1093 bytes .../vulcan.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1093 bytes .../Weapons/Guns/Rifles/vulcan.rsi/icon.png | Bin 0 -> 928 bytes .../Guns/Rifles/vulcan.rsi/inhand-left.png | Bin 0 -> 597 bytes .../Guns/Rifles/vulcan.rsi/inhand-right.png | Bin 0 -> 620 bytes .../Weapons/Guns/Rifles/vulcan.rsi/mag-0.png | Bin 0 -> 670 bytes .../Weapons/Guns/Rifles/vulcan.rsi/meta.json | 39 +++ 82 files changed, 1297 insertions(+), 14 deletions(-) create mode 100644 Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg create mode 100644 Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/universal.ogg create mode 100644 Resources/Audio/_Emberfall/license.txt create mode 100644 Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl create mode 100644 Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl create mode 100644 Resources/Migrations/emberfallMigration.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/pistols.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json diff --git a/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg b/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg new file mode 100644 index 0000000000000000000000000000000000000000..158765a23df0e6c2e3004a6228ed4d16ee4db8bf GIT binary patch literal 9516 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..5f027361443f80e9341226dac902bf23cb549259 GIT binary patch literal 937 zcmV;a16KTrP)9?Ncm1Y5zzB48of z_$vGd+6uM`f}jW@me#%+3G1Cih=|TIdq2+1xy+mad!(QhP3IUCOBEv;4*3=nOFq{# zUAS>Fh&QR3`dn-_&cEa17MrR!LDlR3eSZ#jI%8^J>lB{UbfY3XEgV^^=!&<5`?Y*B zEqovxFyw&3mr75y_(^fD#czs@cytErs;4jagHu0P%Ns@EQDJ|vP}RQAqi*8Klon!A zy)uU|i4rD+j}%o_DNrFOwIrGS?HgX(02{p%dM=w*Ezm}__{pN73}W8i0toO`2y4@XZG38 zs|^4E010qNS#tmY3ljhU3ljkVnw%H_00H4iL_t(o3GGu$OF~f)9;2OL4^asr>>8OA zv}hRxfg7uz5&eXIgu7mw=x6jGh!#CIwF-<<^d^C%iItMr?&f!5F2{4PH!Bw{?!dV- z=ggV;X1+O>$Q73XmjRc7|IEPr+>$|Ovxd;!7W%{co=$mJ*VYaAGPh}pO--Bn^yJtK z36F$@Pm4s%GdA=>f%bM&9rN?OJ~m_x@I+!!fNpN5+H|AwO1!wRWO9MzrHzk?bec9} z@RIY(wxvSQom^g_ql0~tH7DKK*plM~11Oe7&pike@!4FOkEvXKv|z#6Z{Cm$&<9a9 z&QO#p42pBaU~K1?hqi!ftfheBQ&HSeHP4>sE++yYgkvzGP-xWfdWT5YZyXD8bVj3b zW7zMf!GQq^h5}Ttzni$FQi(G6S#!@uAmFD;rApBG{GDTd#8?>MM9^Oe;^J?>o{RWs zHU)TWa)Mr}RTapn*PlJDg^+K>_AgMQWCqZ=uIu8;_0@$341p;e_`)=%xBT&JS4B()gWpLiEbeP z#!|Z%&K`VhM}RIN+16hsQ{LlAgoFT55IVMs00000 LNkvXXu0mjfQ%|*s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3ca304344a3ef616fad7cce1b08fe5f0d4963ba1 GIT binary patch literal 725 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;8CBb#JG1l59LDM;3q*aNONe-jDogSG6chHgyKWr2qtK|s zeC5nvF*#=E_CJ0sHhY!1)>zQV^`{ez8yv{O~pC0jcL`_{Mxia#i@h8z0 zEAP}l&rDN47Jb)N@kPa!HP;gha-A3FMb2-ZcGZIEIP;w8xBhKg-xroM z`|00`%3?ofmiQpfU+UztClfNyr#*biQYCbuocHeOwQKfWx7^qKW0%cE(Kqi7cD#8X z`;+O4diuAU=U4LrBY?BOBeIx*f$s+g8pZ3txrg_GV3Inxg@qq1S?9SZA%D~WK@O1TaS?83{1OV3wEt>!U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..b60a4c84a9732f931f94235af7ddcc15e536f3ce GIT binary patch literal 846 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;8CBb#JG1l59LDM;3q*aNONe-jDogSG6chHgyKWr2qtK|s zeC5nvF*#=E_CJ0sHhY!1)>zQV^`{ez8yv{O~pC0jcL`_{Mxia#i@h8z0 zEAP}l&rDN47Jb)N@kPa!HP;gha-A3FMb2-ZcGZIEIP;w8xBhKg-xroM z`|00`%3?ofmiQpfU+UztClfNyr#*biQYCbuocHeOwQKfWx7^qKW0%cE(Kqi7cD#8X z`;+O4diuAU=U4LrBY?BOBeIx*f$s8Z2Z$X1xOjIg zkLgkcQ`XfQ9UV>eS{<@W{2x4!_`=H)f6zR@=$DkD0gzV;uYX*0kUSoLsZP~}#__WRPk>94NbjdBbZaw+K zuWKhx&s%vUGLk2;_V%@`(#tm^roUI2_|n8Px-!oB&<8iS#~WSxzh5)eeYWp zXWjMmrhT7}|LlRe2H`GLR=vN&ch=poGS1BI9QC4MZkdpPAo8D+OIr6No;xP?S5c1F?hQA KxvX9?Ncm1Y5zzB48of z_$vGd+6uM`f}jW@me#%+3G1Cih=|TIdq2+1xy+mad!(QhP3IUCOBEv;4*3=nOFq{# zUAS>Fh&QR3`dn-_&cEa17MrR!LDlR3eSZ#jI%8^J>lB{UbfY3XEgV^^=!&<5`?Y*B zEqovxFyw&3mr75y_(^fD#czs@cytErs;4jagHu0P%Ns@EQDJ|vP}RQAqi*8Klon!A zy)uU|i4rD+j}%o_DNrFOwIrGS?HgX(02{p%dM=w*Ezm}__{pN73}W8i0toO`2y4@XZG38 zs|^4E010qNS#tmY3ljhU3ljkVnw%H_00G@eL_t(o3GGwOOF}^qAEUEIq7h!|8PB9{ z9V035Vs+^6^48ZS`ZM|J${E{b8tkB05$oxhmx#Z(I?`f|igPaw`XH)?4MnLUps*tbtn>nhk7ogumkNAH z)n}(CY)?!k_)YM}nE(ip7|XiVcJ8>7=V3CLw#TDU8jD0IJ`tm4^F!jOTCGyyvDn$m zA{L8MtyU-KQt81nKVm!?_)d`K9{^`5;PwDs~=V(iVVt6ybn%Ub-+dK>olrU?5=N?=$cP%*FmNpVp@600000NkvXX Hu0mjfb?C35 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a83bd7dd87bc95133e1c68c0871e000268d58d27 GIT binary patch literal 853 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;8CBb#JG1l59LDM;3q*aNONe-jDogSG6chHgyKWr2qtK|s zeC5nvF*#=E_CJ0sHhY!1)>zQV^`{ez8yv{O~pC0jcL`_{Mxia#i@h8z0 zEAP}l&rDN47Jb)N@kPa!HP;gha-A3FMb2-ZcGZIEIP;w8xBhKg-xroM z`|00`%3?ofmiQpfU+UztClfNyr#*biQYCbuocHeOwQKfWx7^qKW0%cE(Kqi7cD#8X z`;+O4diuAU=U4LrBY?BOBeIx*f$sZJJp4Cn!fmE)&pCNKMXH%t)N9$D$IdXYgz}U(U4DnK$1g z9eHndGVT8C+V{pUpUo^(Y+zvGP(UI6`y?!0S2sE3{?_Q++xPBnzTNG<`SSA*<+fjA z>Pynz=dU-L>6c?u$9cXtC&Spt&LYNj^^YZ&4NZlMHRCEv&EB~*X&RKy>d?fk;wWzB|cSmzr4@>zW3sdD6N?9S!ot~e!6L_h&Ze5 z_p$P|$dYx}7w>s=HKZ(jbLj6Gd;a9;d`EL52KU2mCdcImLZ|#Fo>Ws*vadu!dUwgw z&y1}S$~cgyj3`L?x~JSdNQe_?mn z-mIB>FaE6CeDl|;wXc54*(Wb}_WW~y)T?;WsWmJD4h)PSqH({%2hM`y?Jteb7XdQ| O1B0ilpUXO@geCwbB6!IF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d2f3ad70f595b38ba08dd52a50005d29c7510936 GIT binary patch literal 938 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;8CBb#JG1l59LDM;3q*aNONe-jDogSG6chHgyKWr2qtK|s zeC5nvF*#=E_CJ0sHhY!1)>zQV^`{ez8yv{O~pC0jcL`_{Mxia#i@h8z0 zEAP}l&rDN47Jb)N@kPa!HP;gha-A3FMb2-ZcGZIEIP;w8xBhKg-xroM z`|00`%3?ofmiQpfU+UztClfNyr#*biQYCbuocHeOwQKfWx7^qKW0%cE(Kqi7cD#8X z`;+O4diuAU=U4LrBY?BOBeIx*f$s#=_}Pcm-n6Ld;0QWT-D!sEe~VA?K(4k`r|Z# zH>8&i!<;4?ka<1gtV9oz= z)`B}R@s&|K6fPtP=m$)z&brcB75Lp-Mq2iQ@p@q&wm>dJrBiBfjyVm)uyri*cL&Mj(>Rqp#+ZfyVH z$*x^&^ERHdy8hwM!_fjtb3=G z!c4*458v!pk1w&=Zk?Yl_TZn8M`5O3syx$jZIH_x%x>LKNfkVIBdHJue=Ik)D i{OO9~+WYDs_$D6M{i{@VUN0~SFnGH9xvX9?Ncm1Y5zzB48of z_$vGd+6uM`f}jW@me#%+3G1Cih=|TIdq2+1xy+mad!(QhP3IUCOBEv;4*3=nOFq{# zUAS>Fh&QR3`dn-_&cEa17MrR!LDlR3eSZ#jI%8^J>lB{UbfY3XEgV^^=!&<5`?Y*B zEqovxFyw&3mr75y_(^fD#czs@cytErs;4jagHu0P%Ns@EQDJ|vP}RQAqi*8Klon!A zy)uU|i4rD+j}%o_DNrFOwIrGS?HgX(02{p%dM=w*Ezm}__{pN73}W8i0toO`2y4@XZG38 zs|^4E010qNS#tmY3ljhU3ljkVnw%H_003M`L_t(o3GL853cw%?hT#-?wM@M~oy-L! zr8$AcMI3~T1$mu5H9zo(a1cNM0R#|0009ILK;UPABipZfwO;c^$m1@h+-XlXbN)Z) m%PO1Mc&^n)CLn;oHUb}#;SXajCa04C0000r!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnOiTw6cnMqKtvFCU6gKJiho8375rHEu@Nn8Lpyd;OY>1|u_kpB-+AOd z<|Q-j1lfVV$s` zfY&$Ht@QBFFc`bxO@nI2>^ zd*XNw&b+(UYJkafy3o$&bGUT*BC4A;ga5I;jjculwOYf(h!YFO_ahX%cxwar!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnP13u!b>q;ylK zCF(*dDt^+1HXF6ef+F-6hzR1Yi_)!2@vpdQK@b;G-2^LbLpm0rt@$dZG)=I=IOmc3 zc$taG1l^1Cl?&4>oiC3>*qOw=V!omx!51SSqJ${Jk zY!u$3gHFu)!g(^~BG(QXQp^NZkxnEr0$^jp1_jq~G7dx^}RIG#Cs z5p(8Z6CG$xJf3z_sU&XPypB?_EI9nA)v#BsqFk?CSO(i_eqzfRg00000NkvXXu0mjfngabf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb512f684b0ab1ecf0cb6cc5198ad70ec4b649d GIT binary patch literal 724 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEOs zhkC~6e4+o>{67(qwLDPYE~dT6Dt?v4y;+VCSHqZ>Y@eD_R?XSu@afOuuQ_M7uUgAi za6KqS!`1;X*^O=(GQ_I%A%xd`cWB;V~m+!W(OZf8OZ-nnp zeS=-{!VV0KECM)*7XlKmOuhb^-7xf@yy5=j1+oc~80!2F=`jA8*AmIZb91u6No@yz lCR@&1v;FO$?*GHGPf*k8VV}gRCSYJOc)I$ztaD0e0ssPjGL!%S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d2e5798bd49f669bb128a760d485058252d0ec GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEAz=P5uvzIbwft#C;Q+uE*jked~s=Vbmj~9rDF& z!C4D0s08=?V)vSqW|aOcS#5T4M}Y$alRyIlivj~92Z;HjovG8H_*`20Pt%E>=__hJ zd2K0^UNzrfW9WWkfh~tykA`mCVx#_J@7cGqS~C4?ZSEi< z5UZts4>KE;^{aTSNxSwqfl2pnijnH4$--aWSzO7nGHO}2^rXSJ7q1@uxt`xX?~KI4 zy^8m%@3S0Syu6(-l;QFYRYi~l1b54=V?_Kn`DfnsfV@;!TW>)i7?0tHx<QKV{$YPr{Nf qetN#%&pX>K>TKqq`QlGxqkp;L1n23E@63TQ&*16m=d#Wzp$P!&w~!nF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d849d2f65ea7bf969cab313a652e6078aeb6dce8 GIT binary patch literal 1081 zcmV-91jhS`P)r!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnkW6xB=AJV%_X3F}6G$eIOrXmIY`fIPn~UnBes{@>1$*aQow(JG%C(|E zN#5Ap@P!8l20`qGGwH)$mFFNa(|=x=N9o+Cs;SpE(ceD+`rX~C<~`~=$@@d{hmRk5 z$py^JJV830SN{BkF-%Y2#rwA(aR0$QOifNo7~?>!S7*(}i|EpTm{$%cySEbnf?^9c(umsMQ)8W1g6aM|CQBLGN1ugPr1brLu}* zaYTtYo=PFxsU*?qGesq4ZEeZd0L2Tr_nT)0`9lAXgb)wlAuG!j6(V`7*@Wx5ij?4| zkMFF$Tn@v-XZ71Axfjxc;*j&K&;$tbFm@?Ma@)4SHE;rqi@**sQ!SI!!(&Y#QUG_G z&18gMky8Z8IUOD7@xv6;BMqSyup@R`IGOjze&||`+`M$`@LyO+fJs6E?qAHj>4N>O z_X*&oit1jTVBGN^MwCxLutRn)p00000NkvXXu0mjf2SNs3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1072555df60cb4c31dfee3ccf1d7cf863612d8d2 GIT binary patch literal 873 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzE^Uk@i(?`te-iksyoy1mz00j|^P`IwJfE8HtniSX4swHtf5f)TDNL*UVZ& zuKNeXcIT(vtDb*1XLIr~enu7n2L@C^q0eFMw#0`XQr7OBwmE9Tp}ZeY1^;uY?0Zn@ z?zeDC*>B5UYa6?b$BqUqoZ~p*(bVty^N=E(=Xq8_}9Q}z1g~hYc{Ub=~%>}(7?cio0uY8@Rhk@SIFY-tK=S#pCWbkzLb6Mw<&;$V25{V)J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0a182ae41abccc4b83f42804e06daf14e032c770 GIT binary patch literal 876 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEOFRP*?S zw|TAi@9}yawIlnK^Uo*$V(xEg{@uR(!%KM?x#LA=pOxJ?C%dMp@nq>M-2l5&+SQhm zukX9OlY8>|tJjvRshr>39D03r%<^-s3-%b*^SzofiETOSNW$CxW#npY!r%kAo<_Iyf^ znwZnxeVOXZ)4%=wnwkH;f9a8{|4&~#w{CCA{PeJG@!nk`me=c=J|Vg{sBa46oknj@v!8*x*R;yl8brLWV89ZJ6T-G@yGywqL(2qg@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..4fcdb884c71ef2f35ff6c31289104489b73c356d GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~#f?ak~c z(z;)ztKTIkLosQh(@`bIKmqU01-@H41bc3!n9p{(vF3DM6HD~LV@?|ca%)8YG3T;I zvpNQ_2zqD7_qKfP6I5EX`OLk3<6=GI^aJw^zAn0Lz~Q?3iHiE;i95g4EP2@})?{Mj zV6k}jw<~8{y6TVr=Cuo5pSOr=c+{N7GDmH3!A~bJynYUPfaZ=OX zqc2nXq~Vab*Y&JFD=gw4hadIRvgE6~YCP%x!CU;-xcvfm#P3+1G41R7&nsrP@MM>{ zWlcYm7clz<_8}Xbf4E$v3Sw6rK=T9)pse* z_jG;w&)VPI+$Q9;T$l6X=I49AI9(PCF}HpH_`v5??E*X6jaR>mpEk$szRUeJ*|yaJ zam|xI?^>37_@!0Jy_=HipH*2?eid6**tKml*%I&g+DUiy`_jHV#jRTYC7jl~FR1@M z+&%y0+YE*Y8AVyZ2;eO6h%9Dc;1&j9Muu5)B!GgMo-U3d5uC{h60D0A4WyW`5z4kK z5{0Y{D`%dqXRNE+@TI+9UNZ0Aj-wx5Ue=!Ts&J;Whs^56Q>SMAkKbR{y>7bT3x*vM q^7AE5I2QcVNH$?{b8fgJz`)RQS%g`=XSV^+QU*^~KbLh*2~7Zp&g>BY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json new file mode 100644 index 00000000000..e849a4ad01f --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/e6b7c50b3b0f5982fe90b428490ae03a3824d7d9", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..81d70abe95b8ce70d17ad24a5e1beaf6a728bcb2 GIT binary patch literal 842 zcmV-Q1GW5#P)Aww017K(y6N(H-Ahqi)Mm*kqXLXw6{iWFDD#i8IJ zy7)EtALuH$DhPrih`71?wMdEYHH8*wFWkL9p4{_t_Z;BQ=*+PDl7L}4Jey8QtA#Zw z_>KWY5u!CLGuv9qE#}d4{5--Z>O(^G>b;at^YWG0`lARM0dd95im*nqZ@yl_h;M? zM+ATX000SaNLh0L01FcU01FcV0GgZ_0004jNkl}1G@VXcpQb4-m!IUiZd1P7?P$FY$@hI0E=dwLjv(6=4xj)U zn9XLCWf|RjobUI0xYiuUY1jP)>SYT2*gzlbnZ2fIwB2r5uE8rP%W`s+zQ%NhVKm&A z%cYqfpn0A*ph78;Bbr1m9$-~fBJ|(~8$kB;{z1}d0&$RAmQ{-;`d5M+VK)r1?RZue zWQeceUI8&tQ4}2zDAfrto73sUM2Q9!fV7_HHHG)&zaeDVnBW@|dkBGiER!~X=@*Ly z335CpNdL;|F_g4{u_o^04!!{-<40snlfGWtwwwQeS4l4W3dS5xVJiic0)In+Z;M1&07*qoM6N<$f<4c9I{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d9a014865fd14911f595d969ff8a5f3055836c GIT binary patch literal 831 zcmV-F1Hk-=P)hp_pQQD602W+a|2UM^2`&y3fMAFp2<`kaNbfYLdBOKl=>WX)T`?X9g zA$%zqA8bW5J-77h+!MD}~ue*rOJXdxs{ zk&plY010qNS#tmY3ljhU3ljkVnw%H_00DPNL_t(o3GGy|YJ@-#orDA-T4`mY)m>v} zV`t?-KEf{x+|Ss_{efq5Hri+*8n7}qk_oe`CRZ4agI$pI&Ayp8`&<`54dsAxKslfs zkQ}fq3!*3*Pp8*0j^j~Uo3X^4Vb3+GpA_^efPoUZF8H&CQ3%c-cY z>yvZDq2kD`stSf-pwMg<8kntK1K0C_B0>|$Lvh=-M`}X;M987>U4x)7FWSNx+yUBA z+qRqnec!Lvsq0$c%3#$2{I}6s&-11nF3tu25|9OD{458SFpB@zSZx4z@B2QGI36an zp6`B(rdAu+qWCQ}R?h$>ufphT4e%7KS*;0rgEm23QG#FGF3002ov JPDHLkV1i|AhXMcq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..52666b6192ecb16fccd2347ffe5b148d6dfc2423 GIT binary patch literal 674 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ulHdG ziDUD(d97Ysa>4P4qO)kbSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6bE{UQHC zYljv`lTycyoxitwbiOxj70cAWv)6v!ozF$zWgeV=ac0BsNezisHnaUaSGSsK{^(O#eZxLslRe|`toY;`qv!dp|ctH34GMqyu;bXf6mP!orBd!l-KBp zclvicp2O!+qg`_JvH3yO{{1YUYswfubk7S~**ujmEj3TTU+_53-cwP}1f#*JR^Xs^@?g957=-KRPAf9O1MYV(sm>&NWN9{NvqY+ztyV&M=_aDXuiVilH#tPlUc z?33iyoZB_$ELYvlt=+}=ta4rMy4SzA&F+hNarJi2?QO@myWjo3cl+HPU*B@*oHn{+ zzTh{ngY-ulHdG ziDUD(d97Ysa>4P4qO)kbSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6bE{UQHC zYljv`lTycyoxitwbiOxj70cAWv)6v!ozF$zWgeV=ac0BsNezisHnaUaSGSsK{^(O#eZxLslRe|`toY;`qv!dp|ctH34GMqyu;bXf6mP!orBd!l-KBp zclvicp2O!+qg`_JvH3yO{{1YUYswfubk7S~**ujmEj3TTU+_53-cwP}1f#*JR^Xs^@?g957=-KRPAf9O1MYV(sm>&NWN9{NvqY+ztyV&M=_aDXuiVilH#tPlUc z?33iyoZB_$ELYvlt=+}=ta4rMy4SzA&F+hNarJi2?QO@myWjo3cl+HPU*B@*oHn{+ zzTh{ngAww017K(y6N(H-Ahqi)Mm*kqXLXw6{iWFDD#i8IJ zy7)EtALuH$DhPrih`71?wMdEYHH8*wFWkL9p4{_t_Z;BQ=*+PDl7L}4Jey8QtA#Zw z_>KWY5u!CLGuv9qE#}d4{5--Z>O(^G>b;at^YWG0`lARM0dd95im*nqZ@yl_h;M? zM+ATX000SaNLh0L01FcU01FcV0GgZ_0004vNkl z(uR)TxX-x6pRhCGYp|d>I~zYhZJ>b$3ZjJ-$0H6A9Jq^t%H3vmXJ_WUdAkclYA6Mi z0!o2*S76j8fUfJ+)?%^9*Xtj0-7oSyuQjJixKFm*EJscp$K?CIm?t`s&jiNfao#Na z$~p`~5$m(77{DFJp)^ftI-OQ_zu(hp^-ZQ}mg(p7nKm1jY}*#g?RGoS52wfq8&CiQ zEX$(f@koyr`#})ERAV-qRrBTq`E3gPNuXKmm9?g6bUK|xtj;62UazA<`W)R&CX*8T za=Dbg&W0)jjaRG0)8@rxtCjmqk=MRt?3HSkS7)H({nn!{d9`_o&tXWYO zMDQzkRDe6mvaD7FO4S^~B1sa#OVp_Vq@B;_W#S|Fe*i@^!TBNho?HMQYP1qS_sivy z7#x=g()ZatnrbC5RL9M_op%7i_=pTSItd&Ohw=-^1n|^~Bj9B(wv_;%bphJT&!`u+ gs)$lRDKLZrzo_G)0r&}JIsgCw07*qoM6N<$f>`N*>Hq)$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1df839ce9ad8c953cc724dc9597ebda50b91f7 GIT binary patch literal 809 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ulHdG ziDUD(d97Ysa>4P4qO)kbSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6bE{UQHC zYljv`lTycyoxitwbiOxj70cAWv)6v!ozF$zWgeV=ac0BsNezisHnaUaSGSsK{^(O#eZxLslRe|`toY;`qv!dp|ctH34GMqyu;bXf6mP!orBd!l-KBp zclvicp2O!+qg`_JvH3yO{{1YUYswfubk7S~**ujmEj3TTU+_53-cwP}1f#*JR^Xs^j|5K_$B+ufx3>)Wnj8dLA8!4? z7cxbrxl4IgfvB)mRKA1fQC)-cDLjl*=Z12q?e7e{Irrww^GlPQAG9(saVRvP5+9@+ zZO*&z&ENic#w0`2bGxsdlol|K?-h3y+@!;ud%JDl`@63-+`VFaYImOrWDX7O^)0S_ z!*YI6SLhuRx9iLH^Z%@kTcUX7tLm$=3){kbo^hX_wZ-Q1AG3dFmse-6(_N;tJUV=T zaz6W6-P1-qhXr=6tG;J-?T5+xDA{(YaOP`Aq7vur%-$*C&cMhb;DD1zaBkc?@AYcd z>KVHdt^Zxwc%I?!%;|#F>$b-HJv(*EXNLTs+C6KYJx}MbV|!z|;`y(Q&l!WVHs#ve zJ16YivpZ?>XGWmNnvCFVdQ&MBb@0D!h#2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d0e8068dae6b2c335a9e6d270f55516e03885b00 GIT binary patch literal 846 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ulHdG ziDUD(d97Ysa>4P4qO)kbSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6bE{UQHC zYljv`lTycyoxitwbiOxj70cAWv)6v!ozF$zWgeV=ac0BsNezisHnaUaSGSsK{^(O#eZxLslRe|`toY;`qv!dp|ctH34GMqyu;bXf6mP!orBd!l-KBp zclvicp2O!+qg`_JvH3yO{{1YUYswfubk7S~**ujmEj3TTU+_53-cwP}1f#*JR^Xs^k5*3?$B+ufx3diUnhgY8eK(db zSoB09M8+^^-KHR`TXz~JbwzLZ7Z;&A$=4`H=jg?55yo$4ew)_urPT6%c#6c<+tp z1>x6>yr%B`c4p}m_49XET+(dzT|Mviw$jqr-H8(au1$7)vVql8N_5-DPD{~mTobqv zu0nDkg6XBcU|R5+hcmR-Z>^NJ+P~iF@jA;Yl@$s(y(g6aiOJ7>I(z%ovuB!)+V-zq z`Trk3r&rzF$cjwX87iJFZG3-Bf4p2(_b2ZE-4cf*7Dk%|Hd^gV`NzU?P(J+UCjRBG zZeFQ3&kFrBcP8uC-@SsyGrXU0sX2c!csI$kPV6E}D?HHN`#oSUy1VB2#1cCWU@S3s My85}Sb4q9e0MW8{SO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a225b095d1f8cf5aa632daca650094bae3d00ad0 GIT binary patch literal 532 zcmV+v0_**WP)Az&4U7K(y6N(H-Ahqi)Mm*kqXLXw6{iWFDD#i8IJ zy7)EtALuH$DhPrih`71?wMdEYHH8*w@3_1_p4{_t_Z;9)>CCXZ;(%c~Je^EPtGP8P z_>MlBJ&0mlX12AISE=pXVVLSU-Xm;Ev&RKD{_N)ia28EW!5;4xJgJgS29#b zX^p`~8c8G|K|vXt(BU9P)uhbY`{H%qGD_rO^tDg{Cr1HA@>wZoE!F`}sb=}`n*R7oaffwM~Z2C)-)7&@d)ut9X2EseQ=wJ7;YW&Cf6Oi4eC%OX;kAO+qAKv%_3QK4Y z>w@iA00009a7bBm000XU000XU0RWnu7ytkON=ZaPR9Fe^&@l=CAPhs%2%f9=KSs$# z6o<}r6Xa*z^+5I_I{1Q0*~fyV-)+mDD{t W@d>8IbUYRS000000EHXRKwBp1Vh z7Xow9$o$xYuMt*k`wQMs3qx|k!pyZkuT4h z%KdMijxjP^>E0TJrYFyP>xIA$l(#+a>&WxU$KZd2i$cv`l$^#sMBlDykpl>Az}aO@ zOYOq>CUibnnyvjvewjYQfY(!KOG5h%1eYpVRo6MWhs3%((KYPtL!ayqEq?=1|@ZtC{U~Yi6^Vr|0-yuZNR33#{F4o5^I7$R&1Be2u*V zkpl<~F^H%^D9f@4ivkKf7!1sGI!*NGcDrUY8U+9-cz9DGQm@y|X0u7Xp*B4?J4xm2g)8XE2a6BF#0M$>> z?xmULlWPfjJa*|>>EmA7@&8bwNN<2&tyYFJ$q0YmSDP<)zh1A;t^&lyksa^u90pIWU3C~dGCh+$968Mi#5g6ds%2t)n z=+G_z#w-!>SwE>mn3c@=$Khm@KnVUE2Pf}0U~;hB1QaTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*2U|@?9R;2d-HZvrJOkh zoB~dPe^j8~@5lJ7((<-SF>3+RY&O+yw^PgIvc@?4a5#jMJQlESx2xv!d7&1$%;7Tj z1VRl!&=3Y9G!U|xjj$*{;PH5@7K=rp$6zo})9Ew@0Kt<wU~& zkgGAliFhFI3AkFVMEd=HFC~peLsS4c#`0&e?{qqH6&PkRnWSVz0R%yS(}iJ}_6UMN z;sBMTNr(vk14g?ZcnBH$N`)W z3wu21GH}$uGXIEvLf3!!aH$wbd!Cm$m>(jOG&Yq9yuLig-u*+`BKc(NT9uD9s28|n zm?k3L_LI3=Tag)m|2!%ZNWdTS;HbX_%$}7A-~npjBO7R+ncRr~YFYUT(6!ZS)wMfe ljRy(u%qid$a0>iYfo}=W3>2;WmM#DQ002ovPDHLkV1iJux2gaD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..58563f18220fdf164b92edeaa820b714ddc85161 GIT binary patch literal 1578 zcmV+_2G#kAP)00EHXRKwBp1Vh z7Xow9$o$xYuMt*k`wQMs3qx|k!pyZkuT4h z%KdMijxjP^>E0TJrYFyP>xIA$l(#+a>&WxU$KZd2i$cv`l$^#sMBlDykpl>Az}aO@ zOYOq>CUibnnyvjvewjYQfY(!KOG5h%1eYpVRo6MWhs3%((KYPtL!ayqEq?=1M4?CiL9yX`J6E_$b@r@8IBPameyvGVR?Zkv!TOI?-?MxDMm zy}Z1f;!Q4FmzdLgo12@t>VpxWj*0UwS_RM<;L?mI~(#Tt!r|&H(C{yCR`i;wZ!d^D#=jYSYgM))B zQ`G7_oeQUcj188)^N-(r7|X~D0}I~t^mKZO^GpY#!ZKZ@LuDxfnDc}^$I|QVE6yuC zWuVSdy0zfpJOUxl9+V5_p$XW2zSLvBbBufBMdsYxoWptMy)Sx9`uB>?havz2Uw-^{ z9C>qoZ*T8PL=*wA*0aN7(PQ4Pt*yDEqoY<5@-4!j(yC{$-B1Lm^C&kvvf-D>hOEaf z6gfUV?pJ9+q|6(Te&d{z(#+-PtNk|4t*@`Ujg5_Tu_Fo;`khWEy~i3*HVR5bK*&oi zRI~v+p&M!+s#9M^UmG9Vvk2la(|{>g)_HW*9s&GWnwpwIw_~&bnO>CqfkZjaNTXXD zpsKooR0&*`PlNv!3DdGbabDprTj)c|>Xe?5mXI(=L=}T|>#Kq#_Kgfg1|kEIfyh8) zATkgchzvvqA_I|u|Bit=|Kg5{ykRk#UWp}2-OS8P`ld&(sYc~M6}@2NjS*PEY!MRy zQbabU+wJPIaV6N4F|vX)5kRheVPPTF$$Pmb3ONg511p#`%ly~pk>^B9Y)p{*K06sF<_I9+L0&G)0M4V^55o*wwcb*O8l@y@c})&BF#5@vBBLe(c(!VR zQIbN6<8u8Qf!Uk6BexQ&56e-h#K@q{ZLXh)uI*&bMFg@>M1G9yM zLIN;EDvJCY3k+fAOS{t^oAcOZok6k)2OAi{s`OdfxUL@-!C~fCU3Psvp(hR4!05NH z<(&LHiaDCT6&6k~Tbwsd0so@}eW+kjKJGR?HXm~chlv0bC`((k844L2b)B#YtHqva zBcvw*e>C_wsi~=H!k>Krqt6qe%7+uz$b$q7T&rl<4KP|Be+`2j;Y0=^1CfEqKx7~? c@DCXH3q$J`f%drqX#fBK07*qoM6N<$f`5GBr~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..58563f18220fdf164b92edeaa820b714ddc85161 GIT binary patch literal 1578 zcmV+_2G#kAP)00EHXRKwBp1Vh z7Xow9$o$xYuMt*k`wQMs3qx|k!pyZkuT4h z%KdMijxjP^>E0TJrYFyP>xIA$l(#+a>&WxU$KZd2i$cv`l$^#sMBlDykpl>Az}aO@ zOYOq>CUibnnyvjvewjYQfY(!KOG5h%1eYpVRo6MWhs3%((KYPtL!ayqEq?=1M4?CiL9yX`J6E_$b@r@8IBPameyvGVR?Zkv!TOI?-?MxDMm zy}Z1f;!Q4FmzdLgo12@t>VpxWj*0UwS_RM<;L?mI~(#Tt!r|&H(C{yCR`i;wZ!d^D#=jYSYgM))B zQ`G7_oeQUcj188)^N-(r7|X~D0}I~t^mKZO^GpY#!ZKZ@LuDxfnDc}^$I|QVE6yuC zWuVSdy0zfpJOUxl9+V5_p$XW2zSLvBbBufBMdsYxoWptMy)Sx9`uB>?havz2Uw-^{ z9C>qoZ*T8PL=*wA*0aN7(PQ4Pt*yDEqoY<5@-4!j(yC{$-B1Lm^C&kvvf-D>hOEaf z6gfUV?pJ9+q|6(Te&d{z(#+-PtNk|4t*@`Ujg5_Tu_Fo;`khWEy~i3*HVR5bK*&oi zRI~v+p&M!+s#9M^UmG9Vvk2la(|{>g)_HW*9s&GWnwpwIw_~&bnO>CqfkZjaNTXXD zpsKooR0&*`PlNv!3DdGbabDprTj)c|>Xe?5mXI(=L=}T|>#Kq#_Kgfg1|kEIfyh8) zATkgchzvvqA_I|u|Bit=|Kg5{ykRk#UWp}2-OS8P`ld&(sYc~M6}@2NjS*PEY!MRy zQbabU+wJPIaV6N4F|vX)5kRheVPPTF$$Pmb3ONg511p#`%ly~pk>^B9Y)p{*K06sF<_I9+L0&G)0M4V^55o*wwcb*O8l@y@c})&BF#5@vBBLe(c(!VR zQIbN6<8u8Qf!Uk6BexQ&56e-h#K@q{ZLXh)uI*&bMFg@>M1G9yM zLIN;EDvJCY3k+fAOS{t^oAcOZok6k)2OAi{s`OdfxUL@-!C~fCU3Psvp(hR4!05NH z<(&LHiaDCT6&6k~Tbwsd0so@}eW+kjKJGR?HXm~chlv0bC`((k844L2b)B#YtHqva zBcvw*e>C_wsi~=H!k>Krqt6qe%7+uz$b$q7T&rl<4KP|Be+`2j;Y0=^1CfEqKx7~? c@DCXH3q$J`f%drqX#fBK07*qoM6N<$f`5GBr~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7baaad153110acbdbcf3c319d4ab59abfc2919 GIT binary patch literal 1021 zcmV00EHXRKwBp1Vh z7Xow9$o$xYuMt*k`wQMs3qx|k!pyZkuT4h z%KdMijxjP^>E0TJrYFyP>xIA$l(#+a>&WxU$KZd2i$cv`l$^#sMBlDykpl>Az}aO@ zOYOq>CUibnnyvjvewjYQfY(!KOG5h%1eYpVRo6MWhs3%((KYPtL!ayqEq?=1V?ZAwv#sJL)Z zY7rL|Too*C{3^e|kMLXE2yP2@A%Z&>5+z{hrd1c|J);w@c}UZCRWguF?w!Xu_hb^H z#1aJ(1ri1RP=RK%>Eeph@*+;MUAqOC62m=u@5Q?%W!mNM*_j)}VkH>)??RJ|6gMkYG0Y9FUi4==PTCdlkCzNJF zT&-O>3}S`^jhF4)cIbC0C}iPyoghukQWUSV;>V0wMvE6~C8 zq0;4r>`{iAsJPy5u~_g25FmiYVeeB4j=-)CqLYgv=G%wztau6mVFoYY_tgr$Jh#X+ zP1^51FZBl7?KTZi`2^LPn}MVdRRj%Os?Jc-`#rbA{~?6}IRU(7S!7Ha6IiWQdtCvZ|+MC%? zq}5(nRcNY6)QX5D9Z3rnxRk<#9HqBLg737uyh_`edRr3|Z~f5v!+wiv z8&}f;4yCeh`=mHu%L;dN%uM}OH)m$?OiSi{Gxy|K^*Ser#aNrk^6IOIA8r(9DiKsU zv}2j|wVWC)$GaaZ-J4f!Z(bGtxAuSEw31^N7cPvf2-%(!Ug1=cc6F;rK4 z4V#41jIHaZ%v<$g^P`;B`=YlyZ>anTIbZNie0kl*d7FJ7);;W)ssHlo=M}TJq;Y*N zTzS{1x}d|*cZz|g*P02(QvdRRZvpVKY z)IUG#)ZhGheTGIcFYigUE>k~W{kru4-<0jP?_ZzzeCqgv`j&2|v++~r9J6z|zbC483l-v;D{}n~SDz-a5~J z!>?P<9QY)|z+KRo4;TZS1s;*b3=G`DAk4@xYmNj115=`>i(^Oyg4*OdurmJH)XpwJa`hUdnkN$=;ph5vo$y#GE6(28qC~u>Hxw{%^&~uhGpQ^_>Gz{bmJhXi^y1zgE6aNq4E< z%A0S6>NtOR``l*#e0!Eqz17@(^DBE*cYl!0RLq>h&cYI85qWxZcdprNw!nS`k3Ua~ zUOr>czu9!RU+kW4L-F5^ykd@yi`{Ej7(eb>KkY|WmwT}(gN1mD%A)GNlUztg_o_XefwA{yV^F~Pb)I{)PW-I6wtg?;&sp}rjz8Y0 zyYyMVqp{VGG~TJ_o@Qm-%C^a^U_0@1N-^WC-z!{e>YuYlMSjf4dl~n_T7mVjl7jLu3#VQE604o|+mun* ffKj-@l}X;=q28y|b+)&GDUiX_)z4*}Q$iB}mcHU~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..50cc43898d2c3092605d63a839d5f83485c8b013 GIT binary patch literal 1081 zcmV-91jhS`P)00EHXRKwBp1Vh z7Xow9$o$xYuMt*k`wQMs3qx|k!pyZkuT4h z%KdMijxjP^>E0TJrYFyP>xIA$l(#+a>&WxU$KZd2i$cv`l$^#sMBlDykpl>Az}aO@ zOYOq>CUibnnyvjvewjYQfY(!KOG5h%1eYpVRo6MWhs3%((KYPtL!ayqEq?=1_D8L-FBDyTltYON$i-WAo^j+0 zh{F!R5kP$2PKY`dtpMP7yWLuea2z5z7K`KYm?J(H0%Jk^(9zWz0pQG2JO*QuE+=Du zM+k_6J9W3)*`y5}T?zay2T=UsaIlF5bkSnYlQkUajf;dh5dz~zUoB=y8#lz8m8JO8 z>11sxCpoAxvABbu_1Zw-)~|oPilWG{s6K=m0K_xfvo``KC!UMqL%?EEmkXf=fPsL( zGh~v-WX1asj3#?5kPuz*v}^1^a1L!QI_9tz(jWpNAOa#F0wN#+A|L`HAOa#F0wN#+ zA|L`HFeL)!-_@slKHyP?jkQ7FDa1Dw8Bs^@ZKw7*3IIg0VB!iyr3DcFV|QSVA%I5# zU>)8S&uf;ThlIc#2;iePUnt7Z`~7~9)uC9dJm%o%zwGbI<00o&E-1gge?H#dici{i zm7r;p(nEaZJ7suqOm6@zE}ESH=Xg59u1u&7AB?2Ifa3YALX`t@6GMY_+O3=Fa9zm?-epcZj01)LvXsg5b0RZu=<+C^A2PxM-48VnuREKXN0|@--HM?vO z@hwxQ-L7&%+Tg&bA$xAi1^c^a00000NkvXXu0mjf_6FP; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..50feca5bb6e1fb88bb6cc32e5a3639a1b79973f9 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_9c(P3!U8ljG$bX&G}KhY!N8*^ED0#bQ4-`A%<%vJf0qCM zS#KV_Hw`GJ<>}%WQZXkvL4uW~aRR5-{Llc&&<5Rr6AYm$p%Q0#wz1@>i3dD0xW&xy XqLnF~FK*>ype_baS3j3^P6hp_pQQD602W+a|2UM^2`&y3fMAFp2<`kaNbfYLdBOKl=>WX)T`?X9g zA$%zqA8bW5J-77h+!MD}~ue*rOJXdxs{ zk&plY010qNS#tmY3ljhU3ljkVnw%H_00J*bL_t(o3GGx%OItw{{t{yGMNA^tm0*Op zs3|mUjHMBbD-ldVu-$auP5(fl;KEfm`6qSLP((`MibkxqMnOdkVjl?gmBe5lw592M zBQtpQUW?gCVa{UaoO93PJKr2GV8k$B7%&X{j|_x6BGm_@kE*v1cfikH9r z!2NVuhrP^Z;r;zx+f)vV2d;H&fx=+j?GFWyx_t}?N4n)C<)aD$jrDXP8oPr~C-~Ile9YA3{ub-e&Dd|8b#ou}z zr-7@&e|!y2;o4W)`)qpxAJLQkV4y_?1=>12Jw0)$kB>dYPe(hL$LW?!$PWv17MR#r-z2OP0I%OzLO(Cu8%|H*-pGcc@nxGc-^)Wy zLVf4c1{N3JQN>Jd9+TM@h$RN4tq!ur95P3pLJ*gkT-EY2NlmYudtW{(6=UPiZ6G)$ zH=UxVmsV|uZ6TaWJbv;_x?g1{Bs&DaO(z3qfji~@%cpn1Es)PaM)))oGFAX;`USi7 lFn+^;VZbn87`Rdf{sNX#`ba(40FD3v002ovPDHLkV1kx+-30&u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..23958df24634b0d759efca2ce80bce2bbd78b5ab GIT binary patch literal 1010 zcmVhp_pQQD602W+a|2UM^2`&y3fMAFp2<`kaNbfYLdBOKl=>WX)T`?X9g zA$%zqA8bW5J-77h+!MD}~ue*rOJXdxs{ zk&plY010qNS#tmY3ljhU3ljkVnw%H_00JsWL_t(o3GGx(OItw{Jqc0#A|?@ZRWL$a zXbMe@v6wD&B?Vm+Y&Y)R_y+_b3s>FbpR}8XQbdF&8cDTnDyWE|_)!G4HHpEGQl;rT zV`s=Sc^0!N!raBYJ9p;Xd+wRb1GH%cv;taz`>24wJy3ixI#%Sj8vYVbtivvWOrAgg z3Fp;?y7t>uZ`t$UIQzpkj{^R6n0I?8YU122xKIn*koVr-aaksRg zl(W}~@oeJC}UJ3uNn3@5*i+m0$!l$88u?$evFW9bzj%x+9 g0$KsBz<*WX54cDAe9QeTFaQ7m07*qoM6N<$g6j6%L;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..1c90f37025cf2a37dcac7457eb730bed00750c51 GIT binary patch literal 1566 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f1a6d2484660b28c5d1eedf5736ec424c3f84b7 GIT binary patch literal 1049 zcmV+!1m^pRP)hp_pQQD602W+a|2UM^2`&y3fMAFp2<`kaNbfYLdBOKl=>WX)T`?X9g zA$%zqA8bW5J-77h+!MD}~ue*rOJXdxs{ zk&plY010qNS#tmY3ljhU3ljkVnw%H_00L1-L_t(|0qvT*N&`U@hL55m7T#l_hzY?$ zM8qbF;044|vCzuGLMtE2#?D530DCJ zy|pC^^Ye0Fz7ksytWKbfS&0h>x+kY+joB~cr^Ds%%3oXzMr{X&$AKQ8(I5jO=ptEY z@9Z4~`Qls%!C-izNmpV|iycpokFvV4DRL=6tzPYDQRd4q=nnSv%0R9lQ( z>JPV>d{_ritKKz(@9t^dE&W5c0kmF)Vz9QdB<1Vu;?_68Tz*DwDiz616s0gdYh{@t zO(d^>?-v*6*|T?{puSVwOY7S~s}SPGK~IO^B7UoyQ3z?9qv}WUamhljtpI=~0!CsZ z!=sJQVQ+Uo_Onp!u!H??C7NjmHC--9s=t3o-rwKk<@Gtyr>UK(U$5-c3P=me)Gkej z{UksFBtQZrKmsH{0wh2JBtQZrKmsH{0wh2JBtQcHg}_hF6s(^O`T*I>!UwuK-Ea}YF3X#Ta(|N0I*#g z5e*-J;RA&j(aVd%32Z=mafHo%L9ZQv?w@UTQS#Au1cm_BX|Fo}kJ_2MD}Z|P`Z)OV z5(JXhA?QJyJ}Yoa%gaQ+OGd4L?`+cgRPr{o(tLT_|F4txc2*b|36KB@v^#+h_hp_pQQD602W+a|2UM^2`&y3fMAFp2<`kaNbfYLdBOKl=>WX)T`?X9g zA$%zqA8bW5J-77h+!MD}~ue*rOJXdxs{ zk&plY010qNS#tmY3ljhU3ljkVnw%H_00N6iL_t(|0qvT-Pa8oH#Rn7+q9Bmq6p5_Z zLM{kG1_~lkL`YFeqZFY^K>-ziRGM@&ky|=MV=0AA0TNh|BM=Rc5V?rbUGA+i*5Qw} z@6PA*#cw6+zIJ!s``zxjm=R$k0TLhq5+DH*AOR8}0TLjA1QM8gmUhC(9uG4(?y)ex zzOgAd1_hB=0BZiCQj*ntUbYGa10u4Qf`FesA0S9%G5k#IedF0o&a41eU*MHsjg0_1 zyZfQ`nl(U(hnaVJko{u5Yiu zIkoC(Z@RJHAr|J>H@BksqDDjm0KESU2!m_*fFE3|Kb*I;?GGPKr>9Tm8(-9xP6@mL z2rv#`kgq<~%7dkWPBSxeQm^03kDqrBp6P%j9)0;zQb{yw)BL~svU%n+5+DH*AOR8} z0TLhq5+DH*AOR8}0TLhq5+DH*2u`3m=@5LT;Tmbp4XRX=VR0)lMz(c&`ZTdqe#h|zz*~%ytw!*>f1AXrn;Y9xqKHLr68nIo1l{S=-!^GZCi!qoteBtQZrKmsE| Z;4gA{(ZiuPv`YX0002ovPDHLkV1k_B{ow!r literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3836a5e8095d8e593fd76f8a40c817a456c61c GIT binary patch literal 722 zcmV;@0xkWCP)XLKGm!JzLujmku){v=oX&VbfYLdD;(M^>WX)TU0NoV z5Iz?68gfA48>PqV{Hi!z=TF5(G&~13)zh7B;&>Bl86zh=A?(RzOWNOg)J>ep{8B{f zkj!CB!UPH6CQgYBvJ~-2%}Zvjeg2wnk%D+M`RkN1#E~W=UazPn>6(<95zl8Gx=A%la4t#~xHGmi2RDS=CdpKf_hN;V(!|Ghd=t8k*+_`nTcYx}nAQ z;c^ECpY)g!t4Vg5wp0q<&!KMx2JWC|t)A82I%kg%-I6D|g@Z#Fm;L?gzw)JM1n1{0 z2LJ#732;bRa{vGf6951U69E94oEQKA0Sie)K~z`?V_+BsqaiRF0;3@?8UmvsFd6~_ z90H8uGRh3n3hE5pT$~KIu3cb|lvMt&pdbf!mYtOe!=h#D7%rUN#fa`skUj%r3x=H= zm!eCN#Aku223h{{$z29cb}j}6r~@88eg>09p;a~Y86;#?P{hdPFo86Jd=CQ;?p|hm z@Zb@c3vxhQR1kxKsoQ^;Jc$1E`3nOVCkMl~?>~@*$zrpBd<_CH8pQta?m0XZ4jnrK zb_7uPKPW0dL9eD|08+;A;_)3YO$h-G0c6WTh9QRnh!1iE*ij%35Pbdi9qfBhNYE50 zDC_aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*c_3|t?$2l4?zid0&ujp!SgCU@V$ER#jOGpUZ-fn;ar=lf=7XC<;?J77Ct zJMh;!uv)Ed_&rkhGr5Y7iFxHBOki^_tWkn0dSg9mZdiNzOQuiYh>o&q+2XdX#0t@xnfwe2N@TRGyw=`8hGp+*K8TH_L!i08P`3 zy3u~z|8H<4h%@&DRaMD+{SA4996)lw?tq6jJY?{hU%9y_AHugb+X34F+kyYtfiHfN Vv?Yc!a8CdL002ovPDHLkV1gZ=f&u^l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..1552153581d828abc60a329f02556e31d34fef23 GIT binary patch literal 822 zcmV-61Ihe}P)aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*E) zgxkS`I?D4LS0gFQQY_0NbFSon#qWl6P`oG#2~gLy;8VhgsiG*7e*IBZ)y{Okzl+D? zV`l?imSxI@T4*{+64{8PBTZ8k&@_$Gp@3f3b(IZ%*nSe8!(+E?ldp?xy9VIYrSE%X z3d2z8DA0ACx|0INbQZ~nllFjYatCms;=Ca2<2dp~eWD2}u7lAoX*qy76xjeTZj!8T z^kJ0~#~b-D`B`y%qI`OarO%0QOi$SWzF`791DK}i&<*aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*s+?q!d~x*wRZudx*7d zBC^gi?Yqn_yEC)9*(A~#2)jEw^UnJ`@5gLrhA~?#1C{~HfMvikU>Ufq3}ke`^ZC4! z%jMi=`}_OaK5pYK+>DHjI5cdt*<^=@he~~~QRAR1z!!@}md$3xZ*XuB&758(0pKSm zC)x4wF>AG2;szf% z9WAnhgYV2FR1+(^_F~RC{r!u9fVsD8iRFa>m+L|JlMgk962np+1-E6T>%~r&=!vO@cZA1Rm|W3BFdViKItUHQXM+ zO~6C+1-M40lH~XN70d&~g+Y`^G;Gvvy8bkxRVEUn{jAE9^WOUQb~aK0|gn4 zMnn7Q>(?VSYtcY(UDc;3wF|nUFHLnc&&!slu%Nzi#z{;7a)2BHuojQU3=-4k=BD`H z5QhZn19=k@6C%^g;0binYor_yG?)w??=RvKB#7n&B&e^d4%Q?KyVvF1aJlbo)(6W@tc^g=v)0-yPrvwmrdmdpcZ=VeL{ zv_lO7{M+-Zs~^RN>BaKAQUh%WP;a3WKSr3Y{&sja3IXH+ ziYZx$d`P0x;Gu`#@}wJdrQAhzVOMPkKoAZeV6V@=4F;h@w}(1aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*s+?q!d~x*wRZudx*7d zBC^gi?Yqn_yEC)9*(A~#2)jEw^UnJ`@5gLrhA~?#1C{~HfMvikU>Ufq3}ke`^ZC4! z%jMi=`}_OaK5pYK+>DHjI5cdt*<^=@he~~~QRAR1z!!@}md$3xZ*XuB&758(0pKSm zC)x4wF>AG2;szf% z9WAnhgYV2FR1+(^_F~RC{r!u9fVsD8iRFa>m+L|JlMgk962np+1-E6T>%~r&=!vO@cZA1Rm|W3BFdViKItUHQXM+ zO~6C+1-M40lH~XN70d&~g+Y`^G;Gvvy8bkxRVEUn{jAE9^WOUQb~aK0|gn4 zMnn7Q>(?VSYtcY(UDc;3wF|nUFHLnc&&!slu%Nzi#z{;7a)2BHuojQU3=-4k=BD`H z5QhZn19=k@6C%^g;0binYor_yG?)w??=RvKB#7n&B&e^d4%Q?KyVvF1aJlbo)(6W@tc^g=v)0-yPrvwmrdmdpcZ=VeL{ zv_lO7{M+-Zs~^RN>BaKAQUh%WP;a3WKSr3Y{&sja3IXH+ ziYZx$d`P0x;Gu`#@}wJdrQAhzVOMPkKoAZeV6V@=4F;h@w}(1aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*;uF8*9{ z$|V%Uo3}nm!F$1@(7VtF$^%Fa0YOjEON^dMdr5k*{T61KY*S10RM-LC+4=isznu+{ z70ZBSz%uaP7-+ZKXZ)_|`<7gV$H2UD6J}v^FXN!g{02L*_IkaGC(H9(hdYj=b*Ug` zI2_VuvmrAEzAVccXaFnnn)u_6f*`>5CJDokj>n^_QC08TUpizH;FHNjB}7p~v)L03 z1_QOhIbge*0c;pt z0>ZxE@8zJL(FB8=#dwyC9F+N0?%fFzv!5+I(a zJUyS1pHp36j#mxf&2m9F*6Wx~r;KCtnx?7NO$GGh{$(9ArfT0bPr$(MA8%FhwA<}U zcE0y(z)?sJ7aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*6Twblpua{~9j1dfB0cJ@|U9g;@UiibAu{5_no>Z(t7)X2?(dD(rtv)}ja zym|0uoU>*Mm;$DNDPRhi0;Yf|U<#N5|Dyt*u8nl5R7wQ%Xf%q(|3!>l!xi%NdfiPX z6E~mFftxtxo2eQeUy9|2rbL;$E(dw%|vlE1zE z>K-1xtGT|)>G&jZPx`f5%@qm-*X#9;IxQZf&?z&X%iW|~&Srm)vhCwle*_>-!xM1Z zWebv#o9kBzcnbkmZXqtBNQ?;yw6fq59l*(tfJNXUfQe`9!^AuZcuWF4 zM+k}9jYeZHc*x5<*2zf=_^cwz{47`XAn1eSEifDoUA0U@Ntu^+#O*A?O2Kl1VC+ zia)&ZKY^2z7xE!n8;c?b)L(B3Y_(mSOm_4mik|p{O^k)BPaPN8rtZbV~5lb zsOJUFNp#y@q~!R*%zk0>?fq>K=gmX{N>Zi4`I!H3TGHyyQ&K zl)3;?8{h|`;Lb{eA+ZmsAy5y3F=_EbH9_Q1lz)Bwqf0`J)yt7qR~C?rx)QD8}a1t&J7& k>IfTPQ@|831x~HNKUx&UuuV|xr2qf`07*qoM6N<$g1%^5umAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..828a439d3103b69e8a4b479746b0a168ae9a9a8e GIT binary patch literal 1461 zcmV;m1xosfP)aTcv(fI_MzckfDl03q?^nN(H-Ahqi)Mm*h2Rg(M9xDN&&ow;(%c~Jd;XFtNAr4 z_>O*r8#OC4+gi#l=FoNhJi;gXLrl!-ey-yhET}dEe0{`o%;FC5JaKx|iCkFb(l zAU+|Ea=IY#t;T_=erllzd zz|}4=`fSNuZb$(tzor2n7r;;+7`_Jv*1fEn`#66Ba@+Ka?tsH1V3N*Hjn#>uRS+8+D>2+PoB0hh$K1L*JC}{#-ubq; zo!fcy-uHd;_MPrqrQ{F=L;+Di6c7bO0Z~8{5Cuem_ozTJ?xg4E=Tpbw?(S}AK2vV- zIG!QDw6vtAr>9k;(SSlatO#Q(0OS`I7F4g-Gke!=e{y>`ln7A*5Nv&YUG4AhB}Yf! zRj1Q&!PLXULx23119rOG?e^23*oTMT3*a1wOTE;v-4RU9DFsrH2%^J3T8ltyxIB1#im+WX{nQwAGHtx^4r^A)b({| zAT!Yt{AEXB2Dr3m=PxfWjUS!viN3BKe>C5_-9IB00gM?eNp{z<2^Gd%0UUV>%kl9~ zQ)OYSg-E#P5rLx)w*go!7RaY-YiouR#gW_L?Cdz@-udc4H+?3foR~RXnWN?2nZ-A4Hjg6G^*49?))XlT4<27*mxWEq& zpO-(+_yZppV7$4xscvp=Of_ZasjTkEI(OIWbY_QroZyECzYg$%A3S}VDZbd^mQwIA zW|5y-mgI{9Qz!Bci!Xwg@+rLF$Kh-^57Yn(hfm%an^j}<;So2e?Pi)ko3k`bQ6Md5 zXJ^&(^K*aavxbxKJ;;;ENg!Fq;l1!I(?RA%0Z~8{5Cud5Q9u+B1w;W+Kok%KL;+FY z9V-xiPOgRVpP;x0rIV!Bz(dh2G0127@3rU#WpP&dUMK+M3;OR9B|@P9q&w{-UtQN` z;+mfKr(S(b|H5{w6Wgjc-C+F)yi)Aa8i04Qfi8<~E+p=C6dH~Qlzj$Y2~A)z80>or z3H=M+Q=nCUe*P=4s(i|{#zJNUrvFYbf)bn^08C8(J>)xf&LeM{v*2Lo@9%%dx+t^@ zW&nZn`tNw7Q_PD=IunBZ_rl1L6OMel-EY+!%)GNuHT{85SOb`(4gkQ7xexvRJD}|G zDk2cCtW{rCgrES9IA=?~TL0au6>}n9v)NRqr>E-i@$p5^lA2VNd<>2O8$kIN$d0o9 zyKf&eCI)_YcXtQgQ}AQ!ag3`dn_vyd^8gU7yjjPXLdYLW6ejxb_SeC*p!3#;t~uWb zu)4Zx3a;O+X5Owh@&88#l->eaz>s%9oDkZku>YQ2AN&2STJ=K<00ED<;bZ?t$nC$! z5_W#seOmSY&JW{bq_%)xUS6*JZV`S)N~B8gu?Am-xU3ZgL;+D?92NKrqj5sB50E+- P00000NkvXXu0mjfb1SlS literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..148c42717e13bee3bba87ed0e4ed0548ceabd8b0 GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFcxGwI|pPYCo?c;Oe~$a*ZZ)8 z#IgC?vi`0px!`z2F+sFltgFewi*8{ygpk35l(PfeJBK4X@{|-+N({Q5@ z_srgdZc?5q3XYDFvoAbUaJ#zX%&p&#O79zaJxTnsHGomwozeA^o2PDY_|#QyyS#$k zU7!53_m7@E^V_a=A&2j)U)T9D9IRasR(kh-@b$HG85_kP+{*doJ>~Kp^OskbiCMB8 zvOe(CH#nHDVRdZ6lbe%v#!P40@@E!XO$taO%DJB%+ zfZ~CUy!}(B-mTZwjcv=mu4jB_cYXK6qo2hkvMziLIF#;mO-E7lqx?*NezPv-1hJ-? z|G&O^OH5y8!oBOILAQPV&kj9TVY@b<)Mcx8nU7`%I=ee3n6S7xCwR0mFr*tx?>5g* R_5?bE!PC{xWt~$(697FF`A7f& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json new file mode 100644 index 00000000000..50682b9b72a --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a570e87127e56cafd63782518762ff3e495e40bd GIT binary patch literal 891 zcmV->1BCpEP)EX>4Tx04R}tkv&MmKpe$i)0P%#aj=MpLx$>PK~%(1s#pXIrLEAagUR(1nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0YaNI`^*2CAsRM2uFI6a#76kGuGXZGVbfGP$Z? z zjFl;S-R0fE-roK_)9LRA6Zdj~FVHAf00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=Lii49xahxXQ==H02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00B8kL_t(o!|jzpiiI!?hJV5R(2ea0Y*!vZ?=bLg^kB~A z6mSw^7`Gv0QFiq215D`_*xtvm3Z7!6E005QNIuFAD02s${lT0avrfCk9 z#27ce7~`fp(l2cm7GwM^fECL?+-jxNrtN#!FW1ZG8PdNNAQQ{hNku6oSZh}md*ytL z?@;q*PRx#Zo~!)@B%;b%o9{@>RQpRP(OPGzUMYono-g;jUBK06cyu&(&zjRYATQC& z{`iYwS6?}05k&M|{tbmf;a~Ct`diy^Q4}ls0000EWmrjOO-%qQ00008000000002e RQcO+d52Hc+oQNUh5gUBli!^vnLx(hu}>Xa%Gk z%n$$o010qNS#tmYE+YT{E+YYWr9XB600B!$L_t(o3GGxnj)PDPbR_x}4R8XW;s|hu zNNFSOQMm#Y+yH2ha)E^LW{`;j+GU#*cES6MJ)Sr3B_bZ~fIHw0xC8FMjss;`-s3pF z@1*=00%xA*3umy!fTXVL6t)G^H0fTJWs)R`&ilR>2`~hRFPF2VX)4$2_s{0@TNH&fO`|zz0#5Kj6z3E=ueIs~0Z@#n>sm*C za3Y9#7vngtFs!XR7PoTv1EtEt5o0k$#iVq+@C z8grfktf*ri>Qmcm);WGco zxM>-G4X;;oq{&{*=Klb%2F1_$*B;SPY*T<~tlaYz-HtZ#I(NVwa0foxfd^dy)w5>C R1_uBD002ovPDHLkV1lcBWsU#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..4193e2eb0cf0c6e969ea1c03bae083d6348e3a56 GIT binary patch literal 1093 zcmV-L1iJf)P)YAX9X8WNB|8RBvx=!KdMT000BF zNkl7#Kx{4ao*}F`jHswRASSGu^ZEFQ)q@A(O6OSJhYDRa!y_+~;K(00w{oU;r2Z z2EgqV1c3m6e!p)q#)R+t2*c27x0v;mOOQ53;(9PID!!1t{U=FcAG&Cy?}ErhQs01YiaLG#O4F+GBkD^4(fwyz0qoB|*lR$og1kZ(E#ST$T>t^^52Daq;^G1Uc5_98j4G zboREz#@Zu%9{em7z&r?KuuEvI z15kn1FN$|MVcFe-AQ1h2e_Evy1f7yy3&76$s?arFrHD$aKpA65k_1r{O@HS5KB(lC zJ%kcsX&#_!aJSnPw0Ru}v&K`Fm+vI=zDXWY`+IlSLbBp2Q3Q1Hb?<01N;FzyL4+3;<04RF~(u*i`*+qH_n)0^oTbPESu8 z4WQj_i#U$U0Z`_pq^^sY7J#N3pJ%To1WXdt41qlFZdDpjvjK$z2!cS^wvDZ=EyQ0x z&F#_GxjK8>!h87!XJ=;^kH^ZMs;vU82Y)cHM_;$`)TEvKeTc$TfO9SY+<2A-77r@a zZ9MfXC||j*3jnEOJqrPF&INT^!Z5tmcWVNKMeTV?gq(BohJ_GP$K-6=1^~oyjCm4R zCxo=w1d>9}^8g?YAX9X8WNB|8RBvx=!KdMT000BF zNkl7#Kx{4ao*}F`jHswRASSGu^ZEFQ)q@A(O6OSJhYDRa!y_+~;K(00w{oU;r2Z z2EgqV1c3m6e!p)q#)R+t2*c27x0v;mOOQ53;(9PID!!1t{U=FcAG&Cy?}ErhQs01YiaLG#O4F+GBkD^4(fwyz0qoB|*lR$og1kZ(E#ST$T>t^^52Daq;^G1Uc5_98j4G zboREz#@Zu%9{em7z&r?KuuEvI z15kn1FN$|MVcFe-AQ1h2e_Evy1f7yy3&76$s?arFrHD$aKpA65k_1r{O@HS5KB(lC zJ%kcsX&#_!aJSnPw0Ru}v&K`Fm+vI=zDXWY`+IlSLbBp2Q3Q1Hb?<01N;FzyL4+3;<04RF~(u*i`*+qH_n)0^oTbPESu8 z4WQj_i#U$U0Z`_pq^^sY7J#N3pJ%To1WXdt41qlFZdDpjvjK$z2!cS^wvDZ=EyQ0x z&F#_GxjK8>!h87!XJ=;^kH^ZMs;vU82Y)cHM_;$`)TEvKeTc$TfO9SY+<2A-77r@a zZ9MfXC||j*3jnEOJqrPF&INT^!Z5tmcWVNKMeTV?gq(BohJ_GP$K-6=1^~oyjCm4R zCxo=w1d>9}^8g?EX>4Tx04R}tkv&MmKpe$i)0P%#aj=MpLx$>PK~%(1s#pXIrLEAagUR(1nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0YaNI`^*2CAsRM2uFI6a#76kGuGXZGVbfGP$Z? z zjFl;S-R0fE-roK_)9LRA6Zdj~FVHAf00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=Lii49|9wkYq0eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00CY}L_t(o!|jwYZo@DPMZbdVg%(REh&bg4@f`}}Mge-R z91g`fSN=LD5!IaAwT(nn zVvKdI??nUv5JG_W9srP1LW~jCT8Ie7aYRaKF|YR?nil}J+95L=6&r>DF~*6Al2Ss> z8OP&0cDo$_;C{d3bo#)4zsL1@tpzc&A)+E8b*+UmGXTIi=gK&a0D$xPJQ1_jVi<hSxZQ4MK7h<@LI`CpY^|;PpJlTot~lqaJ0b!iDwoT}w3e$Aud-ogvm{PL zr5%>m6=pU%px*n{LH*SgtOeR3`dPpI$Iou_C@3QBfPJnN*t+yA=GBAFxuT!ps{`2S zbUFa=1zZ;I{XsyC9smFU4rN$LW=%~1DgXcg2mk;800000(o>TF00002BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107>{|nIEGZ*dV9;U>yUv6 z+k@-MJ2-bbo={_#m~bc2p~y{ekF(%2hMOLF0e8M|iM!j3(>*){A*EV=PuUmf1h=fN3o!1;<@L=+qoE)ihQk&f19%Rd(F<6Ym5uF z&ST0mo2{ijH<|D7g|$gM8?G4%P7Larx3}n8)U+Ls9x+(PP7T^}yY}+Kf|^y<74LVZ znMalIoR~kic+1^7+a86R&&B7mZN2tp?{W#{zvT&kW;<%CPORI{(Qs{6ui=!SS>Gg+ z^ZGa|ziHI#_bRYWke(u)v-WAB%t?u2Q{g?|=LF44>-+S7^_hmESEo3heyPab|K!W} zZP5>HJf<-`wX@+y_Y{I3!Ro-#n620AE$^R_8<6emtaQdm!eq|8n^*!)-GepH_Ux z0P@o;pRaiTJBxeS*(>a4zE-Z>)tL5*`CV+~$z6?Vub7`LvxYG4RR*`VD}tT#FwyY~z21Pbt_MtG+A`Z8z%*&I;!UJ9NJVtKmyxvX2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I1081H(zIEGZ*dVA|&Z?k~_ z>xG3aF%zse?AXyTbjdPx|8{dx7Q3?$y85;4HEhq_qVIC+njG^ zf28Tsa<5VZXdybVk-rvIcrNg=$bI5UdP_~p8UJ3PaQT~^SZt5*#wUNQ zYu9G$GIg}`yL>5FG0EtIX|;%0ep6xUH4C@X7Z*=pS)k+HwUEX>4Tx04R}tkv&MmKpe$i)0P%#aj=MpLx$>PK~%(1s#pXIrLEAagUR(1nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0YaNI`^*2CAsRM2uFI6a#76kGuGXZGVbfGP$Z? z zjFl;S-R0fE-roK_)9LRA6Zdj~FVHAf00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=Lii49}+$zd({8{02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003M`L_t(o!|l_t4FDksh2iJr7O+7_aQ|tTfyNQM?gl_( z^?wx&JQ9Kg004jk#uzKx`|bvtnIa-Rr)e*?psQQ!u000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef&@b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json new file mode 100644 index 00000000000..0a03eead873 --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} From a4885ad73dc6ce4c1bef2434a0f94d3ef0633d86 Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 04:38:10 +0100 Subject: [PATCH 2/9] examine --- .../Ranged/Systems/SharedGunSystem.Examine.cs | 101 ++++++++++++++++++ .../Systems/SharedGunSystem.Interactions.cs | 18 +++- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 1 + .../en-US/_emberfall/weapons/gun-examine.ftl | 10 ++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- 5 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs create mode 100644 Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs new file mode 100644 index 00000000000..c100789d4b7 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs @@ -0,0 +1,101 @@ +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + private void OnGunVerbExamine(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var examineMarkup = GetGunExamine(ent); + + var ev = new GunExamineEvent(examineMarkup); + RaiseLocalEvent(ent, ref ev); + + Examine.AddDetailedExamineVerb(args, + ent.Comp, + examineMarkup, + Loc.GetString("gun-examinable-verb-text"), + "/Textures/Interface/VerbIcons/dot.svg.192dpi.png", + Loc.GetString("gun-examinable-verb-message")); + } + + private FormattedMessage GetGunExamine(Entity ent) + { + var msg = new FormattedMessage(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine")); + + // Recoil (AngleIncrease) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-recoil", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.AngleIncreaseModified.Degrees, 2)) + )); + + // Stability (AngleDecay) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-stability", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.AngleDecayModified.Degrees, 2)) + )); + + // Max Angle + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-max-angle", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.MaxAngleModified.Degrees, 2)) + )); + + // Min Angle + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-min-angle", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.MinAngleModified.Degrees, 2)) + )); + + // Fire Rate (converted from RPS to RPM) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-fire-rate", + ("color", FireRateExamineColor), + ("value", MathF.Round(ent.Comp.FireRateModified * 60f, 0)) + )); + + // Muzzle Velocity (ProjectileSpeed * 10) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-muzzle-velocity", + ("color", FireRateExamineColor), + ("value", MathF.Round(ent.Comp.ProjectileSpeedModified * 10f, 0)) + )); + + return msg; + } + + private static string GetCaliberFromTag(string tag) + { + return tag switch + { + "CartridgeMagnum" => ".44 Magnum", + "CartridgePistol" => "9x19mm", + "CartridgeHeavyPistol" => "10mm auto", + "CartridgeRifle" => "7.62x51mm", + "CartridgeLightRifle" => "5.56x45mm", + "CartridgeCaselessRifle" => "4.73x33mm caseless", + _ => tag, + }; + } + + private void InitializeGunExamine() + { + SubscribeLocalEvent>(OnGunVerbExamine); + } +} + +/// +/// Event raised on a gun entity to get additional examine text relating to its specifications. +/// +[ByRefEvent] +public readonly record struct GunExamineEvent(FormattedMessage Msg); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs index f3ff89a660e..53353ae8776 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs @@ -1,4 +1,6 @@ +using System.Linq; // Emberfall using Content.Shared.Actions; +using Content.Shared.Containers.ItemSlots; // Emberfall using Content.Shared.Examine; using Content.Shared.Hands; using Content.Shared.Verbs; @@ -16,10 +18,22 @@ private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args using (args.PushGroup(nameof(GunComponent))) { + // Emberfall - Add caliber info + if (HasComp(uid) && + _slots.TryGetSlot(uid, "gun_chamber", out var chamberSlot) && + chamberSlot.Whitelist?.Tags is { Count: > 0 }) + { + var caliber = GetCaliberFromTag(chamberSlot.Whitelist.Tags.First()); + args.PushMarkup(Loc.GetString("gun-examine-caliber", + ("color", FireRateExamineColor), + ("caliber", caliber))); + } + // End Emberfall + args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor), ("mode", GetLocSelector(component.SelectedMode)))); - args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor), - ("fireRate", $"{component.FireRateModified:0.0}"))); + // args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor), + // ("fireRate", $"{component.FireRateModified:0.0}"))); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 62e63501ee8..a4ee7e16227 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -90,6 +90,7 @@ public override void Initialize() InitializeClothing(); InitializeContainer(); InitializeSolution(); + InitializeGunExamine(); // Emberfall // Interactions SubscribeLocalEvent>(OnAltVerb); diff --git a/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl new file mode 100644 index 00000000000..5b6222b1666 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl @@ -0,0 +1,10 @@ +gun-examinable-verb-text = Examine statistics +gun-examinable-verb-message = Detailed statistics +gun-examine = Gun specifications: +gun-examine-recoil = - [color={$color}]Recoil[/color]: [color=lightblue]{$value}°[/color] per shot +gun-examine-stability = - [color={$color}]Stability[/color]: [color=lightblue]{$value}°[/color] per second +gun-examine-max-angle = - [color={$color}]Maximum spread[/color]: [color=lightblue]{$value}°[/color] +gun-examine-min-angle = - [color={$color}]Minimum spread[/color]: [color=lightblue]{$value}°[/color] +gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPM[/color] +gun-examine-muzzle-velocity = - [color={$color}]Muzzle velocity[/color]: [color=lightblue]{$value} m/s[/color] +gun-examine-caliber = It's chambered in [color={$color}]{$caliber}[/color]. diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 12f153d55ec..7f9962931cc 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -182,7 +182,7 @@ soundGunshot: path: /Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg params: - volume: -8 + volume: -4 selectedMode: SemiAuto availableModes: - SemiAuto From aa47f5361a53796138e148992a5e49b1e2ffe656 Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 04:38:17 +0100 Subject: [PATCH 3/9] kill --- .../Weapons/Guns/Gunshots/universal.ogg | Bin 11292 -> 0 bytes Resources/Audio/_Emberfall/license.txt | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/universal.ogg diff --git a/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/universal.ogg b/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/universal.ogg deleted file mode 100644 index e86073d1136b11d37b3fb74309536f4c58c949b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11292 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 Date: Mon, 30 Dec 2024 05:24:54 +0100 Subject: [PATCH 4/9] tracer bullets wooo --- .../Weapons/Ranged/Overlays/TracerOverlay.cs | 23 +++++ .../Weapons/Ranged/Systems/TracerSystem.cs | 87 ++++++++++++++++ .../Weapons/Ranged/TracerComponent.cs | 47 +++++++++ .../_emberfall/research/technologies.ftl | 1 + .../Weapons/Guns/Projectiles/projectiles.yml | 38 ++++++- .../Entities/Structures/Machines/lathe.yml | 18 ++++ .../Guns/Ammunition/Boxes/heavy_pistol.yml | 24 +++++ .../Guns/Ammunition/Boxes/light_rifle.yml | 13 +++ .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 13 +++ .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 13 +++ .../Ammunition/Cartridges/heavy_pistol.yml | 7 ++ .../Ammunition/Cartridges/light_rifle.yml | 21 ++++ .../Guns/Ammunition/Cartridges/pistol.yml | 7 ++ .../Guns/Ammunition/Cartridges/rifle.yml | 7 ++ .../Ammunition/Magazines/heavy_pistol.yml | 42 ++++++++ .../Guns/Ammunition/Magazines/light_rifle.yml | 13 +++ .../Guns/Ammunition/Magazines/pistol.yml | 13 +++ .../Guns/Ammunition/Magazines/rifle.yml | 13 +++ .../Ammunition/Projectiles/heavy_pistol.yml | 6 ++ .../Ammunition/Projectiles/light_rifle.yml | 5 + .../Guns/Ammunition/Projectiles/pistol.yml | 5 + .../Guns/Ammunition/Projectiles/rifle.yml | 5 + .../_Emberfall/Recipies/Lathes/security.yml | 93 ++++++++++++++++++ .../_Emberfall/Research/arsenal.yml | 17 ++++ .../Magnum/magnum_smg_mag.rsi/incendiary.png | Bin 0 -> 294 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 5 +- 26 files changed, 533 insertions(+), 3 deletions(-) create mode 100644 Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs create mode 100644 Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs create mode 100644 Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs create mode 100644 Resources/Locale/en-US/_emberfall/research/technologies.ftl create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml create mode 100644 Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml create mode 100644 Resources/Prototypes/_Emberfall/Research/arsenal.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png diff --git a/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs b/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs new file mode 100644 index 00000000000..06f0e16e280 --- /dev/null +++ b/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs @@ -0,0 +1,23 @@ +using Content.Client._Emberfall.Weapons.Ranged.Systems; +using Robust.Client.Graphics; +using Robust.Shared.Enums; + +namespace Content.Client._Emberfall.Weapons.Ranged.Overlays; + +public sealed class TracerOverlay : Overlay +{ + private readonly TracerSystem _tracer; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + + public TracerOverlay(TracerSystem tracer) + { + _tracer = tracer; + IoCManager.InjectDependencies(this); + } + + protected override void Draw(in OverlayDrawArgs args) + { + _tracer.Draw(args.WorldHandle, args.MapId); + } +} diff --git a/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs b/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs new file mode 100644 index 00000000000..b050d295720 --- /dev/null +++ b/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs @@ -0,0 +1,87 @@ +using System.Numerics; +using Content.Client._Emberfall.Weapons.Ranged.Overlays; +using Content.Shared._Emberfall.Weapons.Ranged; +using Robust.Client.Graphics; +using Robust.Shared.Map; +using Robust.Shared.Timing; + +namespace Content.Client._Emberfall.Weapons.Ranged.Systems; + +public sealed class TracerSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + _overlay.AddOverlay(new TracerOverlay(this)); + + SubscribeLocalEvent(OnTracerStart); + } + + private void OnTracerStart(Entity ent, ref ComponentStartup args) + { + var xform = Transform(ent); + var pos = _transform.GetWorldPosition(xform); + + ent.Comp.Data = new TracerData( + new List { pos }, + _timing.CurTime + TimeSpan.FromSeconds(ent.Comp.Lifetime) + ); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var curTime = _timing.CurTime; + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var tracer, out var xform)) + { + if (curTime > tracer.Data.EndTime) + { + RemCompDeferred(uid); + continue; + } + + var currentPos = _transform.GetWorldPosition(xform); + tracer.Data.PositionHistory.Add(currentPos); + + while (tracer.Data.PositionHistory.Count > 2 && + GetTrailLength(tracer.Data.PositionHistory) > tracer.Length) + { + tracer.Data.PositionHistory.RemoveAt(0); + } + } + } + + private static float GetTrailLength(List positions) + { + var length = 0f; + for (var i = 1; i < positions.Count; i++) + { + length += Vector2.Distance(positions[i - 1], positions[i]); + } + return length; + } + + public void Draw(DrawingHandleWorld handle, MapId currentMap) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out _, out var tracer, out var xform)) + { + if (xform.MapID != currentMap) + continue; + + var positions = tracer.Data.PositionHistory; + for (var i = 1; i < positions.Count; i++) + { + handle.DrawLine(positions[i - 1], positions[i], tracer.Color); + } + } + } +} diff --git a/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs b/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs new file mode 100644 index 00000000000..68fdebff3b3 --- /dev/null +++ b/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs @@ -0,0 +1,47 @@ +using System.Numerics; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared._Emberfall.Weapons.Ranged; + +/// +/// Added to projectiles to give them tracer effects +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class TracerComponent : Component +{ + /// + /// How long the tracer effect should remain visible for after firing + /// + [DataField] + public float Lifetime = 10f; + + /// + /// The maximum length of the tracer trail + /// + [DataField] + public float Length = 2f; + + /// + /// Color of the tracer line effect + /// + [DataField] + public Color Color = Color.Red; + + [ViewVariables] + public TracerData Data = default!; +} + +[Serializable, NetSerializable, DataRecord] +public struct TracerData(List positionHistory, TimeSpan endTime) +{ + /// + /// The history of positions this tracer has moved through + /// + public List PositionHistory = positionHistory; + + /// + /// When this tracer effect should end + /// + public TimeSpan EndTime = endTime; +} diff --git a/Resources/Locale/en-US/_emberfall/research/technologies.ftl b/Resources/Locale/en-US/_emberfall/research/technologies.ftl new file mode 100644 index 00000000000..a97c87f1291 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/research/technologies.ftl @@ -0,0 +1 @@ +research-technology-tracer-ammunition = Tracer Ammunition diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7d11dffbfac..a179df7d136 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -107,7 +107,7 @@ - type: entity id: BaseBulletIncendiary name: base bullet incendiary - parent: BaseBullet + parent: [ BaseBullet, BaseBulletTracerYellow ] # Emberfall categories: [ HideSpawnMenu ] components: - type: Projectile @@ -1051,4 +1051,38 @@ - type: ProjectileSpread proto: BulletDisablerSmg count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though - spread: 9 \ No newline at end of file + spread: 9 + + +# Emberfall projectiles: yes they have to be here + +# Tracers +- type: entity + abstract: true + id: BaseBulletTracer + components: + - type: Tracer + - type: PointLight + radius: 1.3 + energy: 2 + color: "#ff0000" + +- type: entity + abstract: true + parent: BaseBulletTracer + id: BaseBulletTracerYellow + components: + - type: Tracer + color: "#ffff00" + - type: PointLight + color: "#ffff00" + +- type: entity + abstract: true + parent: BaseBulletTracer + id: BaseBulletTracerGreen + components: + - type: Tracer + color: "#008000" + - type: PointLight + color: "#008000" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4b8622e430c..78fe159ddaa 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -392,6 +392,15 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + # Emberfall additions + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer + # End Emberfall - type: entity id: ProtolatheHyperConvection @@ -783,6 +792,15 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + # Emberfall additions + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer + # End Emberfall - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml new file mode 100644 index 00000000000..453b682d077 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml @@ -0,0 +1,24 @@ +- type: entity + abstract: true + parent: BaseMagazineBoxPistol + id: BaseMagazineBoxHeavyPistol + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeHeavyPistol + proto: CartridgeHeavyPistol + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolTracer + name: ammunition box (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml new file mode 100644 index 00000000000..9549b6fc265 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxLightRifle + id: MagazineBoxLightRifleTracer + name: ammunition box (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml new file mode 100644 index 00000000000..be22d9dba12 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxPistol + id: MagazineBoxPistolTracer + name: ammunition box (9x19mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml new file mode 100644 index 00000000000..988a02b16f2 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleTracer + name: ammunition box (7.62x51mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml index cbd6df45d10..1960dc6ba47 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml @@ -71,3 +71,10 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#65fe08" +- type: entity + parent: BaseCartridgeHeavyPistol + id: CartridgeHeavyPistolTracer + name: cartridge (10mm auto tracer) + components: + - type: CartridgeAmmo + proto: BulletHeavyPistolTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml new file mode 100644 index 00000000000..8fa02434ef2 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -0,0 +1,21 @@ +- type: entity + parent: BaseCartridgeLightRifle + id: CartridgeLightRifleTracer + name: cartridge (5.56x45mm tracer) + components: + - type: CartridgeAmmo + proto: BulletLightRifleTracer + +- type: entity + parent: BaseMagazinePistolSubMachineGun + id: MagazinePistolSubMachineGunTracer + name: SMG magazine (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml new file mode 100644 index 00000000000..2040a8b3b1d --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -0,0 +1,7 @@ +- type: entity + parent: BaseCartridgePistol + id: CartridgePistolTracer + name: cartridge (9x19mm tracer) + components: + - type: CartridgeAmmo + proto: BulletPistolTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml new file mode 100644 index 00000000000..fee2e1cf2c4 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -0,0 +1,7 @@ +- type: entity + parent: BaseCartridgeRifle + id: CartridgeRifleTracer + name: cartridge (7.62x51mm tracer) + components: + - type: CartridgeAmmo + proto: BulletRifleTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml index 691393755da..f7f4c120319 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml @@ -92,6 +92,34 @@ - state: mag-1 map: [ "enum.GunVisualLayers.Mag" ] +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolIncendiary + name: pistol magazine (10mm auto incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolTracer + name: pistol magazine (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - type: entity parent: BaseMagazineHeavyPistolSubMachineGun id: MagazineHeavyPistolSubMachineGunEmpty @@ -154,6 +182,20 @@ components: - type: BallisticAmmoProvider proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: incendiary + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunTracer + name: SMG magazine (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer - type: Sprite layers: - state: red diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml new file mode 100644 index 00000000000..ddccabda955 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineLightRifle + id: MagazineLightRifleTracer + name: magazine (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml new file mode 100644 index 00000000000..5ac3b5746f5 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazinePistol + id: MagazinePistolTracer + name: pistol magazine (.35 auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml new file mode 100644 index 00000000000..0dc8e74aa80 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineRifle + id: MagazineRifleTracer + name: magazine (7.62x51mm rifle tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml index 57f4490316f..213f0e4f392 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml @@ -43,3 +43,9 @@ types: Radiation: 15 Piercing: 20 + +- type: entity + parent: [ BaseBulletTracerGreen, BulletHeavyPistol ] + id: BulletHeavyPistolTracer + name: bullet (10mm auto tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml new file mode 100644 index 00000000000..d375063157c --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracer, BulletLightRifle ] + id: BulletLightRifleTracer + name: bullet (5.56x45mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml new file mode 100644 index 00000000000..7f1dcd06e77 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracerGreen, BulletPistol ] + id: BulletPistolTracer + name: bullet (9x19mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml new file mode 100644 index 00000000000..a2dea610370 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracer, BulletRifle ] + id: BulletRifleTracer + name: bullet (7.62x51mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml new file mode 100644 index 00000000000..20ccb09cf64 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml @@ -0,0 +1,93 @@ +# Tracers: magazines + +# 9x19mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolTracer + result: MagazinePistolTracer + materials: + Steel: 145 + Plastic: 50 + +# 10mm auto +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolTracer + result: MagazineHeavyPistolTracer + materials: + Steel: 165 + Plastic: 50 + +# 10mm SMG +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunTracer + result: MagazineHeavyPistolSubMachineGunTracer + materials: + Steel: 195 + Plastic: 50 + +# 5.56x45mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineLightRifleTracer + result: MagazineLightRifleTracer + materials: + Steel: 365 + Plastic: 135 + +# 5.56x45mm SMG +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunTracer + result: MagazinePistolSubMachineGunTracer + materials: + Steel: 565 + Plastic: 100 + +# 7.62x51mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifleTracer + result: MagazineRifleTracer + materials: + Steel: 475 + Plastic: 125 + +# Tracers: boxes + +# 9x19mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxPistolTracer + result: MagazineBoxPistolTracer + materials: + Steel: 600 + Plastic: 200 + +# 10mm auto +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolTracer + result: MagazineBoxHeavyPistolTracer + materials: + Steel: 700 + Plastic: 225 + +# 5.56x45mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxLightRifleTracer + result: MagazineBoxLightRifleTracer + materials: + Steel: 800 + Plastic: 250 + +# 7.62x51mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxRifleTracer + result: MagazineBoxRifleTracer + materials: + Steel: 900 + Plastic: 300 diff --git a/Resources/Prototypes/_Emberfall/Research/arsenal.yml b/Resources/Prototypes/_Emberfall/Research/arsenal.yml new file mode 100644 index 00000000000..7711de61605 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Research/arsenal.yml @@ -0,0 +1,17 @@ +- type: technology + id: TracerAmmunition + name: research-technology-tracer-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi + state: base + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png new file mode 100644 index 0000000000000000000000000000000000000000..05ff16bb3022e88c5d745df130a277f2f80d4575 GIT binary patch literal 294 zcmV+>0oneEP)Px#;7LS5R9J=WlT8kSFc3zcKPO?rx`!a)Iwm~`2jUi86IgHzqNxi5A<-z)R?)~? zm9(X=^G#u6pIG^ se18RoVF)?nDXI#*S`%7@jg3{g0ve%ef9Ekxe*gdg07*qoM6N<$g7@opmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index 15964feef97..7ee98537cef 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi , incendiary by MilonPL", "states": [ { "name": "base" @@ -27,6 +27,9 @@ }, { "name": "mag-1" + }, + { + "name": "incendiary" } ] } From 466d5cf9a0806f223bc533345a736c482e11a748 Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 08:00:31 +0100 Subject: [PATCH 5/9] smallest milon pr --- .../Ranged/Systems/SharedGunSystem.Examine.cs | 27 ++++ .../Systems/SharedGunSystem.Interactions.cs | 7 +- .../_emberfall/weapons/guns/ammunition.ftl | 40 +++++ .../Entities/Structures/Machines/lathe.yml | 33 ++++ Resources/Prototypes/Research/arsenal.yml | 8 + .../Guns/Ammunition/Boxes/heavy_pistol.yml | 59 +++++++ .../Ammunition/Magazines/heavy_pistol.yml | 1 - .../Guns/Ammunition/Magazines/pistol.yml | 2 +- .../_Emberfall/Recipies/Lathes/security.yml | 146 +++++++++++++++--- 9 files changed, 297 insertions(+), 26 deletions(-) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs index c100789d4b7..cb0032db1f1 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs @@ -1,3 +1,6 @@ +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Content.Shared.Containers.ItemSlots; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Utility; @@ -74,6 +77,30 @@ private FormattedMessage GetGunExamine(Entity ent) return msg; } + private bool TryGetGunCaliber(EntityUid uid, [NotNullWhen(true)] out string? caliber) + { + caliber = null; + + // Try standard gun with ItemSlots first + if (HasComp(uid) && + _slots.TryGetSlot(uid, "gun_chamber", out var chamberSlot) && + chamberSlot.Whitelist?.Tags is { Count: > 0 }) + { + caliber = GetCaliberFromTag(chamberSlot.Whitelist.Tags.First()); + return true; + } + + // Try revolver + if (TryComp(uid, out var revolver) && + revolver.Whitelist?.Tags is { Count: > 0 }) + { + caliber = GetCaliberFromTag(revolver.Whitelist.Tags.First()); + return true; + } + + return false; + } + private static string GetCaliberFromTag(string tag) { return tag switch diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs index 53353ae8776..cbbb91a2e2a 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs @@ -1,6 +1,4 @@ -using System.Linq; // Emberfall using Content.Shared.Actions; -using Content.Shared.Containers.ItemSlots; // Emberfall using Content.Shared.Examine; using Content.Shared.Hands; using Content.Shared.Verbs; @@ -19,11 +17,8 @@ private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args using (args.PushGroup(nameof(GunComponent))) { // Emberfall - Add caliber info - if (HasComp(uid) && - _slots.TryGetSlot(uid, "gun_chamber", out var chamberSlot) && - chamberSlot.Whitelist?.Tags is { Count: > 0 }) + if (TryGetGunCaliber(uid, out var caliber)) { - var caliber = GetCaliberFromTag(chamberSlot.Whitelist.Tags.First()); args.PushMarkup(Loc.GetString("gun-examine-caliber", ("color", FireRateExamineColor), ("caliber", caliber))); diff --git a/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl b/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl index b35cb0de42b..67adff2204f 100644 --- a/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl +++ b/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl @@ -287,3 +287,43 @@ ent-BoxShotgunUranium = shell box (12 gauge uranium) ent-BoxShotgunPractice = shell box (12 gauge practice) ent-BoxShellTranquilizer = shell box (12 gauge tranquilizer) + +## Magazine boxes + +ent-BoxMagazinePistol = box of 9x19mm magazines + +ent-BoxMagazinePistolPractice = box of 9x19mm practice magazines + +ent-BoxMagazinePistolHighCapacity = box of 9x19mm machine pistol magazines + +ent-BoxMagazinePistolHighCapacityPractice = box of 9x19mm machine pistol practice magazines + +ent-BoxMagazinePistolSubMachineGun = box of 5.56x45mm SMG magazines + +ent-BoxMagazinePistolSubMachineGunPractice = box of 5.56x45mm SMG practice magazines + +ent-BoxMagazinePistolSubMachineGunTopMounted = box of 9x19mm WT550 magazines + +ent-BoxMagazineShotgun = box of 12 gauge ammo drums + +ent-BoxMagazineShotgunBeanbag = box of 12 gauge beanbag drums + +ent-BoxMagazineShotgunSlug = box of 12 gauge slug drums + +ent-BoxMagazineShotgunIncendiary = box of 12 gauge incendiary drums + +ent-BoxMagazineRifle = box of 7.62x51mm magazines + +ent-BoxMagazineRiflePractice = box of 7.62x51mm practice magazines + +ent-BoxMagazineLightRifle = box of 5.56x45mm magazines + +ent-BoxMagazineLightRiflePractice = box of 5.56x45mm practice magazines + +ent-BoxMagazineMagnumSubMachineGun = box of .44 Magnum Vector magazines + +ent-BoxMagazineMagnumSubMachineGunPractice = box of .44 Magnum Vector practice magazines + +ent-BoxMagazinePistolCaselessRifle = box of 4.73x33mm caseless pistol magazines + +ent-BoxMagazinePistolCaselessRiflePractice = box of 4.73x33mm caseless practice magazines diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 78fe159ddaa..0d5f93a27fe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -226,6 +226,13 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + # Emberfall additions + - MagazineBoxHeavyPistol + - MagazineHeavyPistol + - MagazineHeavyPistolEmpty + - MagazineHeavyPistolSubMachineGun + - MagazineHeavyPistolSubMachineGunEmpty + # End Emberfall additions - type: BlueprintReceiver whitelist: tags: @@ -397,6 +404,15 @@ - MagazineLightRifleTracer - MagazinePistolSubMachineGunTracer - MagazineRifleTracer + - MagazineHeavyPistolSubMachineGunUranium + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineHeavyPistolSubMachineGunTracer + - MagazineHeavyPistolTracer + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolUranium + - MagazineBoxHeavyPistolIncendiary + - MagazineBoxHeavyPistolUranium + - MagazineBoxHeavyPistolTracer - MagazineBoxLightRifleTracer - MagazineBoxPistolTracer - MagazineBoxRifleTracer @@ -741,6 +757,15 @@ - WeaponFlareGunSecurity - WeaponLaserCarbinePractice - Zipties + # Emberfall additions + - MagazineHeavyPistolSubMachineGun + - MagazineHeavyPistolSubMachineGunEmpty + - MagazineHeavyPistolSubMachineGunPractice + - MagazineHeavyPistol + - MagazineHeavyPistolEmpty + - MagazineHeavyPistolPractice + - MagazineBoxHeavyPistol + - MagazineBoxHeavyPistolPractice dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary @@ -797,6 +822,14 @@ - MagazineLightRifleTracer - MagazinePistolSubMachineGunTracer - MagazineRifleTracer + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolUranium + - MagazineHeavyPistolSubMachineGunUranium + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineHeavyPistolSubMachineGunTracer + - MagazineHeavyPistolTracer + - MagazineBoxHeavyPistolIncendiary + - MagazineBoxHeavyPistolUranium - MagazineBoxLightRifleTracer - MagazineBoxPistolTracer - MagazineBoxRifleTracer diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 553258fdb3f..bbd4d557f34 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,6 +34,10 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + # Begin Emberfall additions + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineBoxHeavyPistolIncendiary - type: technology id: WeaponizedLaserManipulation @@ -81,6 +85,10 @@ - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium - BoxShotgunUranium + # Begin Emberfall additions + - MagazineHeavyPistolUranium + - MagazineHeavyPistolSubMachineGunUranium + - MagazineBoxHeavyPistolUranium - type: technology id: AdvancedRiotControl diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml index 453b682d077..473040b2559 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml @@ -9,6 +9,65 @@ - CartridgeHeavyPistol proto: CartridgeHeavyPistol +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistol + name: ammunition box (10mm auto) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistol + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolPractice + name: ammunition box (10mm auto practice) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolPractice + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: practice + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolIncendiary + name: ammunition box (10mm auto incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: incendiary + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolUranium + name: ammunition box (10mm auto uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolUranium + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: uranium + - type: entity parent: BaseMagazineBoxHeavyPistol id: MagazineBoxHeavyPistolTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml index f7f4c120319..6315f8df689 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml @@ -18,7 +18,6 @@ abstract: true parent: BaseMagazineHeavyPistol id: BaseMagazineHeavyPistolSubMachineGun - name: SMG magazine (10mm auto) components: - type: Tag tags: diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 5ac3b5746f5..21655d7347a 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,7 +1,7 @@ - type: entity parent: BaseMagazinePistol id: MagazinePistolTracer - name: pistol magazine (.35 auto tracer) + name: pistol magazine (9x19mm tracer) components: - type: BallisticAmmoProvider proto: CartridgePistolTracer diff --git a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml index 20ccb09cf64..02dc888ad84 100644 --- a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml +++ b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml @@ -1,3 +1,113 @@ +# 10mm auto magazines + +- type: latheRecipe + parent: BaseEmptyAmmoRecipe + id: MagazineHeavyPistolEmpty + result: MagazineHeavyPistolEmpty + materials: + Steel: 30 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistol + result: MagazineHeavyPistol + materials: + Steel: 175 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolPractice + result: MagazineHeavyPistolPractice + materials: + Steel: 105 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolUranium + result: MagazineHeavyPistolUranium + materials: + Steel: 30 + Plastic: 80 + Uranium: 140 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolIncendiary + result: MagazineHeavyPistolIncendiary + materials: + Steel: 30 + Plastic: 145 + +# 10mm auto SMG magazines +- type: latheRecipe + parent: BaseEmptyAmmoRecipe + id: MagazineHeavyPistolSubMachineGunEmpty + result: MagazineHeavyPistolSubMachineGunEmpty + materials: + Steel: 40 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGun + result: MagazineHeavyPistolSubMachineGun + materials: + Steel: 375 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunPractice + result: MagazineHeavyPistolSubMachineGunPractice + materials: + Steel: 225 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunUranium + result: MagazineHeavyPistolSubMachineGunUranium + materials: + Steel: 40 + Plastic: 220 + Uranium: 320 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunIncendiary + result: MagazineHeavyPistolSubMachineGunIncendiary + materials: + Steel: 40 + Plastic: 335 + +# 10mm auto boxes +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistol + result: MagazineBoxHeavyPistol + materials: + Steel: 700 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolPractice + result: MagazineBoxHeavyPistolPractice + materials: + Steel: 420 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolIncendiary + result: MagazineBoxHeavyPistolIncendiary + materials: + Plastic: 700 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolUranium + result: MagazineBoxHeavyPistolUranium + materials: + Plastic: 350 + Uranium: 700 + + # Tracers: magazines # 9x19mm @@ -6,7 +116,7 @@ id: MagazinePistolTracer result: MagazinePistolTracer materials: - Steel: 145 + Steel: 125 Plastic: 50 # 10mm auto @@ -15,8 +125,8 @@ id: MagazineHeavyPistolTracer result: MagazineHeavyPistolTracer materials: - Steel: 165 - Plastic: 50 + Steel: 150 + Plastic: 60 # 10mm SMG - type: latheRecipe @@ -24,8 +134,8 @@ id: MagazineHeavyPistolSubMachineGunTracer result: MagazineHeavyPistolSubMachineGunTracer materials: - Steel: 195 - Plastic: 50 + Steel: 315 + Plastic: 120 # 5.56x45mm - type: latheRecipe @@ -33,8 +143,8 @@ id: MagazineLightRifleTracer result: MagazineLightRifleTracer materials: - Steel: 365 - Plastic: 135 + Steel: 485 + Plastic: 160 # 5.56x45mm SMG - type: latheRecipe @@ -42,8 +152,8 @@ id: MagazinePistolSubMachineGunTracer result: MagazinePistolSubMachineGunTracer materials: - Steel: 565 - Plastic: 100 + Steel: 260 + Plastic: 80 # 7.62x51mm - type: latheRecipe @@ -51,8 +161,8 @@ id: MagazineRifleTracer result: MagazineRifleTracer materials: - Steel: 475 - Plastic: 125 + Steel: 405 + Plastic: 140 # Tracers: boxes @@ -62,7 +172,7 @@ id: MagazineBoxPistolTracer result: MagazineBoxPistolTracer materials: - Steel: 600 + Steel: 500 Plastic: 200 # 10mm auto @@ -71,8 +181,8 @@ id: MagazineBoxHeavyPistolTracer result: MagazineBoxHeavyPistolTracer materials: - Steel: 700 - Plastic: 225 + Steel: 600 + Plastic: 240 # 5.56x45mm - type: latheRecipe @@ -80,8 +190,8 @@ id: MagazineBoxLightRifleTracer result: MagazineBoxLightRifleTracer materials: - Steel: 800 - Plastic: 250 + Steel: 780 + Plastic: 320 # 7.62x51mm - type: latheRecipe @@ -89,5 +199,5 @@ id: MagazineBoxRifleTracer result: MagazineBoxRifleTracer materials: - Steel: 900 - Plastic: 300 + Steel: 650 + Plastic: 280 From c90a6c94a31e8cfb65d23ec67ab408dea8c2d40b Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 08:27:23 +0100 Subject: [PATCH 6/9] buff damage --- .../Guns/Ammunition/Projectiles/caseless_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Projectiles/light_rifle.yml | 6 +++--- .../Weapons/Guns/Ammunition/Projectiles/magnum.yml | 6 +++--- .../Weapons/Guns/Ammunition/Projectiles/pistol.yml | 6 +++--- .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml | 6 +++--- .../Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 4 ++-- .../Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 83392d07efa..d1293ddb628 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 26 # Emberfall - was 19 - type: entity id: BulletCaselessRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 7eac4b53d09..61e9769e380 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 34 # Emberfall - was 19 - type: entity id: BulletLightRiflePractice @@ -30,7 +30,7 @@ damage: types: Blunt: 3 - Heat: 16 + Heat: 31 # Emberfall - was 16 - type: entity id: BulletLightRifleUranium @@ -41,5 +41,5 @@ - type: Projectile damage: types: - Radiation: 9 + Radiation: 24 # Emberfall - was 9 Piercing: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index b4017fd5507..bd30661f849 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 45 # Emberfall - was 35 - type: entity id: BulletMagnumPractice @@ -30,7 +30,7 @@ damage: types: Blunt: 3 - Heat: 32 + Heat: 42 # Emberfall - was 32 - type: entity id: BulletMagnumAP @@ -53,5 +53,5 @@ - type: Projectile damage: types: - Radiation: 15 + Radiation: 25 # Emberfall - was 15 Piercing: 20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 8d146939b75..58a503be763 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 16 + Piercing: 22 # Emberfall - was 16 - type: entity id: BulletPistolPractice @@ -30,7 +30,7 @@ damage: types: Blunt: 2 - Heat: 14 + Heat: 20 # Emberfall - was 14 - type: entity id: BulletPistolUranium @@ -41,5 +41,5 @@ - type: Projectile damage: types: - Radiation: 6 + Radiation: 12 # Emberfall - was 6 Piercing: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index e3e26bf9f32..274f7f3e100 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 17 + Piercing: 42 # Emberfall - was 17 - type: entity id: BulletRiflePractice @@ -30,7 +30,7 @@ damage: types: Blunt: 2 - Heat: 15 + Heat: 40 # Emberfall - was 15 - type: entity id: BulletRifleUranium @@ -41,6 +41,6 @@ - type: Projectile damage: types: - Radiation: 7 + Radiation: 35 # Emberfall - was 7 Piercing: 8 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d8c465cf9e8..27aa963e95b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 40 # Emberfall - was 28 - type: entity id: PelletShotgunBeanbag @@ -40,7 +40,7 @@ - type: Projectile damage: types: - Piercing: 10 + Piercing: 12 # Emberfall - was 10 - type: entity id: PelletShotgunSpread diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml index 213f0e4f392..b54f24fca98 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 28 - type: entity id: BulletHeavyPistolPractice @@ -30,7 +30,7 @@ damage: types: Blunt: 3 - Heat: 32 + Heat: 25 - type: entity parent: BaseBulletUranium @@ -41,8 +41,8 @@ - type: Projectile damage: types: - Radiation: 15 - Piercing: 20 + Radiation: 13 + Piercing: 15 - type: entity parent: [ BaseBulletTracerGreen, BulletHeavyPistol ] From 208714843d15354560e54cf8f254684036328762 Mon Sep 17 00:00:00 2001 From: Milon Date: Mon, 30 Dec 2024 10:32:04 +0100 Subject: [PATCH 7/9] PRAY --- .../en-US/_emberfall/store/uplink-catalog.ftl | 11 ++ .../Locale/en-US/store/uplink-catalog.ftl | 20 ++-- Resources/Migrations/emberfallMigration.yml | 2 + .../Catalog/Fills/Backpacks/duffelbag.yml | 4 +- .../Catalog/Fills/Lockers/security.yml | 2 + .../Prototypes/Catalog/uplink_catalog.yml | 48 ++++----- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 3 + .../Objects/Weapons/Guns/Pistols/pistols.yml | 1 + .../Objects/Weapons/Guns/SMGs/smgs.yml | 20 ++-- .../Catalog/Fills/Lockers/security.yml | 95 ++++++++++++++++++ .../_Emberfall/Catalog/uplink_catalog.yml | 47 +++++++++ .../Markers/Spawners/Random/safes.yml | 82 +++++++++++++++ .../Weapons/Guns/Pistols/heavy_pistols.yml | 1 + .../Objects/Weapons/Guns/Rifles/rifles.yml | 35 +++++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +- .../Magnum/magnum_smg_mag.rsi/meta.json | 5 +- .../Magnum/magnum_smg_mag.rsi/red-icon.png | Bin 0 -> 229 bytes .../pistol_high_capacity_mag.rsi/meta.json | 5 +- .../pistol_high_capacity_mag.rsi/red-icon.png | Bin 0 -> 219 bytes 19 files changed, 334 insertions(+), 53 deletions(-) create mode 100644 Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl create mode 100644 Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml create mode 100644 Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml create mode 100644 Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png diff --git a/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl b/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl new file mode 100644 index 00000000000..d1942ea823a --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl @@ -0,0 +1,11 @@ +uplink-smg-atreides-name = Atreides +uplink-smg-atreides-desc = An older SMG model that refuses to die. Uses SMG magazines (9x19mm) + +uplink-pistol-pollock-name = Pollock +uplink-pistol-pollock-desc = Mass-produced mercenary sidearm. No serial numbers, no questions asked. Uses 10mm auto. + +uplink-pistol-magazine-high-capacity-name = SMG Magazine (9x19mm) +uplink-pistol-magazine-high-capacity-desc = SMG magazine with 20 catridges. Compatible with the Atreides. + +uplink-pistol-magazine-heavy-name = Pistol Magazine (10mm auto) +uplink-pistol-magazine-heavy-desc = Pistol magazine with 12 catridges. Compatible with the Pollock. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 82c80dab1f4..d9e3937191b 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -1,12 +1,12 @@ # Weapons uplink-pistol-viper-name = Viper -uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). +uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (9x19mm). uplink-revolver-python-name = Python -uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. +uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .44 Magnum. uplink-pistol-cobra-name = Cobra -uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless). +uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (4.73x33mm caseless). uplink-rifle-mosin-name = Surplus Rifle uplink-rifle-mosin-desc = A bolt action service rifle that has seen many wars. Not modern by any standard, hand loaded, and terrible recoil, but it is cheap. @@ -79,19 +79,19 @@ uplink-shrapnel-grenade-name = Shrapnel Grenade uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great damage against unarmored targets. # Ammo -uplink-pistol-magazine-name = Pistol Magazine (.35 auto) -uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper. +uplink-pistol-magazine-name = Pistol Magazine (9x19mm) +uplink-pistol-magazine-desc = Pistol magazine with 12 cartridges. Compatible with the Viper. -uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto) -uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible with C-20r. +uplink-pistol-magazine-c20r-name = SMG magazine (10mm auto) +uplink-pistol-magazine-c20r-desc = Magazine with 40 cartridges. Compatible with C-20r. -uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) +uplink-pistol-magazine-caseless-name = Pistol Magazine (4.73x33mm caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnum-name = Speedloader (.45 magnum AP) +uplink-speedloader-magnum-name = Speedloader (.44 Magnum AP) uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. -uplink-mosin-ammo-name = Ammunition box (.30 rifle) +uplink-mosin-ammo-name = Ammunition box (7.62x51mm) uplink-mosin-ammo-desc = A box of 60 cartridges for the surplus rifle. uplink-sniper-ammo-name = Ammunition box (.60 antimateriel) diff --git a/Resources/Migrations/emberfallMigration.yml b/Resources/Migrations/emberfallMigration.yml index 6556f174c03..9e194eb9081 100644 --- a/Resources/Migrations/emberfallMigration.yml +++ b/Resources/Migrations/emberfallMigration.yml @@ -3,3 +3,5 @@ # 12-30-2024 WeaponRifleLecter: WeaponRifleLecterEmberfall WeaponRifleM90GrenadeLauncher: WeaponRifleM90 +WeaponSubMachineGunVector: WeaponSubMachineGunVectorEmberfall +GunSafeLecter: GunSafeLightRifleLecter diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index bc4b6411d1f..64951c79aa7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -53,7 +53,7 @@ - type: StorageFill contents: - id: WeaponSubMachineGunC20r - - id: MagazinePistolSubMachineGun + - id: MagazineHeavyPistolSubMachineGun # Emberfall amount: 2 # - id: SMGSuppressor @@ -120,7 +120,7 @@ components: - type: StorageFill contents: - - id: MagazinePistolSubMachineGun + - id: MagazineHeavyPistolSubMachineGun # Emberfall amount: 4 - id: MagazineShotgun amount: 4 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 4e5251c27e7..54549c5ccf3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -179,6 +179,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeRifleLecter name: lecter safe + categories: [ HideSpawnMenu ] # Emberfall components: - type: StorageFill contents: @@ -191,6 +192,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeSubMachineGunDrozd name: drozd safe + categories: [ HideSpawnMenu ] # Emberfall components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f31d85414d4..592f61ab448 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -144,19 +144,19 @@ tags: - NukeOpsUplink -- type: listing - id: UplinkSniperBundle - name: uplink-sniper-bundle-name - description: uplink-sniper-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 6 - cost: - Telecrystal: 12 - categories: - - UplinkWeaponry +#- type: listing +# id: UplinkSniperBundle +# name: uplink-sniper-bundle-name +# description: uplink-sniper-bundle-desc +# icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } +# productEntity: BriefcaseSyndieSniperBundleFilled +# discountCategory: usualDiscounts +# discountDownTo: +# Telecrystal: 6 +# cost: +# Telecrystal: 12 +# categories: +# - UplinkWeaponry - type: listing id: UplinkC20RBundle @@ -478,8 +478,8 @@ id: UplinkMagazinePistolSubMachineGun name: uplink-pistol-magazine-c20r-name description: uplink-pistol-magazine-c20r-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } - productEntity: MagazinePistolSubMachineGun + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi, state: red-icon } # Emberfall + productEntity: MagazineHeavyPistolSubMachineGun # Emberfall cost: Telecrystal: 2 categories: @@ -521,15 +521,15 @@ - UplinkAmmo # for the hristov -- type: listing - id: UplinkHristovAmmo - name: uplink-sniper-ammo-name - description: uplink-sniper-ammo-desc - productEntity: MagazineBoxAntiMateriel - cost: - Telecrystal: 2 - categories: - - UplinkAmmo +#- type: listing +# id: UplinkHristovAmmo +# name: uplink-sniper-ammo-name +# description: uplink-sniper-ammo-desc +# productEntity: MagazineBoxAntiMateriel +# cost: +# Telecrystal: 2 +# categories: +# - UplinkAmmo - type: listing id: UplinkAmmoBundle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index a415927cc56..c1a4d771f5b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -83,6 +83,9 @@ steps: 4 zeroVisible: true - type: Appearance + - type: Gun # Emberfall + projectileSpeed: 45 + angleIncrease: 3 - type: entity name: L6C ROW diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f2..848ada57741 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -26,6 +26,7 @@ - suitStorage - Belt - type: Gun + projectileSpeed: 35 # Emberfall fireRate: 6 selectedMode: SemiAuto availableModes: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index f580c60b603..4b6cc3bb11c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -72,6 +72,10 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun + projectileSpeed: 37.5 # Emberfall + angleIncrease: 1 # Emberfall + minAngle: 4 # Emberfall + maxAngle: 22 # Emberfall fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg @@ -118,9 +122,11 @@ - type: Wieldable unwieldOnUse: false - type: GunWieldBonus - minAngle: -19 - maxAngle: -16 + minAngle: -18 # Emberfall - 3 deg min + maxAngle: -18 # Emberfall - 14 deg max - type: Gun + projectileSpeed: 37.5 # Emberfall + fireRate: 8 # Emberfall minAngle: 21 maxAngle: 32 shotsPerBurst: 5 @@ -178,6 +184,7 @@ minAngle: -19 maxAngle: -16 - type: Gun + projectileSpeed: 40 # Emberfall minAngle: 21 maxAngle: 32 fireRate: 12 @@ -287,10 +294,11 @@ - type: ChamberMagazineAmmoProvider boltClosed: null - type: Gun - fireRate: 5.5 - minAngle: 1 - maxAngle: 6 - angleIncrease: 1.5 + projectileSpeed: 37.5 # Emberfall + fireRate: 6.5 # Emberfall + minAngle: 2 # Emberfall + maxAngle: 8 # Emberfall + angleIncrease: 1 # Emberfall angleDecay: 6 selectedMode: FullAuto shotsPerBurst: 5 diff --git a/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml new file mode 100644 index 00000000000..7ad7753a300 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml @@ -0,0 +1,95 @@ +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeRifleVulcan + name: vulcan safe + components: + - type: StorageFill + contents: + - id: WeaponRifleVulcan + amount: 2 + - id: MagazineRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeRifleTenebra + name: tenebra safe + components: + - type: StorageFill + contents: + - id: WeaponRifleTenebra + amount: 2 + - id: MagazineRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeLightRifleLecter + name: lecter safe + components: + - type: StorageFill + contents: + - id: WeaponRifleLecterEmberfall + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeLightRifleM90 + name: m-90 safe + components: + - type: StorageFill + contents: + - id: WeaponRifleM90 + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeSubMachineGunVector + name: vector safe + components: + - type: StorageFill + contents: + - id: WeaponSubMachineGunVectorEmberfall + amount: 2 + - id: MagazineHeavyPistolSubMachineGun + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafePistolM23 + name: m23 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolM23 + amount: 4 + - id: MagazinePistol + amount: 8 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafePistolM25 + name: m25 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolM25 + amount: 4 + - id: MagazineHeavyPistol + amount: 8 + +- type: entity + parent: [GunSafeBaseSecure, BaseRestrictedContraband] + id: GunSafePistolPollock + name: pollock safe + components: + - type: StorageFill + contents: + - id: WeaponPistolPollock + amount: 4 + - id: MagazineHeavyPistol + amount: 8 diff --git a/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000..7352f5dc796 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml @@ -0,0 +1,47 @@ +- type: listing + id: UplinkSubMachineGunAtreides + name: uplink-smg-atreides-name + description: uplink-smg-atreides-desc + productEntity: WeaponSubMachineGunAtreides + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 8 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkPistolPollock + name: uplink-pistol-pollock-name + description: uplink-pistol-pollock-desc + productEntity: WeaponPistolPollock + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 6 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkMagazinePistolHighCapacity + name: uplink-pistol-magazine-high-capacity-name + description: uplink-pistol-magazine-high-capacity-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: red-icon } + productEntity: MagazinePistolHighCapacity + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineHeavyPistol + name: uplink-pistol-magazine-heavy-name + description: uplink-pistol-magazine-heavy-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } + productEntity: MagazineHeavyPistol + cost: + Telecrystal: 1 + categories: + - UplinkAmmo diff --git a/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml b/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml new file mode 100644 index 00000000000..8e69cfce72d --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml @@ -0,0 +1,82 @@ +- type: entity + abstract: true + parent: MarkerBase + id: BaseGunSafeSpawner + name: random safe spawner + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Storage/closet.rsi + state: shotguncase + - type: EntityTableSpawner + offset: 0 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeShotgunSpawner + suffix: Shotgun + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeShotgunEnforcer + weight: 0.65 + - id: GunSafeShotgunKammerer + weight: 0.35 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeRifleSpawner + suffix: Rifle, 7.62x51mm + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeRifleVulcan + weight: 0.7 + - id: GunSafeRifleTenebra + weight: 0.3 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeLightRifleSpawner + suffix: Rifle, 5.56x45mm + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeLightRifleLecter + - id: GunSafeLightRifleM90 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeSMGSpawner + suffix: SMG + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeSubMachineGunDrozd + weight: 0.65 + - id: GunSafeSubMachineGunWt550 + weight: 0.25 + - id: GunSafeSubMachineGunVector + weight: 0.1 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafePistolSpawner + suffix: Pistol + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafePistolMk58 + weight: 0.4 + - id: GunSafePistolM23 + weight: 0.3 + - id: GunSafePistolM25 + weight: 0.2 + - id: GunSafePistolPollock + weight: 0.1 diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml index a683cd1f4b2..a17f938c736 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml @@ -29,6 +29,7 @@ name: M25 Tactical description: A chunky pistol chambered in 10mm Auto. Makes up for its bulk with impressive stopping power. components: + - type: Gun - type: Sprite sprite: _Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi - type: Clothing diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 7f9962931cc..d0c49c485cb 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -14,15 +14,13 @@ - type: Clothing sprite: _Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi - type: GunRequiresWield -# - type: GunWieldBonus -# minAngle: -20 -# maxAngle: -30 + - type: GunWieldBonus + minAngle: -19.5 # 1.5 deg min + maxAngle: -23 # 9 deg max - type: Gun -# minAngle: 21 -# maxAngle: 54 -# angleIncrease: 6 -# angleDecay: 24 -# fireRate: 5 + projectileSpeed: 45 + fireRate: 5.5 + angleIncrease: 2 selectedMode: SemiAuto availableModes: - SemiAuto @@ -65,7 +63,13 @@ - type: Clothing sprite: _Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi - type: GunRequiresWield + - type: GunWieldBonus + minAngle: -20 # 1 deg min + maxAngle: -24.5 # 7.5 deg max - type: Gun + projectileSpeed: 45 + fireRate: 4.5 + angleIncrease: 1.5 selectedMode: SemiAuto availableModes: - SemiAuto @@ -98,6 +102,13 @@ name: AR-19 Lecter description: Standard-issue SC assault rifle that perfectly embodies corporate cost-cutting. The manual explicitly states 'Working as intended' in response to every known issue. components: + - type: GunWieldBonus + minAngle: -19 # 2 deg min + maxAngle: -26 # 6 deg max + - type: Gun + projectileSpeed: 50 + fireRate: 6.5 + angleIncrease: 1 - type: ItemSlots slots: gun_magazine: @@ -133,7 +144,13 @@ map: [ "enum.GunVisualLayers.Mag" ] - type: Clothing sprite: _Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + - type: GunWieldBonus + minAngle: -18.5 # 2.5 deg min + maxAngle: -25 # 7 deg max - type: Gun + projectileSpeed: 50 + fireRate: 6.5 + angleIncrease: 1 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots @@ -179,6 +196,8 @@ - type: ChamberMagazineAmmoProvider boltClosed: null - type: Gun + projectileSpeed: 50 + fireRate: 6.5 soundGunshot: path: /Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg params: diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 17fc3da4b25..713cac1e968 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -6,7 +6,11 @@ description: SC's licensed copy of the classic Vector design. Advanced recoil system makes it surprisingly controllable despite the powerful cartridge. components: - type: Gun - fireRate: 6 + projectileSpeed: 40 + fireRate: 8 + angleIncrease: 1.8 + minAngle: 3 + maxAngle: 12 selectedMode: FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index 7ee98537cef..64597cb2c13 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi , incendiary by MilonPL", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, red-icon and incendiary by MilonPL", "states": [ { "name": "base" @@ -30,6 +30,9 @@ }, { "name": "incendiary" + }, + { + "name": "red-icon" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2950c4c4b5d109fa5b65fb4c86f576c830047e99 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)B}7%T!FN* zvT|Bl+SI929UUFz71Z3=*y@FZwo6N2S#SRBod3lx{}mZNyWdBI0hRKW1o;Is{6_-1 zERJh|62YD>jv*GkS1&m7H5hQXTr|3(b@liB>l-`0BQkEiy8p?EL-Vh}>Ky)tjv2BC zWmcIm22400F3zxt+v5D2pH1Hr4sf3SBmAp=;hMFNn%9apSclha6OQC$vimH$B^GEr NgQu&X%Q~loCIHnMR=xlL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index a01c6d97bc8..dc65846c067 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, red-icon by MilonPL", "states": [ { "name": "base" @@ -13,6 +13,9 @@ { "name": "practice" }, + { + "name": "red-icon" + }, { "name": "red" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..811a67e560f00d8887ae7582ca97ead3f1e27ba2 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!C~# zLPAMN$+~sxrc9Y)ZEbDJz!1m4Fq?s4hdRTtGm$gn9Dk>CHv`r2lmz(&GyF#Y&LaV8 zKyhDB7sn8b-nZu*xegd`xLk}ls#f*?_q3BryC+_9%~)9fI(fs^_o5mCxWUwK+^%m}`5bfCe*oy85}Sb4q9e E07hC-4FCWD literal 0 HcmV?d00001 From f2d428159a545300c8b804ea4f3777307d064c15 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 31 Dec 2024 03:44:30 +0100 Subject: [PATCH 8/9] wield sprites --- .../Ranged/Systems/SharedGunSystem.Examine.cs | 2 +- .../en-US/_emberfall/weapons/gun-examine.ftl | 2 +- .../Weapons/Guns/Projectiles/projectiles.yml | 1 - .../Entities/Structures/Machines/lathe.yml | 3 ++- .../Catalog/Fills/Lockers/security.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 4 ++-- .../_Emberfall/Recipies/Lathes/security.yml | 2 -- .../carbinenogl.rsi/equipped-BACKPACK.png | Bin 1578 -> 1504 bytes .../carbinenogl.rsi/equipped-SUITSTORAGE.png | Bin 1578 -> 1504 bytes .../Guns/Rifles/carbinenogl.rsi/meta.json | 10 +++++++++- .../carbinenogl.rsi/wielded-inhand-left.png | Bin 0 -> 1004 bytes .../carbinenogl.rsi/wielded-inhand-right.png | Bin 0 -> 953 bytes .../nightshade.rsi/equipped-BACKPACK.png | Bin 1566 -> 1399 bytes .../nightshade.rsi/equipped-SUITSTORAGE.png | Bin 1566 -> 1399 bytes .../Guns/Rifles/nightshade.rsi/meta.json | 10 +++++++++- .../nightshade.rsi/wielded-inhand-left.png | Bin 0 -> 1044 bytes .../nightshade.rsi/wielded-inhand-right.png | Bin 0 -> 1075 bytes .../Weapons/Guns/Rifles/tenebra.rsi/base.png | Bin 843 -> 791 bytes .../Guns/Rifles/tenebra.rsi/bolt-open.png | Bin 822 -> 765 bytes .../Rifles/tenebra.rsi/equipped-BACKPACK.png | Bin 1650 -> 1478 bytes .../tenebra.rsi/equipped-SUITSTORAGE.png | Bin 1650 -> 1478 bytes .../Weapons/Guns/Rifles/tenebra.rsi/icon.png | Bin 886 -> 833 bytes .../Weapons/Guns/Rifles/tenebra.rsi/meta.json | 10 +++++++++- .../tenebra.rsi/wielded-inhand-left.png | Bin 0 -> 819 bytes .../tenebra.rsi/wielded-inhand-right.png | Bin 0 -> 855 bytes .../Weapons/Guns/Rifles/vulcan.rsi/meta.json | 10 +++++++++- .../Rifles/vulcan.rsi/wielded-inhand-left.png | Bin 0 -> 860 bytes .../vulcan.rsi/wielded-inhand-right.png | Bin 0 -> 803 bytes 28 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs index cb0032db1f1..75ebad4e266 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs @@ -64,7 +64,7 @@ private FormattedMessage GetGunExamine(Entity ent) msg.PushNewline(); msg.AddMarkupOrThrow(Loc.GetString("gun-examine-fire-rate", ("color", FireRateExamineColor), - ("value", MathF.Round(ent.Comp.FireRateModified * 60f, 0)) + ("value", MathF.Round(ent.Comp.FireRateModified, 1)) )); // Muzzle Velocity (ProjectileSpeed * 10) diff --git a/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl index 5b6222b1666..e113a526b62 100644 --- a/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl +++ b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl @@ -5,6 +5,6 @@ gun-examine-recoil = - [color={$color}]Recoil[/color]: [color=lightblue]{$value} gun-examine-stability = - [color={$color}]Stability[/color]: [color=lightblue]{$value}°[/color] per second gun-examine-max-angle = - [color={$color}]Maximum spread[/color]: [color=lightblue]{$value}°[/color] gun-examine-min-angle = - [color={$color}]Minimum spread[/color]: [color=lightblue]{$value}°[/color] -gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPM[/color] +gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPS[/color] gun-examine-muzzle-velocity = - [color={$color}]Muzzle velocity[/color]: [color=lightblue]{$value} m/s[/color] gun-examine-caliber = It's chambered in [color={$color}]{$caliber}[/color]. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index a179df7d136..24b1537a08a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1053,7 +1053,6 @@ count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though spread: 9 - # Emberfall projectiles: yes they have to be here # Tracers diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0d5f93a27fe..6e8b75ebd39 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -232,7 +232,7 @@ - MagazineHeavyPistolEmpty - MagazineHeavyPistolSubMachineGun - MagazineHeavyPistolSubMachineGunEmpty - # End Emberfall additions + # End Emberfall - type: BlueprintReceiver whitelist: tags: @@ -766,6 +766,7 @@ - MagazineHeavyPistolPractice - MagazineBoxHeavyPistol - MagazineBoxHeavyPistolPractice + # End Emberfall dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary diff --git a/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml index 7ad7753a300..44c3363429c 100644 --- a/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml @@ -83,7 +83,7 @@ amount: 8 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] id: GunSafePistolPollock name: pollock safe components: diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d0c49c485cb..310b7a8e424 100644 --- a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -16,7 +16,7 @@ - type: GunRequiresWield - type: GunWieldBonus minAngle: -19.5 # 1.5 deg min - maxAngle: -23 # 9 deg max + maxAngle: -23.5 # 8.5 deg max - type: Gun projectileSpeed: 45 fireRate: 5.5 @@ -65,7 +65,7 @@ - type: GunRequiresWield - type: GunWieldBonus minAngle: -20 # 1 deg min - maxAngle: -24.5 # 7.5 deg max + maxAngle: -25 # 7 deg max - type: Gun projectileSpeed: 45 fireRate: 4.5 diff --git a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml index 02dc888ad84..f8f21518d1c 100644 --- a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml +++ b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml @@ -1,5 +1,4 @@ # 10mm auto magazines - - type: latheRecipe parent: BaseEmptyAmmoRecipe id: MagazineHeavyPistolEmpty @@ -107,7 +106,6 @@ Plastic: 350 Uranium: 700 - # Tracers: magazines # 9x19mm diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png index 58563f18220fdf164b92edeaa820b714ddc85161..3ff8834683bd00f3dd0c044fa3249deab659a200 100644 GIT binary patch delta 1106 zcmV-Y1g-n34B!i}o&kRZEJ;K`RCt{2n?Y;iMij^Y+BS!VrIzYxA+Vk_1nt2N9@vvX zARqJrbm~XQQJ=_PKv#c&93&9*v>+%xM5Hb1LfA%$#U^lVy-L4SWAI630~eDy5=Aj>ikLg2b?c}+!#MjE|N)3i~=$;lBP^!KF(T!)Lx zrS|sx9R~e93S-f zo7b;!UVKX6JkO!)x>ghg07wN7NKS#L*hcV-F-{1<4FG@J9s&TuFnlmYWrGJ=JO&># z869>WydX&u42PeBCxpOp94<3mAG4AGlhGj`ke8ngUaZQSK-d-wUKoY|?gaVx{@0ak zwici+_^z-l3t<={&-3!TL4O~UlcUYhx zgC1W+fOdZwpuO12FYkFCkD>?wuvje0@5TEGV~k&1F14%co7T2l32=3N(|PcWF)mV` z5P~er0N}xvTug;kd}}3u%mCFzkTJ&Bd4Ur5Mp1<73y$l$NYhk{<5)X8JJT9>sWm+N zuSqH8rfCAW+or~Gyw(`vxewf}_NHl;S+K5cU_*ZbR6iSrv9hC#FzGcb0PfD^HeP^Ofyv1czi*7dbUKBu>r(eg z2~d9&1%e;|0PNi^yQ#voKon{BZkGUnAP69;#7#&~fubm2Sr%^hdJr}GT@ayKp}yVg z!Llsr;DMH>!s3+HFbsV7^LM;?{R)3v|NWq4rAw;8zx?4x2;bVA7)xh><2c;5?Q(!> zx5hRy;c;(59LJhr7_e=-RfSsiF<34z)e3*jwnTWUF{4^QdA2^mYNbaQuhO*$bzLb{ z-%Qh#5cVKO23Jd)M1cg`#X-t~Vk*tX3%`AW?{}*2&3S)J^pPijKVWb4}CHA0+R;YG$b=B?c?6`Kj?Jh1ZdZ(wSx$V18AEwc<^6q19 zn~*I_U6u_-oxXoKy}Z1f;!Q4FmzdLgo12@t>VpxWj*0UwS_RM<;L?nM<-_poioTu+CDJWCoy!wsH zdBR>c=jZ3s(}RP9D^t|!Je>=tfQ${6zVnaYd>G5f3j+(@^z?LkiStYcqQWv=r9)*Y z0+{oJJ;&1P?JLeJJY}HHQo6O^;XDE%&mNQu=AjALe!kRWzH^LwOC=Dja^ zO#1hV&WC>@00Uos{B|69bAE4c?@B}z0kGDy!(-87-mk5#xuc__Rub|p!k^NrXRzH+ z1gP^UH#@T7m&t~#$1W5(K0fYOX+fmS8<2kEoRiYb<>;&ZHqNcDue*(njdZai3KaUC zPA9#`8c;S0N<~1(OD$Bi0X(4_Y9FdoUq)XWAKHJj2;wl)fGJnjd34nt0sL8-nwmnl zW3&L7UX=WSL^;n$qgxxGs=9$x30#&>gZ~x@)3QKuUg0iV=tIitl%A26kT6I@6@zu_ ztAZu=jSNHvA_I|u$UtNuG7uSv3`7PZ1CfFMj)6M=;*N^EVKJIsi6u(i%*;&srbn-- zM&*A%6}@2NjS*PEY!MRyQbabU+wJPIaV6N4F|vX)5kRheVPPTF$$Pmb3ONg511p#< zVj_TyD=Fuu3fU_E`vkBmOI(E6L;y-qNJ=UsWl~cieU>`%ly~pk>^B9Y)p{*K0ALIC*}ws;Xz(5%K*-!+YiGGTeaR&h8m?L zX?aZ!HZc0hnIfYm0(iD+fl-n|isd}lW%F~=Wi7Eub{g^1^TGyJ>wch+02C?HgFz9& zxk8ZhaXODZWH3GNV*|5=ghB!^L@J8>8w(6!=1aTN9-H&nWt~B?2nQP&!K(CG+PHtN z9~Qx3=2u;IeLbNk4cNfwx3A@#{5*;|n!XhlPB2@XH%$TmqXd1ZU{OBqHa<2Va|nlt z02C-oTeKMp85?z-unDWho@pbbCjoyn_&BMlscFKWeE_4+6QRn76W7Rt1PolOXxI%f vS{{E5gB{^S1|kEIfyh8)ATsa|82A+nL+ciS_PGLS00000NkvXXu0mjfX(KMC diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png index 58563f18220fdf164b92edeaa820b714ddc85161..3ff8834683bd00f3dd0c044fa3249deab659a200 100644 GIT binary patch delta 1106 zcmV-Y1g-n34B!i}o&kRZEJ;K`RCt{2n?Y;iMij^Y+BS!VrIzYxA+Vk_1nt2N9@vvX zARqJrbm~XQQJ=_PKv#c&93&9*v>+%xM5Hb1LfA%$#U^lVy-L4SWAI630~eDy5=Aj>ikLg2b?c}+!#MjE|N)3i~=$;lBP^!KF(T!)Lx zrS|sx9R~e93S-f zo7b;!UVKX6JkO!)x>ghg07wN7NKS#L*hcV-F-{1<4FG@J9s&TuFnlmYWrGJ=JO&># z869>WydX&u42PeBCxpOp94<3mAG4AGlhGj`ke8ngUaZQSK-d-wUKoY|?gaVx{@0ak zwici+_^z-l3t<={&-3!TL4O~UlcUYhx zgC1W+fOdZwpuO12FYkFCkD>?wuvje0@5TEGV~k&1F14%co7T2l32=3N(|PcWF)mV` z5P~er0N}xvTug;kd}}3u%mCFzkTJ&Bd4Ur5Mp1<73y$l$NYhk{<5)X8JJT9>sWm+N zuSqH8rfCAW+or~Gyw(`vxewf}_NHl;S+K5cU_*ZbR6iSrv9hC#FzGcb0PfD^HeP^Ofyv1czi*7dbUKBu>r(eg z2~d9&1%e;|0PNi^yQ#voKon{BZkGUnAP69;#7#&~fubm2Sr%^hdJr}GT@ayKp}yVg z!Llsr;DMH>!s3+HFbsV7^LM;?{R)3v|NWq4rAw;8zx?4x2;bVA7)xh><2c;5?Q(!> zx5hRy;c;(59LJhr7_e=-RfSsiF<34z)e3*jwnTWUF{4^QdA2^mYNbaQuhO*$bzLb{ z-%Qh#5cVKO23Jd)M1cg`#X-t~Vk*tX3%`AW?{}*2&3S)J^pPijKVWb4}CHA0+R;YG$b=B?c?6`Kj?Jh1ZdZ(wSx$V18AEwc<^6q19 zn~*I_U6u_-oxXoKy}Z1f;!Q4FmzdLgo12@t>VpxWj*0UwS_RM<;L?nM<-_poioTu+CDJWCoy!wsH zdBR>c=jZ3s(}RP9D^t|!Je>=tfQ${6zVnaYd>G5f3j+(@^z?LkiStYcqQWv=r9)*Y z0+{oJJ;&1P?JLeJJY}HHQo6O^;XDE%&mNQu=AjALe!kRWzH^LwOC=Dja^ zO#1hV&WC>@00Uos{B|69bAE4c?@B}z0kGDy!(-87-mk5#xuc__Rub|p!k^NrXRzH+ z1gP^UH#@T7m&t~#$1W5(K0fYOX+fmS8<2kEoRiYb<>;&ZHqNcDue*(njdZai3KaUC zPA9#`8c;S0N<~1(OD$Bi0X(4_Y9FdoUq)XWAKHJj2;wl)fGJnjd34nt0sL8-nwmnl zW3&L7UX=WSL^;n$qgxxGs=9$x30#&>gZ~x@)3QKuUg0iV=tIitl%A26kT6I@6@zu_ ztAZu=jSNHvA_I|u$UtNuG7uSv3`7PZ1CfFMj)6M=;*N^EVKJIsi6u(i%*;&srbn-- zM&*A%6}@2NjS*PEY!MRyQbabU+wJPIaV6N4F|vX)5kRheVPPTF$$Pmb3ONg511p#< zVj_TyD=Fuu3fU_E`vkBmOI(E6L;y-qNJ=UsWl~cieU>`%ly~pk>^B9Y)p{*K0ALIC*}ws;Xz(5%K*-!+YiGGTeaR&h8m?L zX?aZ!HZc0hnIfYm0(iD+fl-n|isd}lW%F~=Wi7Eub{g^1^TGyJ>wch+02C?HgFz9& zxk8ZhaXODZWH3GNV*|5=ghB!^L@J8>8w(6!=1aTN9-H&nWt~B?2nQP&!K(CG+PHtN z9~Qx3=2u;IeLbNk4cNfwx3A@#{5*;|n!XhlPB2@XH%$TmqXd1ZU{OBqHa<2Va|nlt z02C-oTeKMp85?z-unDWho@pbbCjoyn_&BMlscFKWeE_4+6QRn76W7Rt1PolOXxI%f vS{{E5gB{^S1|kEIfyh8)ATsa|82A+nL+ciS_PGLS00000NkvXXu0mjfX(KMC diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json index 08a4eab35fe..940d3deae35 100644 --- a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", "size": { "x": 32, "y": 32 @@ -34,6 +34,14 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..29d04d619323fadfe6ebd156b8c53a00e67e5102 GIT binary patch literal 1004 zcmVPx&rb$FWRCt{2noW+QI2eXsTHP&8&jvfn}6)R9OLpD?0bW6o7Qf3H0;V0=-PwRU&!5I6sKYu1s`~n0)5ClOG1VIo3 zxUO5eu3NtKI4+6Sb<=g-k}-zeZr9m}F$Mrtz2|v|q6kvT&i>vK*LBNN<9gq9b7(@Y z>y|e+H}E_U01!oyx-LD>!*aQ-+WEd;Mo|O+ZxSHS^B|?{t#1WDr8r{@ob%pve|dSq zYPA9Y7>0p3j;p}cQDqgNu|eqCYI6g4DhsLrEEbCrIHa`@0s!DRPW7M=0$~^;2m(Al zJ|5KzA#i_xk2sEd2O)%L1*dPYz<*g71OWgb48y^;s(pR3N>|Nqy4R$Koywgi}O@g458Zgy^OnP21&K;3;a8E;rl)~=df*CV~lBeo>!j$v^>ut zrPQR98eF-IBXi1W2MNu3Hr~yowM6*mevc$cTHgpoQNXe+FvdphZPPT%EX#hn-wC4z#5qTj zBuDp5)BMA-tiM#b`0@{){`~yYO>l^J!;hdfc>u_=?C&&9tMc>LZUEtw zyRKVKF=cdC%<&4?w%yvdK@cDe!@*UUtEZ@Mf%=PbjQ-%j`uqS*@;t}g-Cb3lVv3ln zr+7V~)__C$Ptor@8|?B5V8A0#6vfBoa;f#D<|*dtb$Jrh7{<~W03if)U5Dd1a2yA^ zt{*wAlt)074Z}c|W#56rKAvidI7bg?dlIJTccw;{S73@qp#I#L^gmax3)OZ=fAm*W zk4NA)%d#qW$R#}j*U}s14*+^S0$+ZVN8nm|XRnrNnjc;-KV(_Px&b4f%&RCt{2noVw-Kp2K!s;X9#4N*tRZdRqLyqNb-RwgE6O(5TbG%2Vocj02pHc04b%mK4T10N<>jKIi3)rI;Q?yKI;Mlfa5sWZnw1n z*LABnjv=LlO5SlC0Kjgy!^6YFV1lZ{q9~dy?AZEqX>~wzWYy>@nhD2o3;^(b9{^xk z765>AuATmBhD;sRQ(y|$j`4VHyrh?|?63IKv2 z=!sHgQcBpijqP^ZN^I(q*lacc0MGN(pjCjrBU)c@&MV8ZkR%CiZ*R3rK#?SgHn?hk z==(HHdt#b1$g-?fC%LX$HT4YPx^8O*D9uTdXk+$fK)0bH3_}z}QD0wOU1{4%DYa#4 zgVc#os4~uZ)!k61B(HP=ugmTbpN52X1(aopG))cl%ChXTC<-vfkYyPdV~C>2h@!}N z=_sQp3WG6Lzgw1NaL(bn?x?6VO^vyC02P1ej?|^q0cBa%qudp++wEG{d7eKuM>+@s zL#^SL_ApHo>-D;RSD$U$K02{uP#qWqfsrK1;Bo~t&jHuh*Hxb92YX-b7g9=OS%%eW z)f2%vhiRJF@AoiG69BN^@74M~IFohic>MjR{+wkQy2%6h5Xl20cY!g|G&RbyWB?u))HJ*rx&=M?~!^9Sg3oGa#FLDvQYyq*^d zA*$x->w3KgaM&N z`UIx>0}km}GUjLp44EaGUV%K%pQri+=K2G=I+lz%Ivv#xJ2r)m@d*I)`~h7ZOU69u z!9?Q|xXAPTsUv>Tqw=L=&hiH+G(Lf+Zk?rl0!zo7^(5E`WRzuj0pR(R-}%>L5(GgI b#DB_PcLUWHp$$WI00000NkvXXu0mjfApo&# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png index 1c90f37025cf2a37dcac7457eb730bed00750c51..7fe842d9e257e432b3c0d2f2e28a0a31d7db113a 100644 GIT binary patch delta 1001 zcmV zo_o%>_vg+51OkDe2HA;8YPJt<$xci**57DHi~xXX`neE+X*z!~O)vXhix#KGXh)19 z5g7o^OYi`IVsWqR_ikY)E2?AQrjdW7RHx*rIH^vF%rqn< zhS;44xVW`$%t3ZytY(YCg{004+bJGkxg?E;|-zAkvc?>8LR`mmMHV`FUv1GmPIRIdYn zE@+D%UYC7Q`wW`pw9hpHzV8-%4}SdN69B-%(h`nK7Xbj9TVFAD*TjBd`^4{Gy#46y zIlxWuvZ9i8AgTOZ4|2N%0Qi#s6l!g4{WH%;>NS7s4UOKK?Cfc&e$rC?fxDQ&i+#Ci z`~6w)%1K#K&xZg4fj}S-2m}Jbe@c*R1$^->$aMl|@y(xnR)FCWfawOswLY(Wshhag z2c{cbqd<&+W;@Vq_yqWQjAZN@Ds%Kf!Avts#;yTBkGY<6Er2;PN&qmQdj&Nb4wMMx zByE5075B5Q1z6e00{}{G3g%Zo2S$X-40WkZ0l@daB-a#3Bot&a!&u)w2n9ie>hydj zGmJz+@vcKFL1}$YbxM>SGpHFNm}&M;l2%q!^7J$)D=JM*&z$I>86un(JOEhfa~@l+ zr$ASC@2Q6Uo(^uRQtW)Ki>~fos-6OsRF`3}d4-u~wsip36!1g<;BTRVUArGu8cuy= zCnkyaLd3NT>>vHW=FXvQyI)mec5RzGhuA;*!DWy8C~Q?@1d$;7CJ+b&0)apv5Cn{0 XOP|Io9W=f*00000NkvXXu0mjfj11cd delta 1170 zcmV;D1a15G3Z4wGodJIU32;bRa{vGf5&!@T5&_cPe*6Fc1Xf8zK~#7F?OIJp6+s*y z!xw(w`|^vDmrul~B*gF|QcR>0B+5hKAv$#E(5Zu$2s%aGJap>Np;HGbC@+N)5mFE( zs02|-YEL2v%P%TZYTMuF|FQ4+-t5l4-Ss_~fqk>PGxPude!qX2o!PhlVN4~ZfKosy zV4}d;Gv_puDp^ykV`YxwEe)4(@-@-AoDcyx^@9;^v!2NpRe%w{KZGi|LY~uEUS5df z{{CY=PsDMDs1S{HV+3k5)hxCo_{Y;XM`En7v$fP2}Lh&=ECC-6F+LKP9=JaFeimxjY}#|DGR zJ}}z@S9kAuOnh2P=P7<|XkvOQoCJ-n7rxC2Clh~xk1emR8=JUx4k1QXcCoRs*Q~v* zjlFpJoYfs@WK-|PnHkPxP^NQ0a)VUYk1qGP+VkY|;@y8|c@P>0$Tu~$uy8ocMX*C2 zc7?r4jz#(K)jsX_&lUD(?Jw)QJ)E&UkuNI4a0mIKK!DA~Vr+bJk{8MLJ{n~-0zjTX zZ72C)Q31h_&TR`|B;R}Mv1dJh?fMP&baXV{^DRd@+2XHN>1UsmvLyhXc?^3T-8Tml z$YXetaVLLs*ai9i{(jcj(7k6V`VB|_h-^9ld0O(i zj-TX99{I*HNXws{WmswizyX#z9O<6<`w#9Vj0ggnX^shxdOlEIlVA=jfZb&IJ;3My z%aQTg&2#i{d2~O2<}vIWnvb&T$ZojgLw@4Thyj0#{Nrb6>?RF+w)tCL&uKP28{;oI zMFqvIxwV}eg9t-I583Rew;6G;H3CF*0Gifgl3Md7X0!jg;Kzaq-_~ez|n_P(}*xdT)DMvMRZ9CYcz6qvwo7;D#1V9uP-{-P5 z0UI#N;FA(S#&E9GRRT!$)cP8$E-R60;#FnDEI2kDqfD|q0uHyf#h)!tmKzBch*TkD zexl^7M5~RemcOavdmKe!XJ)5TwnHy?88m+Z1=^c{@cfl0)0~w|u+;JhfaS`{3ce|U zdrA87EI4WKiwJdL@x~*GP#yLR0HaK@EC7NXkw}z>rjs2Ic??6Z5=E%tkHYf^n*$>S zW~^YbEC7tb!N9;kf?Xnyo9P0k2@M>$fKLp0Bx86U*nm+cSr(vb&%XF1NDhpfB)oql zPyVUr>6-FXSg9;Iw=4h}9_#4f8x)L2f}x;iJrBRM6D^hC*gOG@t|i*2;F<#qhDDno zusqBDA(9#aSYAHQuULTTUKP zo_o%>_vg+51OkDe2HA;8YPJt<$xci**57DHi~xXX`neE+X*z!~O)vXhix#KGXh)19 z5g7o^OYi`IVsWqR_ikY)E2?AQrjdW7RHx*rIH^vF%rqn< zhS;44xVW`$%t3ZytY(YCg{004+bJGkxg?E;|-zAkvc?>8LR`mmMHV`FUv1GmPIRIdYn zE@+D%UYC7Q`wW`pw9hpHzV8-%4}SdN69B-%(h`nK7Xbj9TVFAD*TjBd`^4{Gy#46y zIlxWuvZ9i8AgTOZ4|2N%0Qi#s6l!g4{WH%;>NS7s4UOKK?Cfc&e$rC?fxDQ&i+#Ci z`~6w)%1K#K&xZg4fj}S-2m}Jbe@c*R1$^->$aMl|@y(xnR)FCWfawOswLY(Wshhag z2c{cbqd<&+W;@Vq_yqWQjAZN@Ds%Kf!Avts#;yTBkGY<6Er2;PN&qmQdj&Nb4wMMx zByE5075B5Q1z6e00{}{G3g%Zo2S$X-40WkZ0l@daB-a#3Bot&a!&u)w2n9ie>hydj zGmJz+@vcKFL1}$YbxM>SGpHFNm}&M;l2%q!^7J$)D=JM*&z$I>86un(JOEhfa~@l+ zr$ASC@2Q6Uo(^uRQtW)Ki>~fos-6OsRF`3}d4-u~wsip36!1g<;BTRVUArGu8cuy= zCnkyaLd3NT>>vHW=FXvQyI)mec5RzGhuA;*!DWy8C~Q?@1d$;7CJ+b&0)apv5Cn{0 XOP|Io9W=f*00000NkvXXu0mjfj11cd delta 1170 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png index e242e459dcd80617fd4cb43d66a9923e88c0bb02..30159978c4d15e4560c4dc4330bdc459bb18a657 100644 GIT binary patch delta 387 zcmV-}0et?;2A2k~o&kRWV@X6oR9J=Wl)s9?KoEz&93c?fRKiwUh>$jo?{MG)9M}uT zflngbBMA34wl)@PvtVUm<3cQQg=SedmuNgVIM}brCiCYvvl#{gfk5EDA*HOOl+|Cy z+63;iEpeOBPw|oKkmq@4b;cNbPSdp2M+kw|y5VDtK`9kUDJy@aR0I&a6%B{OF8zm4 zN^w4)>Bx7}WGtnuilP8ux7#tBy)hb%0N8G~tX5yG-D<5_EIt5i%zXZC?bGQi%jGBI z@z{PVih}ie&15pE0HW*vy6M102tkr0H+CUJ#~oa7V_eFzL~Cu|W8df}KO7GBoMoA{ zCrQG7zi$W(1_OIer&DWT^&B(`D9f@T2(Z~~taF~{RhDH|+)q}|k{ff6*ca~;>`(MF zywrz#;(qtF?{CE6dIMVPhY}fMT8B$YS*2;(>jnYhz8xHo$A&Om7E@nw@HXK++!gBY hhG)bBfj}St@C`X9vOc1{2Sxw@002ovPDHLkV1k8SwL|~_ delta 440 zcmV;p0Z0Cq2FnJpo&kRV32;bRa{vGf6951U69E94oEQKA0fI?HK~z`??Nq&rgFq0T z9AX|Jo!Ds7SlP%y@PQ7}AEXRiAGind0YZvYTB(ib8<-|{-@+`DMZGhrj@yA`XXoep zW@l$5vSK@6J77ET*E+CTt#0@|Qui~tijRqTtWkn0dSg9mZdiNzOQuiYh>o&q+2XdX#0t@xnfwe2N@TRGyw=`8hGp z+*K8TH_L!i08P`3y3u~z|8H<4h%@&DRaMD+{SA4996&H~!0v#DHaukTnP0iNCm+JM iHroN)0o#H9*?}*9lC&j;GjLA;0000Ohofv`Mr&;n2Oht`zI20kU1!#eF>@b95t^pi2wW}~48yRS*wP1^1hm#0K>(<# z${6Q)J~PIQxEo3BXPI-#r8Miz~cp!Qa=hbj^l1~5z!pS z@u?RCfbeVuecx|{fzQEoRvd69;Su%-b!WpX;vSF3;{kv>g1D;s0l~!sa`Ucuu@-56VF44G`Dr5)Fot>X=Wrr7ksfnw=lt(A>Zv=uf2!hke)^&eX;hyJ79kw`*MccN5 zY$`}o5IfKF4GrLg+rfi6%JUpoBPq*LEXyKuuH=8k?}l_xyeJ9@P}jBKQ^JU;q9~Gn z{ZUob&UC-Oi^t<*X9HfAWy*$HXgWy}*@&bgO;Z)nG>y`sfL_;il?{H_eiEL;W4CRS zuZwKE2H@1C?|Xk`3d2z8DA0ACx|0INbQZ~nllFjYatCms;=Ca2<2dp~eWD2}u7lAo zX*qy76xjeTZj!8T^kJ0~#~b-D`B`y%qI`OarO%0QOi$SWzF`791DK}i&<*9vCuyxw}t)#J{0znEy0FjLD*y(HV6|#LP!|(Fg=tJvLjg|%fFV+ z=M+VnAMee3Z^rW;V6j*%7K`Qo3Mu-)bzQ|6OP+-gg>BXe=Ujj3zonFjqG;xPznk^a zbzSBAJ}9N2lwxaZ3joxnDuHvZf*`>C{XOD1MjXcgpk^uIS>6jRJb~AZaerKUg7-u zcB$^s+^MNoULAkmJmAyd3rVm1$B)0G-|wT@^l^1{VHB@sT7U_w6dr&cL%s6q_?q(h zwD2!qcJ$|k@v4#nRxP~d{Q8#s^L=e1;Pv}`L{UT-V`_giij4c3+i`=|-dcnQCZql7 z=_%qkhTf`$5JbvHNcm{w0&^)KXzi)pAGg*jypHyaF;Gg;Xf%>DfDnS1Zq=nHKP^1x z9G>ST=Y(FbrvQ*BGB-mL^j6mGc9Uoyh9RVsV2r`@JX~I0LP}ZcuvRJtWUagqVsblN z(9V*D@B4q~^?DeO#|Xo4T2RFpgOsvVpXFSDJX@RDce`B-heLEaon+=zD5V&SzW@NA246Nx3A%3J1^;;>S6I}} zC@+5yMG?_C_tDK5yW0-(3KiCYPSTEU#u)zjhq3U0fd%MmsdT-~bdJ8-^sAATp-$H| z72PKqSwOwsz|qm0G`9hH>lSeMtzuA005}0imP>6!mQc^Z2=3t zP0lMcYVOq3+iokjcxf2~?S1vO+sZAV@Y3 z&bewd8laRuNrP#0-Of+jFHFX)Oi_l~^StC7P`O4(N{Ne$i^551B@}*G5t9sc7={2) zx>g_)?N8rQmPXIjBo-9LfOMAjTcS!`LT-l(>ukv^d>7Ch9v*JI5|%ng*LBq<#{w|U yxhiX^rRxN%7CkJJdFHm75^syeVzF2@l79hhYH2EBtHTrJiyrB~WOfH1{Huf*^rFK|$JUC5U(ugkJmsUJ8OBc<|uW77vz+(2LL?5TT?L zS}54kOF?^xwQVA@&NJ=1%r3h#v%A?O(isT5J3I5v`#kT*Y-WFkFIs%V-5;iq;C&LHG@PSb6DeoTLb@204 zw)sId27%`~y83@&co+~^!czf%9WAnhgYV2FR1+(^_F~RC{r!u9fVqFSYl-EB0hjAR_>&JchU6^A zJS-3Jl4E_o2ObY2u*@I00bWG zx(U8ktBIsXQ#ITkz)iqI_gDnL1z~mk$}g9?VtLB;0FG(8P$-CG2v8uwB>vGhvhtLK z&>1n$U5J_$p{Zac@q;8BGb#@33SqHq#O`5m<%58FX9p;h~@+&sIRIH z)+7t#zepP3F@9nKfA{*aLtcqo!M1XO6?z5sA?azdV=YVLWLq_0O% zw;z81B(4rg`ob`-SLZW;&0lGqGlcG(6Tu6qW zws3ZLJ;!A{vI#u7q32~v541xK0{q+atE(TyhUvxfyix;g2vBdhRZv_Jc(jwPK>dHx zxYC$(OvXP(n6CbIcs2?F9vCuyxw}t)#J{0znEy0FjLD*y(HV6|#LP!|(Fg=tJvLjg|%fFV+ z=M+VnAMee3Z^rW;V6j*%7K`Qo3Mu-)bzQ|6OP+-gg>BXe=Ujj3zonFjqG;xPznk^a zbzSBAJ}9N2lwxaZ3joxnDuHvZf*`>C{XOD1MjXcgpk^uIS>6jRJb~AZaerKUg7-u zcB$^s+^MNoULAkmJmAyd3rVm1$B)0G-|wT@^l^1{VHB@sT7U_w6dr&cL%s6q_?q(h zwD2!qcJ$|k@v4#nRxP~d{Q8#s^L=e1;Pv}`L{UT-V`_giij4c3+i`=|-dcnQCZql7 z=_%qkhTf`$5JbvHNcm{w0&^)KXzi)pAGg*jypHyaF;Gg;Xf%>DfDnS1Zq=nHKP^1x z9G>ST=Y(FbrvQ*BGB-mL^j6mGc9Uoyh9RVsV2r`@JX~I0LP}ZcuvRJtWUagqVsblN z(9V*D@B4q~^?DeO#|Xo4T2RFpgOsvVpXFSDJX@RDce`B-heLEaon+=zD5V&SzW@NA246Nx3A%3J1^;;>S6I}} zC@+5yMG?_C_tDK5yW0-(3KiCYPSTEU#u)zjhq3U0fd%MmsdT-~bdJ8-^sAATp-$H| z72PKqSwOwsz|qm0G`9hH>lSeMtzuA005}0imP>6!mQc^Z2=3t zP0lMcYVOq3+iokjcxf2~?S1vO+sZAV@Y3 z&bewd8laRuNrP#0-Of+jFHFX)Oi_l~^StC7P`O4(N{Ne$i^551B@}*G5t9sc7={2) zx>g_)?N8rQmPXIjBo-9LfOMAjTcS!`LT-l(>ukv^d>7Ch9v*JI5|%ng*LBq<#{w|U yxhiX^rRxN%7CkJJdFHm75^syeVzF2@l79hhYH2EBtHTrJiyrB~WOfH1{Huf*^rFK|$JUC5U(ugkJmsUJ8OBc<|uW77vz+(2LL?5TT?L zS}54kOF?^xwQVA@&NJ=1%r3h#v%A?O(isT5J3I5v`#kT*Y-WFkFIs%V-5;iq;C&LHG@PSb6DeoTLb@204 zw)sId27%`~y83@&co+~^!czf%9WAnhgYV2FR1+(^_F~RC{r!u9fVqFSYl-EB0hjAR_>&JchU6^A zJS-3Jl4E_o2ObY2u*@I00bWG zx(U8ktBIsXQ#ITkz)iqI_gDnL1z~mk$}g9?VtLB;0FG(8P$-CG2v8uwB>vGhvhtLK z&>1n$U5J_$p{Zac@q;8BGb#@33SqHq#O`5m<%58FX9p;h~@+&sIRIH z)+7t#zepP3F@9nKfA{*aLtcqo!M1XO6?z5sA?azdV=YVLWLq_0O% zw;z81B(4rg`ob`-SLZW;&0lGqGlcG(6Tu6qW zws3ZLJ;!A{vI#u7q32~v541xK0{q+atE(TyhUvxfyix;g2vBdhRZv_Jc(jwPK>dHx zxYC$(OvXP(n6CbIcs2?F2$E)?;8s%??J7AEX!(w05G4=m2((|1!GK!o5{+%q{sZm zjVT@k3~_viAYeFTht}ZoMxQIzSU@S>CTMnFcBxO`>H?&cm9Z@rugLSSnzOzKOo*uP zegC5I1AuFGPzry1zMl-(?RGU`;JBDB6$gw>*t_ki^IRsqt!l~i^EP+GHR2YF#bN<~ YZ|-Nnf%cFUod5s;07*qoM6N<$f>w#fxc~qF delta 483 zcmV<90UZ9p2KEN9o&kRV32;bRa{vGf6951U69E94oEQKA0j)_yK~z`??NrTb!axun zihIbge*0c;pt0>ZxE@8zJL(FB8=#dwyC9F+N0?%fFzv!5+I(aJUyS1pHp36j#mxf&2m9F*6Wx~r;J-;^qQur)=dTUPx%?MXyIRCt{2n!Re|FcgK4mtc^$aA6o2aHVR%Pmm_nu#g8?NVSmXSja$LBd`!i znLbY-5K|Zy2DD>HI|EMPEe2`jAK8*K*);cqfFoPFKbFSDIRHTr1VIo4K@bFSf^*({ z#Iv8lRDNH4CUDLh`!6)eT#BMN%erIvMXrY#W3BPy@rXRn@%sAO8}B|ZgfQzCMbX&* zha{V284icT;JTsfm1Q|N_d;J>US2i;u;1^oTCL0jQcB$3{=jB)kGHos+}wNz0Bkn* z$n(6npl*mJNs?Aku0%RXo9i@9QP=g<6vKMGZl0f?O^nrQ1u3Pe@8#vC72h;qzu%id zJ0RyAkB?8L*oTK-0MIHvj$>y+X__KUQvg6&mfnSQ^QfxIYtC-B8(hP#&&D*selv_Q zud}yYE>YJt>bmY74LgCc2DzA1JOD^3TW?q?HM;9Ah6Y_{jdR}U#fqY6%CZDw49n$m zbY5r^bn$jmyM_5O^}Esg3i!Y|Z-fw$&w18Ggq&kNPY4mkU-M{g@je7KfHBtE1;DAp zN-1PnHu%{RLPW0P;bOPjnKxJc`5iPjlv$k}Dl|zF91e%k;{*781qgy52!bF8f*=Tj zAP9mW2;vj*mB00K|3lUe$!m;BVPwoN(7gsu#cM^_Uo2*Eb~gjH?G}y;GcwU&yi9_ zi^ZbxJ%+*l04Hn%Px&5lKWrRCt{2n!Re{KoH0OIue6)MT&)hK@iv?2=)ow`&9z24)O+pD-RO5*9Zgx zSEh2~ClII-94z=Oa2tVA>=n5YD`_RIW#1Rfud%dWGdmvb7XJYlhG7_nVHk#C7=NUc z=3g2=l@C)Uxtxf(KN_1H zyMB~XCW<1wzP@()rlu^zFbu;m48t%C!!QiPFbu=|C-?{=rxZ;{`8}n~KB+#Sz4%yd zz%fCf^`w+0ilT=6eTtd{FEOKCD_}3&R)d5P&|25+htvhQ__eY6on-DYyS}!2Ghit4 zz`HCS$1#KuD9aM7)eY|Nzu@id4FIrO-Qeo#s;&=MEEb0J|EW|} z>-D-Gzg#X&pX%C{qwV5^LojP}6szOl|oi;K$RwHn%WNs_g?b?L- zeBO}i>DSlxXaLA~yFg*RUI$7kGoQ}^py9x&Y6NWBigo*wB%4yo&UrP&;4LtvR>0Tr zA!w~To2N{$rTQrn{b&XpQY-K~Y6SYSsVqy7RPR#`*T-N0wAO>^OxMgY4oo3U)4+8# hGYrEp48t%7@Dl(#)Z06J)H?tG002ovPDHLkV1fYxjD`RJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json index 0a03eead873..cd29d82fd15 100644 --- a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", "size": { "x": 32, "y": 32 @@ -34,6 +34,14 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d5d0304775b8b89f1f75dbd836b9fc160b7b9ac4 GIT binary patch literal 860 zcmV-i1Ec(jP)Px&7D+@wRCt{2n!kz^K@i5j6%!MslAZ|!vzv|iVX7cDechK@bE%5ClOG1Od=m z*Qcka_0si8k}O_(490SK*d6fRW4qn97FugTMDX4t%QB>Cin1(WtpxxOQEUBuB27~y zNm4uKHnG1S3~H@w?|qXnC%4^hVT{4~`CFWvoZ$NU8oS+RD5a35X={&*i;IJOxib0= zGBi(XT`Q$gZbEL{Gv{pWZRq5|}J1=t_J2kH6*thG_G#yZ1e-URI39bvpMewR7oFY*U4U7x_~ zH}CM{`&az>d3z^A!PXG-C3GDtA#*$lvjpf8D$GxhljnmEIkeWq3zO_)iuiZw55Sk* z$AhsWx5}Ta^(3qkAbb%5!1EU`QMx~Cwwx8uIrn>L{uJ?7U4i`%kfsc)@&@led|I>R mta!kGV#W{zK@bGtDEtLOoHQSNYw_&>0000Px%-AP12RCt{2nm>-zFcikWtY~OJZtO@P{uE56ibO-1l=Mh@1saa9?Mj?rq`kvR z+#y$(Dw&Qhb`uE>5DNBX9mmd}nam*I{hBBa|5JR4NZ0|2wGvS_2AHTt7R>E z39y54%gtT=vMeK|R7)A3Q=UsWc08Jw{TWq*k1O|sP#M})L90P~d`#d^ptX*kK6@RN zWf|Gq(Z`kB(SEu-4Dxd2`JM$+e+Te8ma(&CcA5EpN|aJ+P&153OCYw`BYyGhMO{s0?m;1=ln1n6lq*Bjts-$&3@T*#Z? z^CV1Z1`{xLrw#yVnga0q1n%#@9qkS9L09(l?$g}u?!2CaDb3Leu)P8Rf_?$lCjelv zHz0(4WpCqZ()h0K13}GT0$i^EFudBP3sc|S+fr}96r?4k43@RelVEQdACqUmlvltN zp{H-_98>=G|SzO8|@cGLPUcA~~ hRFh#ChGCe0mtXMkGS@g;iroMJ002ovPDHLkV1l2cX>$Mo literal 0 HcmV?d00001 From d7b54832a443ddf999dcfc30714fcf812fc1c409 Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 3 Jan 2025 08:02:16 +0100 Subject: [PATCH 9/9] more weapon renaming --- .../en-US/_emberfall/weapons/guns/weapons.ftl | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl b/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl index 6b0cd1b5305..921cfab4cbe 100644 --- a/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl +++ b/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl @@ -75,3 +75,69 @@ ent-WeaponSubMachineGunWt550 = ent-WeaponSniperMosin = .desc = A weapon for hunting, or endless trench warfare. This bolt-action rifle has stood the test of time and still serves faithfully. + +ent-WeaponLaserSvalinn = + .desc = A practical laser pistol found in security armories across the sector. Simple, reliable, and cheap enough that accounting won't complain when you requisition a replacement. + +ent-WeaponLaserGun = + .desc = A classic design that refuses to go out of style. What it lacks in modern amenities it makes up for with proven reliability and a distinctive retro aesthetic that some officers swear improves accuracy. + +ent-WeaponMakeshiftLaser = + .desc = A jury-rigged laser pistol that's more likely to give the wielder anxiety than the target. The manual consists of a sticky note reading 'Point away from face'. + +ent-WeaponTeslaGun = + .desc = A specialized weapon that harnesses electromagnetic forces. Each shot creates an impressive light show, though most targets are too busy being electrocuted to appreciate it. + +ent-WeaponLaserCarbinePractice = + .desc = Security cadets' first introduction to energy weapons. The power output is limited to prevent training accidents, much to the relief of the medical staff. + +ent-WeaponLaserCarbine = + .desc = Standard-issue SC security laser rifle. Combines respectable stopping power with a price point that keeps the bean counters happy. Comes with a 'warranty void if exposed to plasma' sticker. + +ent-WeaponPulsePistol = + .desc = SC's premier tactical sidearm. Each shot delivers a concentrated burst of energy that will ruin anyone's day. + +ent-WeaponPulseCarbine = + .desc = High-end SC energy weapon that makes its presence known. Features select-fire capability and enough punch to make even hardened operatives think twice. + +ent-WeaponPulseRifle = + .desc = The gold standard in energy weapon technology. Each shot carries enough power to leave an impression - both on the target and in the after-action report. + +ent-WeaponLaserCannon = + .desc = When subtlety isn't an option and property damage is acceptable collateral. The power cell housing comes with built-in cooling fins, which should tell you everything you need to know. + +ent-WeaponParticleDecelerator = + .desc = A specialized containment weapon for dealing with exotic particle anomalies. The user manual heavily emphasizes keeping your distance from the target, which is always a good sign. + +ent-WeaponXrayCannon = + .desc = Cutting-edge weaponry that utilizes penetrating radiation. The 'Experimental' warning label has been crossed out and replaced with 'Mostly Stable', which is progress. + +ent-WeaponDisablerPractice = + .desc = Training variant of the standard disabler. Perfect for teaching cadets about weapon handling without risking any expensive lawsuits. + +ent-WeaponDisabler = + .desc = Standard-issue compliance device that excels at de-escalating situations. Favored by security officers who prefer their suspects conscious enough to sign confessions. + +ent-WeaponDisablerSMG = + .desc = High-rate compliance device for when one target isn't going down fast enough. Delivers enough non-lethal rounds to exhaust even the most enthusiastic resistance. + +ent-WeaponTaser = + .desc = Classic security sidearm that trades ammunition capacity for stopping power. Nothing says 'please comply' quite like 50,000 volts of persuasion. + +ent-WeaponAntiqueLaser = + .desc = A masterwork of pre-corporate craftsmanship. The self-charging mechanism is a testament to lost technology, and the chrome finish ensures you look good while using it. + +ent-WeaponAdvancedLaser = + .desc = SC's latest in personal defense technology. Features a miniaturized fusion cell that ensures you'll never run out of shots - assuming you live long enough to fire them all. + +ent-WeaponPistolCHIMP = + .desc = A marvel of anomalous weapons research that packs quite a punch for its size. The instruction manual spends more pages on physics disclaimers than actual instructions. + +ent-WeaponPistolCHIMPUpgraded = + .desc = An enhanced version of the standard CHIMP that demonstrates why some experiments should have remained theoretical. Each shot bends reality a little more than strictly necessary. + +ent-WeaponBehonkerLaser = + .desc = A grotesque but effective weapon fashioned from a behonker's eye. Every shot is accompanied by a faint honking sound that scientists swear is just psychosomatic. + +ent-WeaponEnergyShotgun = + .desc = A high-end energy shotgun. Features multiple firing modes for when you can't decide between 'stop' and 'stop existing'.