From e8ede69ca7e2dcefb1e6274f4771214681408e1d Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 9 Jan 2025 14:10:09 -0700 Subject: [PATCH 1/6] wielded --- .../inhands_64x.rsi/energy-inhand-left.png | Bin 0 -> 979 bytes .../inhands_64x.rsi/energy-inhand-right.png | Bin 0 -> 997 bytes .../Guns/Battery/inhands_64x.rsi/meta.json | 27 ++++++++++++++++++ .../inhands_64x.rsi/wielded-inhand-left.png | Bin 0 -> 1132 bytes .../inhands_64x.rsi/wielded-inhand-right.png | Bin 0 -> 1147 bytes 5 files changed, 27 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7c40c4f9d7d43c237ee95c20dc1d2d20891912 GIT binary patch literal 979 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49ppxE{-7;ac}SX`wKft9RKJT=wQ(x;32%V zW1`2C1)cSJv*y_pe(_k;*_rOYk8#~T?)Xl%dtU<<8+Hirg-+0DYo3wubo;xc&0B7_ zm6XrF`L}M;vNzv07=N}gwvL@;!w0k$1$;8DtlPFSykf>moAr17)en`w&-gIkrcOle zsq=MxC!q@W=6#zsP5RBV~^!r-P!vKQZ{_{W9XdZ z@Rr+u;e9jqyTFlD&Ct-Eh7`^RGnOV)aQ?Z%fZ9}=G(|G7(O#^UO%wPD_OVxO1(?^lVn zUwL=hj2Om62XEiL&D}RqZZhWvi*Vk1*SD87l`lD-!gS@jSyOrZyWe)kyE*4bNb%&c z?o(^je`_|K;p%DgS;>ck^GZug7iefV{0gx*&H7Zh@uX-%P0gCueDU+mrFvt8U9P`h zI``H2OK+O0FaMBQlQm7~U<^~nhPLxPyXNorFZW^MKG?6K+IViY{Hy+7rOzKtRp9*h z#{6uJugUf!_txo}+V5GtJ3m_5@%Am=byFW~_sV*Hq-3k*{tYkg?W=pBmOgK1`22gj zv!`mB?R=ZD;gCJI>)%Up500K_Ik}g?Xn~5t50r?(!Z{FqtxH#=@#ZYYLasfpzAkPN zsd@Ef`jn=7QAYcME5$@6WWC?U7Vpt8Dd21F)yMt%zf~OSXWn7?6=8ZO{F#u0as1cs zr{!wa)_lCG&-+ZMVdj7RAFFgFL}&5%Pj?P#KV9_yxOliOw4$3J${}SbS-NZ&Ak6kuskNL*35kItTM1{glVS{{PDs&Q^L`>E-Kaf6o7=M+1|>57p%d+z-AtUBR;dz%Ewv^$#{H lpA86_@ber$Qi%RKymP;0Trb;ohO4b0VNX{-mvv4FO#q##z108! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b45368663314b7ad36ae0e24e2872bff461d0e5 GIT binary patch literal 997 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49r!YE{-7;ac}RQ_nzV?bNr*Bj%n+bLjqd5 zo>TU)TwQr1czK_!EsNuGzrW1?H1ArMy_$49PmsHDMuyzBKY^0mTib8_@Hu~AlkWL- zzimFhd1L%uT<7&?jUR8y?W~RMy5gCE_96p?F!6OdCSN`H3>hkW4z7H%Q~&%tyN%)# zWfnQC+WpEtU{}Z2ucc{CO{{_6ckZ_v+xKP^SkI zU)}zf#;wG#sC$=n^~#;*R<0a20kNU?uN|DehVjG}&YaRM+l@aJ<{YxIvd^46YmOUV zi2v2luc31%U*35_m*J69!JoZ}!n5bNv8`JC>Sgi=)$0r##*TG0`#u*>-1aYH?Wz#1 zKP3|aqyB!n!SKwEdCRKnufNR{XgQtDQ1-3=&F5END}VQVsNijg-oEPg?r#zgKZ-H% z?pyY6=EjRpcz!*s{`|a_?Z&NJQZuFYXFSWllO}(m^`61i%ahM4Wlz;)*cz3)s}`!QFW7|F7C(J@e;o(dYVq`N027 zlU}y}_qL`+t6%jl^p zdz-IHSf=fZKFIDp+ab5lDtE%EZ8}SGnHEnCo8q-JXxHtfcbx=+JoemY_gGwBUs`Q` zW46lQS4)@HX>dhO{<7$D)I4pD?%w&&?tGb1x%cNvlh-NB1$a_le_vBI^OH!^h5EuK z9zP+by4I*Ujqez5?W}&bx%}Pqcgve!d^KXWkgEB&XjzJ%5W~d>pSPE)I&)ko=D2e` z^8=^D$rA2^p6Og)@)OKeFR@vknyrc)x;qV?>BlbaJfZIX%?Bjz>FVdQ&MBb@063t* Ar~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json new file mode 100644 index 00000000000..2fcf294bc98 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "energy-inhand-left", + "directions": 4 + }, + { + "name": "energy-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..056e6026ac107802ca61d274e1be6aad0ecb67b8 GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucHH@Avjv*CsZ|~mEo*gQ2;G??zt(~gNblrBV z_4WL#m}t1+;=vewmi49KO(8EF1oYd=|1s`;A^%`$T!(^2PF47qZ9DGl;FSzrliZt| zdtKLe>BVDezROjP&%11{c>0#f?EFi6ZhmKe_~*pw*`Mcpp7UKb+#To=EMP~=aXs0> ztQVnI@7`5CniM!~vb|MRzDfIaJ=up}r>Oj?@n~Y)KS!=p`>yzAx6qs&b+NN|Tv+?) zy!@z1^FBmWJCfRx$m3w!T0^WI}wN?7w^OGpZa<%kR#P?~QpJX4U!ic;2<8_kWgc zRgIc8_p8{A()X5F(gJp&TMj?(R2Q@DGyUbU_p*#w{_dmqz8sc1{rtW-7whG9+qP~^ zJym0;KheWw)6F%R=0)e~cCQl8-&$f7+xb)Daqchv{y7`3Ed9v2`|F08GbK+xEm}6u zYw3|qI>Ga!qYP7b&llb^zv`o(zyIu@9r&I9?I%1uU#&re|UX2p?qhU^2e~>3y&67zulBt za?IRFGyna&e|{G-_RNZ__xJjd{3O0t<-5yzzn{2oy!GJqeZtmfFN^78glmS_ a#QzMkK{F5CPWvbVlJ#`;b6Mw<&;$TNav+HS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d5933b2f698b070a7724cce6b2071f83ef4f2907 GIT binary patch literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucH3FV4jv*CsZ|~mEo*gQ2;G_D*umANzIMm0j~N<^Y;2Do z`Cl{NLbmem)oW|2_4oMP_%>_XEW5c@>&%YZiM+q`{gZQ6M2+42pQjJr$=hzJ<+c2> zQ2+7UpEL#d+Na)sZ$8mOM@;+v^VXH!ug;yfzq;rB$B%_uckH;a<o518zt;2Z3wZbc^299We~q z+1Y&Y4^*|^y_4Pa%cT8v{OYfBUI<>_x?aWp|4g5{zl;BT^K`lPSo_hNB9AQ9n-dyW zOn3M&<&=GxkPPps#IQec>2doOxUu=465qJ{QRvb7_otsfIkWO$n}}nq{tE5~VO7EF z=E!Y+H1){cn%bvey4|_Nx_}0C|;=BENO)+}u zN)z+n>z`EJzdg~vao0uGg4?zWnihV3_2aj9>2IZwpIFfXVMFVG5Sg-w4RrU1iid(l%MJ4Z?8JquK-9fj? zDSPd+OO{*DZI=G4eLzOe!~Wmb(=EK$Cv{n66!pK#V#ks`unH}h*!1w^r+vRe`*XMG z|KFUEx=;7+lEC*<-+!%Ao$7V+!i9HwkA4^Kz8e<3Q+@y4Dc}CfzOYI=s=9aY-e(!% zn?L2gOn9~TQ|auJDQlECSeU~8pE=WW^<8Q5zhx@#j^>6lEbXlSepb^{MJO!3^Z4V5 zFJEQ~+pd-TX;y0R)#1%uhDwz^zh_kEy;w5mcadY=-hX`-`t^D{^X;acDGQrtQ=>4i zG48hCzoMeMF08Fe_4+1?-zR7Pes=rmiCMy~Vq#)a^YSmVZ7~tJ_s2f;ez5rA#b??| zs(-m|xBdI~+LPOr_K9=9ul=$t#?n@;(*4}4=w5O4ZNi_|dhxrQvHjo^pJkQEUO4yr zTc>*mFZ`UfbBj{^^32(fCf(2G?cn5J!oD~->=1kFp6r)PYWQ8%_rxC!f4zNo+1c$+ pMYo&(^owV8*Nw*r(F+<%{~0#~HXL$x+kF)z>*?y}vd$@?2>=$cCIbKf literal 0 HcmV?d00001 From faece5558c181518ebd9a025d3dc08efcf8774ed Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 9 Jan 2025 14:27:31 -0700 Subject: [PATCH 2/6] Update projectiles.yml --- .../Weapons/Guns/Projectiles/projectiles.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e1ad784d5a9..e0289709c1d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1042,9 +1042,21 @@ soundHit: collection: MeatLaserImpact +- type: entity + name: energy bolt + id: BulletEnergyGun + parent: BulletEnergyGunLaser + noSpawn: true + components: + - type: Projectile + impactEffect: BulletImpactEffectRedDisabler + damage: + types: + Heat: 5 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + - type: entity name: wide laser barrage id: BulletLaserSpread categories: [ HideSpawnMenu ] - parent: BulletEnergyGunLaser + parent: BulletEnergyGun From 0f877e3f9f4cce5c1ecca21fe09afd115a41b764 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 9 Jan 2025 14:56:58 -0700 Subject: [PATCH 3/6] Update guns.yml --- .../Floof/Entities/Objects/Weapons/guns.yml | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml index a22fb9c6169..af0fb073d66 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml @@ -99,7 +99,7 @@ - type: entity name: energy shotgun - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponEnergyShotgun description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. components: @@ -120,12 +120,6 @@ - type: ProjectileBatteryAmmoProvider proto: eShellShotgun fireCost: 150 - - type: BatteryWeaponFireModes - fireModes: - - proto: eShellShotgun - fireCost: 150 - - proto: BulletDisablerSmg - fireCost: 120 - type: Item size: Large shape: @@ -138,6 +132,40 @@ - type: StealTarget stealGroup: WeaponEnergyShotgun - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Battery + maxCharge: 1200 + startingCharge: 1200 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 24 + +- type: entity + name: borg energy shotgun + parent: BaseWeaponBattery + id: WeaponBorgEnergyShotgun + description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: eShellShotgun + fireCost: 150 + - type: Item + size: Large + shape: + - 0,0,3,1 + sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi + heldPrefix: energy - type: Battery maxCharge: 1200 startingCharge: 1200 From 1a18720d16ec66485829fc670146f4e74df76b5b Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 9 Jan 2025 15:07:57 -0700 Subject: [PATCH 4/6] Update Borgmodules.yml --- .../Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml b/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml index dec5b4a3c96..8683fadbfbb 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml @@ -76,7 +76,7 @@ - state: icon-Advmeasures - type: ItemBorgModule items: - - WeaponEnergyShotgun + - WeaponBorgEnergyShotgun - BorgWeaponXrayCannon - type: entity From 89b0e96f973cec9fed03164f2944d1b4d98177fd Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 9 Jan 2025 17:16:11 -0700 Subject: [PATCH 5/6] Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e0289709c1d..ff57190ab7d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1052,7 +1052,7 @@ impactEffect: BulletImpactEffectRedDisabler damage: types: - Heat: 5 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + Heat: 5 - type: entity name: wide laser barrage From 88840a9584e70de2f6d46f25d2269784a6282d1e Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Fri, 10 Jan 2025 07:10:12 +0100 Subject: [PATCH 6/6] Fixes things --- .../Floof/Entities/Objects/Weapons/guns.yml | 69 +++++++------------ 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml index af0fb073d66..7c8d17d40be 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml @@ -1,7 +1,7 @@ - type: entity - name: borg disabler parent: WeaponDisabler + suffix: Robot id: WeaponBorgDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -49,25 +49,25 @@ # - type: Appearance - type: entity - name: borg pulse rifle parent: WeaponPulseRifle + suffix: Robot id: BorgWeaponPulseRifle description: A weapon that is almost as infamous as its users. components: - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 30 + autoRechargeRate: 30 - type: entity - name: borg Xray Cannon parent: WeaponXrayCannon + suffix: Robot id: BorgWeaponXrayCannon description: A weapon that is almost as infamous as its users. components: - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 30 - + - type: entity name: mk 58 parent: BaseWeaponBatterySmall @@ -96,11 +96,12 @@ - type: Battery maxCharge: 1000 startingCharge: 1000 - + - type: entity name: energy shotgun - parent: [BaseWeaponBattery, BaseGunWieldable] - id: WeaponEnergyShotgun + parent: BaseWeaponBattery + id: BaseWeaponEnergyShotgun + abstract: true description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. components: - type: Sprite @@ -126,12 +127,6 @@ - 0,0,3,1 sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi heldPrefix: energy - - type: Tag - tags: - - HighRiskItem - - type: StealTarget - stealGroup: WeaponEnergyShotgun - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Battery maxCharge: 1200 startingCharge: 1200 @@ -140,35 +135,19 @@ autoRechargeRate: 24 - type: entity - name: borg energy shotgun - parent: BaseWeaponBattery - id: WeaponBorgEnergyShotgun - description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. + name: energy shotgun + parent: BaseWeaponEnergyShotgun + id: WeaponEnergyShotgun components: - - type: Sprite - sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Gun - fireRate: 2 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - - type: ProjectileBatteryAmmoProvider - proto: eShellShotgun - fireCost: 150 - - type: Item - size: Large - shape: - - 0,0,3,1 - sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi - heldPrefix: energy - - type: Battery - maxCharge: 1200 - startingCharge: 1200 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 24 \ No newline at end of file + - type: GunRequiresWield + - type: Wieldable + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: WeaponEnergyShotgun + +- type: entity + suffix: Robot + parent: BaseWeaponEnergyShotgun + id: WeaponBorgEnergyShotgun