From adb3256a4d65db9d74a4ff8868b6971bbc0082c0 Mon Sep 17 00:00:00 2001 From: Samuka <47865393+Samuka-C@users.noreply.github.com> Date: Thu, 13 Aug 2026 17:58:47 +0000 Subject: [PATCH] Xenoborg laser resprite (#45168) * start * use xenoborg colors * laser animation meta json * update laser usage * ops, random white pixel * sprite for the xenoborg laser * new xenoborg laser cannon sprite * forgot by copyright * fix * fix merge conflict mistake --------- Co-authored-by: beck-thompson --- .../Weapons/Guns/Battery/battery_guns.yml | 14 ++- .../Weapons/Guns/Projectiles/hitscan.yml | 42 ++++++++ .../xenoborg_laser_cannon.rsi/base.png | Bin 0 -> 418 bytes .../xenoborg_laser_cannon.rsi/icon.png | Bin 0 -> 423 bytes .../mag-unshaded-1.png | Bin 0 -> 114 bytes .../mag-unshaded-2.png | Bin 0 -> 131 bytes .../mag-unshaded-3.png | Bin 0 -> 130 bytes .../mag-unshaded-4.png | Bin 0 -> 130 bytes .../xenoborg_laser_cannon.rsi/meta.json | 29 ++++++ .../projectiles.rsi/beam_xenoborg.png | Bin 0 -> 371 bytes .../projectiles.rsi/beam_xenoborg_heavy.png | Bin 0 -> 200 bytes .../projectiles.rsi/impact_beam_xenoborg.png | Bin 0 -> 407 bytes .../impact_beam_xenoborg_heavy.png | Bin 0 -> 496 bytes .../Projectiles/projectiles.rsi/meta.json | 92 +++++++++++++++++- .../projectiles.rsi/muzzle_beam_xenoborg.png | Bin 0 -> 505 bytes .../muzzle_beam_xenoborg_heavy.png | Bin 0 -> 354 bytes 16 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg_heavy.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png 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 8e8e5a96c2..45b6c53870 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -980,6 +980,8 @@ id: WeaponLaserGunXenoborg name: xenoborg laser gun components: + - type: BatteryAmmoProvider + proto: XenoborgLaser - type: Sprite sprite: Objects/Weapons/Guns/Battery/xenoborg_laser_gun.rsi layers: @@ -993,8 +995,18 @@ id: WeaponLaserCannonXenoborg name: xenoborg laser cannon components: + - type: BatteryAmmoProvider + proto: XenoborgHeavyLaser + fireCost: 100 + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-unshaded-4 + map: [ "enum.GunVisualLayers.MagUnshaded" ] - type: BatterySelfRecharger - autoRechargeRate: 30 + autoRechargeRate: 50 # "remove" wield bonus and penalty so borgs can use it - type: GunWieldBonus minAngle: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 4911d514a4..02fdf9bc72 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -77,6 +77,27 @@ types: Heat: 17 +- type: entity + parent: LaserHitscanBase + id: XenoborgLaser + name: blue amplified laser ray + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 17 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_xenoborg + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_xenoborg + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_xenoborg + - type: entity parent: LaserHitscanBase id: RedHeavyLaser @@ -121,6 +142,27 @@ - type: HitscanIgnite igniteChance: 0.75 +- type: entity + parent: LaserHitscanBase + id: XenoborgHeavyLaser + name: blue high-energy laser ray + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 25 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_xenoborg_heavy + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_xenoborg_heavy + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_xenoborg_heavy + - type: entity parent: LaserHitscanBase id: RedLaserPractice diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..7432ea9ff4c4b893ba405888a022dcb87db94cd9 GIT binary patch literal 418 zcmV;T0bTxyP)Px$TuDShR9J=Wlub(lK^(?^()zLpChH|a3E9jv3`7^9L+3tOU!^`qcrXZ09=a$B zN!B4Jkv89g?I5nMtFD4jhxuKeVg7&Sd1i(gkVqsFiR6#*?b56rX06MsYXEAMGRMi& zjs2ZggIWJNl-Zz=H!QCJt)@vlld}VKUY@)n+x@FJOI=J)ppZALQpvCjLI^ZXbLsuv zgJVavN_nHb*Y4w)97-W?SgDkb5Mmyn`?*p9KHfU^*y{=wd)J{X8vt~LpwYf1mQ8Se zazMR)13tHxQ4XG|&W-uHu{;@F4KH+f0p?-gm$z+5O?;D@G zUDT6l&u6&I*Y^;BKp@C?JaVXM_C3wn<|ERyqn(2RTbWBF63M^d7az}$zha;P`v3p{ M07*qoM6N<$g5mhNxc~qF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5e7a417ffd850570fa408ddf53c90f21ea1b672c GIT binary patch literal 423 zcmV;Y0a*TtP)Px$VM#l*-Sl`_Z4 z(~bVN(O~9ZhkrK6=ZcnB0HbM=$Xwb1`u%(2S&hzXYo%h`+Wu9Xr7or?kk1vZQmJSc zgb=8z>e8pjXUC3emGZ{GUb|0ZF7fAcMJtuk5kkxZbiP(9z~_709(!HEqIVtsS$L8E$mgafK5w2A^ df#E?X_ol1tO#59w+5-(@@O1TaS?83{1OOfnDT)99 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..64ef3efd488634d0876c029b9102a5f9631c0f67 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY;~ z2@P}9f0OAc)I$ztaD0e0sy5QCR_jj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..de5f40c90ad9623249ed2678fac60a9f92d9e651 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY;~ z2@nb$`Ws|LUpz_5c6>C%cwR1xj(01o;Is0Qn$r^;C!vQ0%Lxi(^PeD5`TyTS;Hj@nwv56_g%c$QC&ccWut;B5(1}CwKjYrxcRrQA{8Z@dqH}uF zn(W^ackd=2S6=o1220D5AvSPo%U9FRsPmndC_vRCv;Qt!(#hv@>TDb zyKiF(4$OG<;`R&$t>ahZVt)Cm)I6(QmHXrTpC7xg9{;;D`O)TDpu<`OK1J18PfzUL zu;ZJ(-|KCvzj&VNUKW49{Kh-6*S(LQ#IJ2On(*pA+w!lcfbO$-EWGX_TVg%i&3I6N NdAjwvr&fU&*UrQmRmz)`rrPVT>OdjV+p@4vH>ee#Li*@#G)&$I=W82bNu#_V$}k;qAWr qQ=Y%Ak^i4i19Z?2-mg3dUNhd`%-&cqul5AcbOujXKbLh*2~7ar%}ee8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png new file mode 100644 index 0000000000000000000000000000000000000000..57175d7eb3542654b43b0e0d4d4fc03ae48604a3 GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?sl51o(uw0%-=$ zNG{%Gio7>nb$`Ws|LUpz_5c6>C%cwR1xj(01o;Is0Qn$r^;C!v&<+g-H^aS3 zk;|vBxI1Fbo@-VaE0iz$6b9d&yZlFA*uz;Z{33t44E#l6p8S)IdGdO@2T-$s(;XH| zYh!D}Y>Uq5;%e{2UDnHXL~BOqDZe~cxAv-J{`+e;bpCC&W^-_7jPy8Q{JCe^^|XZE z%x^nxroErcwzoWGrt6=r4T2e(9Mb&qkFD$F_lG#j9CNx*#Cm#iBIm-%O?oM3y~{SR zTw9aF9zEwI-?1Z4bbmEWUgZR`{E_0nThkZ*_OyA(c(VXb)p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c7f236356146641cf6b59faaed1223619f8308 GIT binary patch literal 496 zcmVPx#5>QN3MF0Q*Ar09@E&5+e`iy=0|Ns9od!Ob2000JbQchC<|NsC0|9W}g{r~_0 zdPzhn3PFwTCZ!+jyy)1i^n`;YAH9E!df@TFccZ z89Omk^J27JzP zD`E2*lnT=|dW-E_j~Dh_VjlO3NauLd8g)p2ru3jVgiR{gHqcudeW@w*4# mc#7Qjf%{JOe-{No;KdL70SnSUP;IRM0000Px#7*I@9MF0Q*00~(N4W=Ot*+nh-UrYLoeft0Z|Kz%)l>h($2y{|TQvm<}|NsC0 z|JBM=G5`Ppdr3q=RA_6KLr0IDA*v{WqJx(B4ZB?!7b^@qi zT?|wA90Wcp%7<<_2+fgh3|(`8brMFeCShGg`+7oD(cIZn!IY%GsN(g|?f-)$Ns=T< zl0U++Df)mHzDeJTE2ykpcf7k-+`g`JzxONm42i2n^ok=N1F@iAEyhJ>4t(_eShrpJ vG;kfAAJg^dzP-#@27c-wzZW1$l0?1$5)B90u9vAn00000NkvXXu0mjfR)XgZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..8d2948a90a82c2e4beb8064b3c78defba1436a66 GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?skQ1^9%x0%=9w zo36UQ;=Owvr&fUKn z;Em+J|I@=Y^2((*%wDy${pz0RR1P)9%v-ZMPAtFq?D_6+?H$c=zV7aECdCs@h#R=C zf5lLpZg=~l^~1^ct=#XP%j;MF%`i{)^ZTzS_u8>dVA+tdU}1V6yFs1rYj@_2bz%Px z@olSbuJE_^zo?pjubI2-eu|)=;KXd1%x&53b;{iZWk)vKNcCodHQt>22fyWCcq9^9 w&v4J$)iB|;tpLz$!AjSe^ITn??El61+>-s-OkUn8Kz}oMy85}Sb4q9e01>8^Qvd(} literal 0 HcmV?d00001