From a94f64d94288f9fff268a81222e9ac995ddab3e8 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Wed, 16 Apr 2025 10:58:35 -0700 Subject: [PATCH] New Arsenal T3: Temperature Gun Revitalization (#35447) * tempgun real * fixin shit * Warios Couch * fix tests. i hope * add to lathes * tests begone * RIP svalinn * maintainer for the project btw --------- Co-authored-by: Flareguy Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> --- .../Locale/en-US/research/technologies.ftl | 5 +- .../Weapons/Guns/Battery/battery_guns.yml | 44 +++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 32 +++++++++++ .../Recipes/Lathes/Packs/science.yml | 1 - .../Recipes/Lathes/Packs/security.yml | 1 + .../Prototypes/Recipes/Lathes/security.yml | 6 +- Resources/Prototypes/Research/arsenal.yml | 8 +-- .../Guns/Battery/temp_gun.rsi/base.png | Bin 0 -> 679 bytes .../temp_gun.rsi/equipped-BACKPACK.png | Bin 0 -> 845 bytes .../temp_gun.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 845 bytes .../Guns/Battery/temp_gun.rsi/icon.png | Bin 0 -> 717 bytes .../Guns/Battery/temp_gun.rsi/inhand-left.png | Bin 0 -> 1194 bytes .../Battery/temp_gun.rsi/inhand-right.png | Bin 0 -> 1206 bytes .../Battery/temp_gun.rsi/mag-unshaded-1.png | Bin 0 -> 129 bytes .../Battery/temp_gun.rsi/mag-unshaded-2.png | Bin 0 -> 130 bytes .../Battery/temp_gun.rsi/mag-unshaded-3.png | Bin 0 -> 130 bytes .../Battery/temp_gun.rsi/mag-unshaded-4.png | Bin 0 -> 130 bytes .../Guns/Battery/temp_gun.rsi/meta.json | 53 ++++++++++++++++++ .../temp_gun.rsi/wielded-inhand-left.png | Bin 0 -> 688 bytes .../temp_gun.rsi/wielded-inhand-right.png | Bin 0 -> 668 bytes 20 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index f4f12eec52..fc4f3e41e8 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -35,8 +35,9 @@ research-technology-wave-particle-harnessing = Wave Particle Harnessing research-technology-advanced-riot-control = Advanced Riot Control research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry research-technology-experimental-battery-ammo = Experimental Battery Ammo -research-technology-basic-shuttle-armament = Shuttle basic armament -research-technology-advanced-shuttle-weapon = Advanced shuttle weapons +research-technology-basic-shuttle-armament = Shuttle Basic Armament +research-technology-advanced-shuttle-weapon = Advanced Shuttle Weapons +research-technology-thermal-weaponry = Thermal Weaponry research-technology-basic-robotics = Basic Robotics research-technology-basic-anomalous-research = Basic Anomalous Research diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7b1c77b8d0..4d8856ef9e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -799,3 +799,47 @@ autoRechargeRate: 24 autoRechargePause: true autoRechargePauseTime: 30 + +- type: entity + name: temperature gun + parent: [BaseWeaponBattery, BaseGunWieldable] + id: WeaponTemperatureGun + description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-1 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Appearance + - type: Item + size: Large + shape: + - 0,0,3,1 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: ProjectileBatteryAmmoProvider + proto: BoltTempgunCold + fireCost: 100 + - type: BatteryWeaponFireModes + fireModes: + - proto: BoltTempgunCold + fireCost: 100 + - proto: BoltTempgunHot + fireCost: 100 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: StaticPrice + price: 100 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 57987b1086..ace364f127 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -384,6 +384,23 @@ - type: ChangeTemperatureOnCollide heat: -50000 +- type: entity + name: freezing bolt + id: BoltTempgunCold + parent: WatcherBolt + categories: [ HideSpawnMenu ] + components: + - type: Projectile + # soundHit: Waiting on serv3 + impactEffect: BulletImpactEffectDisabler + damage: + types: + Cold: 10 + - type: TimedDespawn + lifetime: 3 + - type: ChangeTemperatureOnCollide + heat: -100000 + - type: entity name: magmawing watcher bolt id: WatcherBoltMagmawing @@ -405,6 +422,21 @@ - type: ChangeTemperatureOnCollide heat: 50000 +- type: entity + name: scorching bolt + id: BoltTempgunHot + parent: WatcherBoltMagmawing + categories: [ HideSpawnMenu ] + components: + - type: Projectile + # soundHit: Waiting on serv3 + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 10 + - type: ChangeTemperatureOnCollide + heat: 100000 #This may be a bit underpowered, but in testing, 130000 was RIDICULOUS and killed in seconds. + - type: entity id: BulletKinetic name: kinetic bolt diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index a86b4bbebf..c68b408cac 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -52,7 +52,6 @@ recipes: - WeaponPistolCHIMP - WeaponForceGun - - WeaponLaserSvalinn - WeaponProtoKineticAccelerator - WeaponTetherGun - WeaponGauntletGorilla diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index a8eee17d5e..c2839b2379 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -127,6 +127,7 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + - WeaponTemperatureGun - type: latheRecipePack id: SecurityDisablers diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 725b785dd7..864edcba6e 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -92,10 +92,12 @@ - type: latheRecipe parent: BaseWeaponRecipeLong - id: WeaponLaserSvalinn - result: WeaponLaserSvalinn + id: WeaponTemperatureGun + result: WeaponTemperatureGun materials: Steel: 2000 + Glass: 500 + Plastic: 500 Gold: 500 - type: latheRecipe diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 6cecc49035..b848ae0998 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -193,16 +193,16 @@ - PortableRecharger - type: technology - id: ExperimentalBatteryAmmo - name: research-technology-experimental-battery-ammo + id: ThermalWeaponry + name: research-technology-thermal-weaponry icon: - sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi state: icon discipline: Arsenal tier: 3 cost: 15000 recipeUnlocks: - - WeaponLaserSvalinn + - WeaponTemperatureGun - type: technology id: AdvancedShuttleWeapon diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..00fc6f71fb67479641f35469e0370c04b2d52ffa GIT binary patch literal 679 zcmV;Y0$BZtP)Px%VM#%`riY1`As5qE75cfL39S)eFur|-~p6>j<&+~rx4rZ8PhW{Pbv<_ai zq8_>efFwyc9mZqlJG*;R#k8jt@b=S3zJ6XKc(4V)iuLm9Cu$lIQwz|joxA`bOhUR+ zQWob`iQ{;Z+cg-ajry|E>q!}S)rwlG)#yq|zkf`rR5bQB-z?Yw!gW=v*#w~N`x71Z z4-PFriHnR2g~FI^)R)z0csiMM{{FZCtv(Dx6C^7WU8OjVky4`9Y5V@eJKEoW(0cwX z(|+09Htp(4dENryy6WkZ$0qw$vq{_c$I98LFPkc5;kL?UVP|*GvUOmceW6e=>nt1` z9-8bm9LJ&6Y_huYh@Zc<$Ii0$G~zf`cE5iNz~G{UdB>qEWoGta7$T))saB&C1bQCu zsucyWw!T5LQ6D2&Ti?L*szgzAO@QM#*twi-0t+G7>vWj2F590b*CNy88etgXc~!bs zs#7WziK2+C_O*Q<`|NCFHum=qn47bh&*$-~73DaNIU8II-c@3qi6*{jPSS1d1c6!G zxtwh>lf9lLTvrW-L;j8uaNy1BSA5&tx{(|%|A3`hjkfPo7Q$Rk+NMdkTae z&IdB9uW2lng}P_kB%_gOO&rH6%VzmcytVXj2_eWk4xJz%NfLf{rL|ZV3ZS&Gz|o&0 zWUn{%!v?p!1u500LZxC6K$VI`P6h)`qUg@#aL4C3L*NWE%rL{9@eg8_RrW2j88`p{ N002ovPDHLkV1i@^M0x-K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..11dc6f629986c7b9cf588e7fd0c7963c83f70f47 GIT binary patch literal 845 zcmV-T1G4;yP)Px&2T4RhRCt{2n!isIVHn51N32k;>AjdH76W$(i1?$G5KTnlyQ0gN$R zyL$&6i8G?ua6!wyn#9-41K{uQvc2n+s@ehPe5bi?QB}bh!`a(E@#fjE7=Qc}O`9LY zuP^Vn`*`W?ivgT-{EeRSgf++GI2AvM&(DvG`$dkWZ{IOB{!v@Xz7XAA9cZYp*Sz%h z!vN9Q(e7@p%!t^DCKS0XZr!|rN6m5c4fJC(Hzj&|F5%Pc93m0j{gZurt2RIY&~kHm zCj~-v3JR-5asBEQyng!*gEJGD9Ua5v-W~uzcUKn*E2{#4knOEfoKRe^B#HCqP*^RB zzJY$sj*bBU*4KYvxv&DuvM@b8?djH2m4HBo2mT~raApG8kqnX-lY53Y48xNS6`}(h z9st@b3*5FvXZvXYz;a;)%rLO9xCp~AG~2d4y>nEXfRe+Pcn?s9Gkh*Tziar$aM<(k zKy?O`{pbC7{5d$oo2{)_TU&!|+nN!LYU>*t6}@d%Dm2j8?<5wBq0MX+x%@mD!{Let zuLj@ZeMI^b1VIo4K@bE%5ClOG1VQ}cFvf(Rn;ok0Mek8FKz6P4&QL0qathb75rQ!$ zQmK^Ms_ArExMEdnMr`YGbf(j3b^3-2c@YYQglU@YqP1YcE)Aw>iclydh6{NqZBn1cE`E5S)XGLa}Z>|vNtvS%`p@Gk+}wq?Z~8jeQU1V|Z> z9mzn~buhyywQQo8V|nO-@M_lQLj#enF~O zE%C64Nv%63vnUdYpsr5Js~}E|9M~fojbdwSOYO;#mX?-Uc;-uSl(Z5AK@bE%92&m? X9_LCbPbj_g00000NkvXXu0mjfHrITT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..11dc6f629986c7b9cf588e7fd0c7963c83f70f47 GIT binary patch literal 845 zcmV-T1G4;yP)Px&2T4RhRCt{2n!isIVHn51N32k;>AjdH76W$(i1?$G5KTnlyQ0gN$R zyL$&6i8G?ua6!wyn#9-41K{uQvc2n+s@ehPe5bi?QB}bh!`a(E@#fjE7=Qc}O`9LY zuP^Vn`*`W?ivgT-{EeRSgf++GI2AvM&(DvG`$dkWZ{IOB{!v@Xz7XAA9cZYp*Sz%h z!vN9Q(e7@p%!t^DCKS0XZr!|rN6m5c4fJC(Hzj&|F5%Pc93m0j{gZurt2RIY&~kHm zCj~-v3JR-5asBEQyng!*gEJGD9Ua5v-W~uzcUKn*E2{#4knOEfoKRe^B#HCqP*^RB zzJY$sj*bBU*4KYvxv&DuvM@b8?djH2m4HBo2mT~raApG8kqnX-lY53Y48xNS6`}(h z9st@b3*5FvXZvXYz;a;)%rLO9xCp~AG~2d4y>nEXfRe+Pcn?s9Gkh*Tziar$aM<(k zKy?O`{pbC7{5d$oo2{)_TU&!|+nN!LYU>*t6}@d%Dm2j8?<5wBq0MX+x%@mD!{Let zuLj@ZeMI^b1VIo4K@bE%5ClOG1VQ}cFvf(Rn;ok0Mek8FKz6P4&QL0qathb75rQ!$ zQmK^Ms_ArExMEdnMr`YGbf(j3b^3-2c@YYQglU@YqP1YcE)Aw>iclydh6{NqZBn1cE`E5S)XGLa}Z>|vNtvS%`p@Gk+}wq?Z~8jeQU1V|Z> z9mzn~buhyywQQo8V|nO-@M_lQLj#enF~O zE%C64Nv%63vnUdYpsr5Js~}E|9M~fojbdwSOYO;#mX?-Uc;-uSl(Z5AK@bE%92&m? X9_LCbPbj_g00000NkvXXu0mjfHrITT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1091e6402c97ca607b71e263fba39cb142bab1f6 GIT binary patch literal 717 zcmV;;0y6!HP)Px%he^sl%{@EFrVTKw0cf_U* zFp340%?SW}-{-vVj_mIr98PtnHm!hHwKshExW(q~9-p4UM(pYMCu$lIQws>N_hge2 zVEGm;DangLRb1Dd95{whX{EfTg7u^fjAB8pmP)jwq}x3solb@Jw%90W03w%D>(wd% zb<>;}aCCeU1C+STcyV!Y#8%2{%Ilv`CY`?*uHyj3!b&Zh&0<*=J;x!FS+1RSI&a4V zE9Etn$t>4A&%<#X#;xNxy!-x{xEAO2hxd_o|Jx7pLa?x~K+kaoEfBe!di>~NnEiUS zO5HR^%2_F|g;k2eZIz3{{=s2P3l6p{3mB9#SV!Ubsb)~i(>Y~1JPuiqnk zQN94K>ng3=Jp;hGoZh6a(~>eWd&{zrQnFeq(P%b@w z^FfD~FP`&tckf1WxVn5+OC{>2NnVKXatiD)>F_yP@LvaxKm-g1GODk`Sjh_&*ED?3 z3tQv5u8Oiz@e^;YV7P=3Bz2uevx)Ef{AtP9N?s^{^wJWY(+;xTp88>fTi${p)nSFw zsT6=pr&9DBhn{WUnH=u;97hP8VTKuIxHJ9%S}tD+38Wyz00000NkvXXu0mjf-pg38 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7911e2ead9aa44d023483f3027a67e862173f1fc GIT binary patch literal 1194 zcmV;b1XcTqP)Px(WJyFpRCt{2n!!&LR~*MbuW1~1B|C4G$YR{xqIM;zASIfZR8lYYP!D)*PxfM( zHu0$GU(oczp$ zmYZ5)F%HL?c{H?7T`OATmYy;-`at9+@2IxaF&YfRvAwUZ4a5PBjr(~x`@KR zsf$;yaHA#0h4bAMEn77mh`uI5ODsmyfha}GRu|59bE753#j96Xo10Qyou_y>`2^iGeHFBFwiJiwD&j(nl0dZ)*kygf+A$&M|>o2KdeVnF~7fR`>XO%vO; zRU#h8vTY7E9Ry%*egSEk!m{m(g{728)5NlEb^K^60L%Fmq-l~}T*Nd@VY{yPlRyN3 zmqmp`A|~VHjd*X$gSl=4RH{*Ok*2i9{;JheIJzUR@2OcnI!y z0G4G@UR}kEM1*bIqEsr8h{u_mU%**qH%{@1c$`wHgl*fxj6?!09s+cL8@C&dA8qBY z?4k&V!(_8r01}A=<#L&i5^*&*zYzGUzZ0aCuN`l?#(makG#ZUYqtR$I8jVJy(P;eV zt-KR_TU5VF^YTtHPyu$64cKkJuHv0WPupi7`ZlXgoP5BMOV|0WZ={k9@GHu55r8cFGUb2u#!z z!gm3lKi{Z38{mbV@&hiE>+s})KtfXWWCOfVD?gCUX2o{9NnV~ezB{1aY=9SPnM`I^^Y#5}&?zh&3W@CEqDsW$Eaz9;*#Ko2MqR=ihEXYg zyZnG{+q<4`Ao+lLvjJWRDnAhTe}P)r057~3`2meaqj?wn2c)sY)6J*lTL1t607*qo IM6N<$f@D!Qt^fc4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ecc3d008a649972bb362f321c3030e1b5f77a679 GIT binary patch literal 1206 zcmV;n1WEgeP)Px(a7jc#RCt{2n$J%gM-<1u6IEI4AkUasi5=D6@S}#dKqyM2NDXQ(>7g9xwLQ@b zs#=L-@+U;SaA+>57jl9F7dVsyN)HtQMT#gA1{$crv0XI|S@4VxHX)>w1KI6j8@zTP z7&;$m<@N4(cHW!!cC2|{K%r156bgkxp-?CkivJy?*v0!&TIaoFw+Ukm0Khqa55p=C z#uzx~V2qgqC+0Yd*Q3S$hPfBOv@+dh)%nor5x?|lcktO4o$zig%GJnUWO{g{U;@wNch=mqjp^YLIW;&0@7AK+iO-sy=RcsDu*PPa zAh{Etg?DRFP7MxWdU!-O_iWo82EgWkfZvZx{)<>1KPzviIa1GGV18u@Nl&Kat=Y%na8cicD;YOt99?1ErC6apn0=Lr~%j0L|CI3YP{C?{AhdnTr~_8gw9tfI5y3bvy2vb(_~4rDmT(vVaJ91oD-)9#SeU`XM~`vi`ZXAvY0D1Fb8Vk|3}Z7byZigFGBF7N$Yx(+ z-PnMx>xe`mfbH#Ct-Q@~+1A#Ecsz~^zVmRqH2^^Pt1t2E&%eM|=OvM)KLO-Lz`()` z=0?ZR-r8PZJf*a%^WP4oltdyC=(>(|V*}ajOSHGPV{UW|0}C_7BjB>Gg9{;>8tMT6 z>&6BcrAQ=`pp+6JL{LJHkUgw#+xw4;C8u?&E+g7WHK3;Hk!+&l>+9CP%wy0CIcY^p&rkP zG#=P}Ic9S?P>+WQAxI{ZK`0nRbS(xm$^lyh_vn z45P4-{WxuyHl0S>6bgkxp-?Ck3WY+UP$(4T;ApQue;etv>=gnI98jeEOo0EKP^$i3 zDM!_BJ|8%2C-cq;0JQer#c%f~t@^tuRCreyV;KGM2TP;S+I!d3C>**z!HEOx#uNMZ z-TJ#Grv`@*izj7s&o)^ee>W%CH46XeL3Dlpo!p7f?s@KEa;9_>3zGNgsQz9Kr8Ej| zSIwd4f)fYq`%um~*{}Xyt`h=&e@TtPQS9kEjQ}$Q3#2lo>hI-HN~7@V)lMbd9!N#Y zAh5d%ghC;?U;W+KOygN9<#-@w1eDS!9QI4lQ3P<#3l7GZJgEL&j`0BSER{MIjY7p8 z>bibl{hgPoCt!?$QTpCB3gxTW2pQdS+@zJ%| z9^>6E*O3V{Dt3U=`g=JXheqL0a;jMU-R*WGkw`f1BNPfDo6VkDje{oQC}02p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..4feaf6c2bc979b22c57a39f2a0ed27e20a15ad65 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ z&lw6bCW^b9u@F4td(aNGP?4Kgjcb|Q@{bD>& aYh|qDJyACqmHW~_4uhwwpUXO@geCwFa4B^F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..b2e9ea615f4db1c334792fd13b7e0405fd007f89 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ z&lw6bC_r5eDQyv b)=xWo>!oE^F70Opau_^a{an^LB{Ts5HnuA+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json new file mode 100644 index 0000000000..d9585ec8f0 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b98afcd1400b0f398bf1322b2b20de57ccf7bb0c and modified by Flareguy. equipped-BACKPACK, equipped-SUITSTORAGE, inhand-left and inhand-right states modified by Flareguy using ion rifle states", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e3e7a960d7d1af2c52c041f31573e57592992e35 GIT binary patch literal 688 zcmV;h0#E&kP)Px%YDq*vRCt{2nlW$FKorOS0SZBu;AWJh*fCZHL{h7*IwSE75Mn?T3la;A8Bv+| z22^4}NDPQi!N5?ZsH~9{r4j>34CJU7f&-YLvT+<=Y|d^Q#Q!HnXZw8by?b}Q4DSyR zLI@#*5JCv~|ETB=6hZ`P&!v>wHcx_6I)j7|LCbOAcG_?|ZFENx0I>PwQK`Wl2WM0r zsud3DdmhBa3jly;mm2^MN)1d15yW>>@?O_YlDRv;woKgYKE(E5Z>nw7>u@`57={7M zG+`J9u3c^6&C};IiOWi4R`B6<%W-tg%te`*Rd*#A4EJZA+m?xq^)>ADb^!nz>uY%V z>UGrLavbzMFFFf~tQ=7MOj&hTf_HoGl{SWK9mz;1&~lv8N@8gog)Tv<56H`*HsG)nCchp;fvVomTB+mK zC7jOlk`N*okH?SW_akqJ<;Era`1uRPx%R!KxbRCt{2+COj8Ko|z_r$8ad65NcE6g$DnfJkbUsxuPb03ilcu^_R)m=TqU zZ$Kp$gv5aO6bv1z6qPlyqC{cOXO4DxTkRPV9T%_s(uQ_yvfF zh=_=Y=>M~nl0uuNC*+XfAI=8t~cN~4m{U|<2VRfO;jrt+-X0- zc5naCSohql_0O!~`_?r~W8E2j=Y$Y(!}rk*!^!#k_wHi1vj+g!Sigzg&K`RG!I3z1 z&&7xRkD2e}TCf`DnWs}5aNHA+dIR)h+Z^+bs}1>=e*$KVr2L7$0p^11o{L_8U>$X{ zETE{xCpk8W9z@;UUVi{7<&wHX<~U2yMKBj$SWQBR_%#2!BO)RqA|fIpA|fK9Z2bYc zlj;>HI&Y@_0NqLS3aFQ~Dqnjj57m-KuKoaB(Y*pm8`up)h|8C>+y|NJHJwd!kq{yt zjYiM(&%>~fmFgAz`uzu$av9NhjBB+TmY2`t_M-=Q{CXP~OBW_%^yMqQ4JGtA)09f3 zt-9yp*2B#sF@AjdjGE^n8jmMA-IX%BJ01LtqAjz=q+CGC-vIqJ^SpZn)`Hd8Hdn<~ zdEUHzH#x6rQZ=f2lh&4N1N7jwM>cP-fQo0EZ!+tc>js!f)wy}}3Z(5zFl(75XJSF- zD{^&g8;g`C*R&dw