From 86b24ccb4f3107abba2fb3426f692a0a8e2327a3 Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Wed, 25 Feb 2026 11:25:53 +0800 Subject: [PATCH 1/8] Lasgun Addition (WIP!) --- .../Objects/Ammunition/energycell.yml | 68 +++++++++++++++ .../Entities/Objects/Weapons/energy.yml | 82 ++++++++++++++++++ .../Weapons/Guns/lasgun_generic.rsi/base.png | Bin 0 -> 318 bytes .../lasgun_generic.rsi/equipped-BACKPACK.png | Bin 0 -> 1200 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1200 bytes .../Weapons/Guns/lasgun_generic.rsi/icon.png | Bin 0 -> 362 bytes .../Guns/lasgun_generic.rsi/inhand-left.png | Bin 0 -> 326 bytes .../Guns/lasgun_generic.rsi/inhand-right.png | Bin 0 -> 330 bytes .../lasgun_generic.rsi/mag-unshaded-0.png | Bin 0 -> 318 bytes .../lasgun_generic.rsi/mag-unshaded-1.png | Bin 0 -> 175 bytes .../lasgun_generic.rsi/mag-unshaded-2.png | Bin 0 -> 175 bytes .../lasgun_generic.rsi/mag-unshaded-3.png | Bin 0 -> 176 bytes .../lasgun_generic.rsi/mag-unshaded-4.png | Bin 0 -> 172 bytes .../Weapons/Guns/lasgun_generic.rsi/meta.json | 56 ++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 807 bytes .../wielded-inhand-right.png | Bin 0 -> 803 bytes 16 files changed, 206 insertions(+) create mode 100644 Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml create mode 100644 Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/base.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/icon.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/inhand-left.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/inhand-right.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/meta.json create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml new file mode 100644 index 00000000000..33899d25f95 --- /dev/null +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml @@ -0,0 +1,68 @@ +#The "projectile" used for the hullrot lasguns. Original is RedLaser. +- type: hitscan + id: HullrotRedLaser + damage: + types: + Heat: 20 #original was 14 also HEAT DAMAGE IS FUCKED AGAINST ARMOR WHAT + Blunt: 25 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_laser + +#Energy Cells +- type: entity + name: Lasgun Power Cell + id: lasgunpowercell + parent: BaseItem + components: + - type: Item + storedRotation: -90 + - type: Battery + maxCharge: 1080 #same size as a regular high-capacity cell + startingCharge: 1080 + - type: PowerCell + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: Objects/Power/power_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: medium + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - PowerCell + - EnergygunCell + - type: Appearance + - type: MachinePart + part: PowerCell + rating: 2 + - type: PowerCellVisuals + - type: Riggable + - type: HitscanBatteryAmmoProvider + proto: HullrotRedLaser + fireCost: 27 #should give atleast 40 shots, not too many that it's OP, but high enough that it's got viability as a gun. + diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml new file mode 100644 index 00000000000..5601625e60c --- /dev/null +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml @@ -0,0 +1,82 @@ +#Lasguns +- type: entity + name: Las gun + id: lasgun + parent: BaseItem + components: + - type: Sprite + sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Clothing + sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Item + size: Huge + shape: + - 0,0,4,1 + - type: AmmoCounter + - type: Gun + fireRate: 3 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: MagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: lasgunpowercell + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - PowerCell + - PowerCellSmall + - EnergygunCell + - type: Appearance + - type: StaticPrice + price: 500 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + - type: MeleeWeapon + attackRate: 2 + damage: + types: + Blunt: 9.0 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 180 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2.5 + - type: DamageOtherOnHit + staminaCost: 7 + zeroVisible: true + - type: Wieldable + - type: GunRequiresWield + # Shitmed Change + - type: Cautery + speed: 0.9 + - type: SurgeryTool + endSound: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/base.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..3d293e3392c9cb3adb87d6bef9982c1f9570be46 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_gM)*utgPDG+m)1*WMySDGc*57NSu<8(A3oIdG}~4Pz6^> zkY6yve<08S5gYCZ-Uo^<_H=O!shD$i!a=S>20U$#Ip*b>mv1vX^Vv*N?zYf38LPxc zzxOv}9zU|1qi*`L`hP9^S$|}oiMmjfb1qC|yLsC5*;h(DE&LAOaeCP!yUSYhaOaGL zn!m&JPdZ*H7e7!~C$&#<>AL4H8BYjtI&D)4Nr-*@qwA0t!x|fh#MJKOL+hKw=gTq} zhD~&qnyk9?a*NrjhHrD@SePeT*X&z&A;SLOf&5BFh6I`Hk`*=FK<6@ey85}Sb4q9e E04gVV7ytkO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/equipped-BACKPACK.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..e511f1379efa1667ffe6fc605f973e500c10d7d2 GIT binary patch literal 1200 zcmV;h1W)^kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Vu?iK~#8N?V7z$ z6hRn=M@vYI35FcXDY?W-4Iv?fV0R4_6^*S01r^3pEsfV1I|>T_0xBvB=_G`Pf)GRD z1DFqs?&9KN zH~gyfpcTz%55J1#dU(7PI^npqw50a-_SD?mT4RJ2sdwIsi{XyWLg`3kzy{d;41OMG2`^s}GNlj{}{2&Y$Zu|LhAlVxcEH(^(|yxw ztLLLPb4`Dt)9G9=J{s{PH*9?g#(0h=CnsuaYb$r-S?;E%r_Yx;95FI7qQ=L^&u4pn zv%bFWtR-~@i1ARA@!aUhT`3mga?xP0uIo#OwR%wkW^QyAyAa@0uMJJ>CKTL0Azrk38jMwhRwwAU(#Q0d;~He z`dwQ3z7H@VBGXKa@*i39^uCC`?K$6-%pIT$B{dnpJgFtg1b)kZ_^&K^q_`gSBx}8i z%*PEPB{~?uB$al2(ig_dc$dwMEXR8;4hWk8{ff=HzbKgx0TD>#vO@aG+W1^aGx5cd zWnUhT$K&yMJc;3!)TQ1&Xyko{@YIUat*~_XVP&PS=li@t8ydmY2~G~MRanc2t7az$ zB(1iT0awk5GJrk#-QC?s!AS{08yX?E449dj*$5O8&ZUO6fX>Xh$({0h(h@0Ez+VjlU0C@m;^bp zH_tKZ2#NfwiQ5;VkQZF@^z<}{yk4FceWF#gn=m?nBBXREMF}ZV04Yf15mQvD9OLDE zr06yE0*W|63aW8fhX5T>;fb468V~Ll7I|nNe+%A6GF=m`Xx4+38d*j-mSKP1w$kW2 zUGzFlf3uP? zeZQdDVQBws?>L O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Vu?iK~#8N?V7z$ z6hRn=M@vYI35FcXDY?W-4Iv?fV0R4_6^*S01r^3pEsfV1I|>T_0xBvB=_G`Pf)GRD z1DFqs?&9KN zH~gyfpcTz%55J1#dU(7PI^npqw50a-_SD?mT4RJ2sdwIsi{XyWLg`3kzy{d;41OMG2`^s}GNlj{}{2&Y$Zu|LhAlVxcEH(^(|yxw ztLLLPb4`Dt)9G9=J{s{PH*9?g#(0h=CnsuaYb$r-S?;E%r_Yx;95FI7qQ=L^&u4pn zv%bFWtR-~@i1ARA@!aUhT`3mga?xP0uIo#OwR%wkW^QyAyAa@0uMJJ>CKTL0Azrk38jMwhRwwAU(#Q0d;~He z`dwQ3z7H@VBGXKa@*i39^uCC`?K$6-%pIT$B{dnpJgFtg1b)kZ_^&K^q_`gSBx}8i z%*PEPB{~?uB$al2(ig_dc$dwMEXR8;4hWk8{ff=HzbKgx0TD>#vO@aG+W1^aGx5cd zWnUhT$K&yMJc;3!)TQ1&Xyko{@YIUat*~_XVP&PS=li@t8ydmY2~G~MRanc2t7az$ zB(1iT0awk5GJrk#-QC?s!AS{08yX?E449dj*$5O8&ZUO6fX>Xh$({0h(h@0Ez+VjlU0C@m;^bp zH_tKZ2#NfwiQ5;VkQZF@^z<}{yk4FceWF#gn=m?nBBXREMF}ZV04Yf15mQvD9OLDE zr06yE0*W|63aW8fhX5T>;fb468V~Ll7I|nNe+%A6GF=m`Xx4+38d*j-mSKP1w$kW2 zUGzFlf3uP? zeZQdDVQBws?>L O0000$y!-iwYRq`DJd=c-;{8bM^;ugGc(g`6T^QA ziBl31nwpviy+3~iYTz#k@(X784+T14x={UtI#6o2r;B4q#hkMfHgX*@5NPw)ketJ_ zgmrgW!S$mT4^%oAYHs0UUD#OQJb%IF?0Bbzdaf}wj_Y-sHaGw9Ex#XoXgjT` z)h046uPZY-`|8e(rPsJ6yZk?w{m%Iwdox`iD)-c%Hm6DlC6B{OliOI2DA_lz`rW>4 zwb-K_@82!xux*kKXLFelll^kh3>J2+RSZmri$nQC@&gM^^B5}RD~k>r&I^i4%ihD0 ss;2mI=2Yh`yU$-|6?(0H|A(#q?sk2FfZcc30lmTC>FVdQ&MBb@0HdaiZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/inhand-left.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e085e85862a56c682486de3edf0ea6a56eec65 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x0V6XFV_m6erUU0p*%L)+TgQd3idgM*j-Z%VkzlbM-$N2jfVqc^F)prNe30r z9#|kViD6L?Q^5|mhLdZVJPM~+KHPLDKyzOQ82Ki< zDuj4!V&a>=l)WLNZ>1m4jkO6{a~T&|H;WWTB(4y-dEmeSt5ELUybcGplxQ(CmtRnd z`NYE$b#cd2w}ToI-x{t6F$M44ptP#WN4dvkf<@n{8C+9>nI7bXnJe>DGOAsdEbvS3 zU|PmGVG{$7#WF3^wkZ=wJI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-0.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..3d293e3392c9cb3adb87d6bef9982c1f9570be46 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_gM)*utgPDG+m)1*WMySDGc*57NSu<8(A3oIdG}~4Pz6^> zkY6yve<08S5gYCZ-Uo^<_H=O!shD$i!a=S>20U$#Ip*b>mv1vX^Vv*N?zYf38LPxc zzxOv}9zU|1qi*`L`hP9^S$|}oiMmjfb1qC|yLsC5*;h(DE&LAOaeCP!yUSYhaOaGL zn!m&JPdZ*H7e7!~C$&#<>AL4H8BYjtI&D)4Nr-*@qwA0t!x|fh#MJKOL+hKw=gTq} zhD~&qnyk9?a*NrjhHrD@SePeT*X&z&A;SLOf&5BFh6I`Hk`*=FK<6@ey85}Sb4q9e E04gVV7ytkO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-1.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e021aae704b983704a9bbbcdda5ebcc1532b7a75 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ}colyH^DYZF7U@Am~j3HFj8zhH*{V6e1) z*>9kbf~SjPNX4Aw1c@gO9)X@5t_LD+To4U)xT(=IPfse4f#FIl6Vo)Giq}B344$rj JF6*2UngD`^GJ*gA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-2.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0a051aae142b103282d793a52f51c48d21ffcd6e GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ}colyH^DYZF7U@Am~j3HFj8zhH*{V6e1) z*>9kbf~SjPNX4Aw1c@gO9)X@5t_LDiE{KLY+|=lqrzaK2z`z{Iq%0fi)df_`;OXk; Jvd$@?2>?yCFdF~> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-3.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..fd7847d16f02ebe8537fd13452210a5931838b37 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ5LxS@yrlYZHT~XJ$B1g1scjFPPy!7%Z({ z_8Taq=;`7ZQZXkvLE?#nN1!K%>j9T5hAgfJB2-WI&eM|$WMD9CWpeFJmQ(;LX7F_N Kb6Mw<&;$TLHZT|f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-4.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..efa7d9ea526ecf4dfb36c45bae2c235a3d70972e GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_BW7wkmB}vq-;{8b$7>VAf!x&pKvA}mAirRS{~%CR`QRT= zMA6g5F{ENna)QJY2aiBc4%Y)NH!iZc9tc%EF?F7vR3HNb(`hD^ef~4jfr=SCUHx3v IIVCg!02`?>djJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/meta.json b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/meta.json new file mode 100644 index 00000000000..cae668a35ff --- /dev/null +++ b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "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/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/wielded-inhand-left.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..126915fd2703fa8c4f8116298de83399ff913d2c GIT binary patch literal 807 zcmV+?1K9kDP)RXssOp z%x1Ho&&#tXE`9n4tHmvR`|0i1B+qjP09RL6t@Hm0`t|^{B!D(B8jSz|%jFVfSwcz) z0H~@8&pv*^tK&0FZ!Wg%`|)R3YcZKjP!t8yGz9>xRx4Ch)wvk0wUbiTV=gZ*4^CiT zF&>6KoX_W5762COHO4@lgw^5}Q(Wv=-~>Vl6h%=d5CD#jj!+au=VGOlTVs5*)~+jg zgcHIg*4BRh9zp~Yuvo7#Rti~`p)5;eS%&eQ1%Nb7QJw?e@BDpht;Ol-DS*w%A$6pAq1|CY5lDSKUYe*sAvI5kD_JMxb`{vm!>VQRG2j&54u*R2a|P7EDEe?wh!kq?cf@&3F+GDvo)a($0EhG7_n zVHk#C7=~dOhG7_nVg4%7|KYc_sNQ^d?wT5b)#4V97cU0U2Q=e0bqN6QV|onWetLwc z0e)8|q#3BH3h%C8Z)pX-O-^uVvn0=RHyVxVSO9i(3BDd-xm?yd1R$=T7;KI<@q6qc z%>V#QZ??4pz$RIJnt;Bz^ZC4PagUYi)g#2{5PYI4qk(Y=Z-E)s@Bjg^JYwfelq*S{b%(7 le#}rZ7=~dOhGCceS>gx2)F%u{jp_Tf?}ytNx*bE4e~sXcv_P&`XehcMTRoKq*ye>+BlL zkR;GHa1$Y=?2gGD5XZ4~A9;E+({JAlKQ**YT0h0`&{NSX%k+e_eNGsLVHk#C7=~dO zhG7_nVHk$_=h^AMeJVaYKUo1lt5;y3_5CzW?XS_dhA$x;9pdx5AB_@!A6>6bZh0vT zLqt*Zpl9IvzJg31fh@~*uJgNvm=}}p6<@-~@fXmwHa`O3=Px+u>Og@5*m?&Z^9%sM z%ovOTTwY%G2)A7~NfKOKTr_+Mz|mg(2;O%_YrXXilw}Fv&d5+Nh^jVkfQPZ+FuRvS5e27lncd!pluLQWhfybzO z1(Z^Q?|zqGVLqP+#+ZOw()QKu^%bB;u|9d4ruJ`?% Date: Thu, 26 Feb 2026 03:43:37 +0800 Subject: [PATCH 2/8] the lasguns are ready --- .../Entities/Objects/Power/powercells.yml | 6 +- .../Objects/Ammunition/energycell.yml | 254 ++++++++++++++++-- .../Entities/Objects/Weapons/energy.yml | 95 ++++++- 3 files changed, 330 insertions(+), 25 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 9ce7cfe48d8..0f35c07fc53 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -32,9 +32,9 @@ - type: Appearance - type: PowerCellVisuals - type: Riggable - - type: HitscanBatteryAmmoProvider - proto: RedLaser - fireCost: 50 + - type: ProjectileBatteryAmmoProvider #HitscanBatteryAmmoProvider + proto: InfantryLasboltPistol #RedLaser + fireCost: 30 #original is 50 - type: entity name: potato battery diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml index 33899d25f95..aaeb0664033 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml @@ -1,19 +1,132 @@ -#The "projectile" used for the hullrot lasguns. Original is RedLaser. -- type: hitscan - id: HullrotRedLaser - damage: - types: - Heat: 20 #original was 14 also HEAT DAMAGE IS FUCKED AGAINST ARMOR WHAT - Blunt: 25 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: +#the projectile used for hullrot lasguns, i pray this one works +- type: entity + id: InfantryLasboltMedium + name: las bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Heat: 26 + Structural: 20 + harmorPenetration: 15 + stoppingPower: 1 + color: "#ff0101" + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Opaque # WWDP allow shooting through windows + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: PointLight + radius: 3 + color: "#ff0101" + energy: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi #_Crescent/Objects/Weapons/Projectiles/plasma.rsi + layers: + - state: beam #icon + color: "#ff0101" + rotation: 90 + - type: ProjectilePhasePrevent + +- type: entity + id: InfantryLasboltPistol + name: pistol las bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Heat: 15 + Structural: 20 + harmorPenetration: 15 + stoppingPower: 1 + color: "#07ff13" + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Opaque # WWDP allow shooting through windows + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: PointLight + radius: 3 + color: "#07ff13" + energy: 1 + - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser + layers: + - state: beam #icon + color: "#07ff13" + rotation: 90 + - type: ProjectilePhasePrevent + +- type: entity + name : hullrot disabler bolt + id: HullrotBulletDisabler + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Opaque # WWDP allow shooting through windows + - type: Ammo + - type: StaminaDamageOnCollide + damage: 20 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + #damage: + #types: + #Shock: 2 #removed this because it ceases to be non-lethal lmao + soundHit: + collection: WeakHit + forceSound: true + +###################### #Energy Cells - type: entity @@ -35,7 +148,8 @@ sprite: Objects/Power/power_cells.rsi layers: - map: [ "enum.PowerCellVisualLayers.Base" ] - state: medium + state: small + color: "#e5222c" - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded @@ -62,7 +176,111 @@ rating: 2 - type: PowerCellVisuals - type: Riggable - - type: HitscanBatteryAmmoProvider - proto: HullrotRedLaser + - type: ProjectileBatteryAmmoProvider + proto: InfantryLasboltMedium fireCost: 27 #should give atleast 40 shots, not too many that it's OP, but high enough that it's got viability as a gun. + #- type: HitscanBatteryAmmoProvider + #proto: HullrotRedLaser + #fireCost: 27 #should give atleast 40 shots, not too many that it's OP, but high enough that it's got viability as a gun. +- type: entity + name: Laspistol Power Cell + id: laspistolpowercell + parent: BaseItem + components: + - type: Item + storedRotation: -90 + - type: Battery + maxCharge: 1080 #same size as a regular high-capacity cell + startingCharge: 1080 + - type: PowerCell + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: Objects/Power/power_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: small + color: "#07ff13" + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - PowerCell + - EnergygunCell + - type: Appearance + - type: MachinePart + part: PowerCell + rating: 2 + - type: PowerCellVisuals + - type: Riggable + - type: ProjectileBatteryAmmoProvider + proto: InfantryLasboltPistol + fireCost: 13 #gives it 80 shots, more ammo, but it's weaker than a proper lasgun. + +- type: entity + name: Disabler Power Cell + id: lasgunpowercelldisabler + parent: BaseItem + components: + - type: Item + storedRotation: -90 + - type: Battery + maxCharge: 1080 #same size as a regular high-capacity cell + startingCharge: 1080 + - type: PowerCell + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: Objects/Power/power_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: small + color: "#22cee5" + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - PowerCell + - EnergygunCell + - type: Appearance + - type: MachinePart + part: PowerCell + rating: 2 + - type: PowerCellVisuals + - type: Riggable + - type: ProjectileBatteryAmmoProvider + proto: HullrotBulletDisabler + fireCost: 27 #should give the battery 40 shots diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml index 5601625e60c..fb609ddbc28 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml @@ -1,4 +1,6 @@ #Lasguns + +#Lasrifle - type: entity name: Las gun id: lasgun @@ -28,12 +30,97 @@ - 0,0,4,1 - type: AmmoCounter - type: Gun - fireRate: 3 + projectileSpeed: 35 #it go pew pew + fireRate: 5 selectedMode: FullAuto availableModes: - FullAuto soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: MagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: lasgunpowercell + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - PowerCell + - PowerCellSmall + - EnergygunCell + - type: Appearance + - type: StaticPrice + price: 500 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + - type: MeleeWeapon + attackRate: 2 + damage: + types: + Blunt: 9.0 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 90 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + - type: DamageOtherOnHit + staminaCost: 10 + zeroVisible: true + - type: Wieldable + - type: GunRequiresWield + # Shitmed Change + - type: Cautery + speed: 0.9 + - type: SurgeryTool + endSound: path: /Audio/Weapons/Guns/Gunshots/laser.ogg + +#Laspistol +- type: entity + name: Las pistol + id: laspistol + parent: BaseItem + components: + - type: Sprite + sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Clothing + sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Item + size: Huge + shape: + - 0,0,4,1 + - type: AmmoCounter + - type: Gun + projectileSpeed: 35 #it go pew pew + fireRate: 5 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: MagazineAmmoProvider - type: ItemSlots slots: @@ -62,15 +149,15 @@ swapKeys: true disableHeavy: true animation: WeaponArcThrust - wideAnimationRotation: 180 + wideAnimationRotation: 90 soundHit: collection: MetalThud - type: IncreaseDamageOnWield damage: types: - Blunt: 2.5 + Blunt: 10 - type: DamageOtherOnHit - staminaCost: 7 + staminaCost: 10 zeroVisible: true - type: Wieldable - type: GunRequiresWield From 68ff939551d518371b406a390e9f32d318d5d9dd Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 04:43:11 +0800 Subject: [PATCH 3/8] lasguns baseline done --- .../Weapons/Guns/Battery/battery_guns.yml | 4 +- .../Objects/Ammunition/energycell.yml | 27 ++++--- .../Entities/Objects/Weapons/energy.yml | 38 ++++----- .../lasgun_generic.rsi/mag-unshaded-0.png | Bin 318 -> 83 bytes .../Guns/lasgun_generic_pistol.rsi/base.png | Bin 0 -> 497 bytes .../Guns/lasgun_generic_pistol.rsi/icon.png | Bin 0 -> 493 bytes .../inhand-left-0.png | Bin 0 -> 490 bytes .../inhand-left-1.png | Bin 0 -> 509 bytes .../inhand-left-2.png | Bin 0 -> 519 bytes .../inhand-left-3.png | Bin 0 -> 521 bytes .../lasgun_generic_pistol.rsi/inhand-left.png | Bin 0 -> 510 bytes .../inhand-right-0.png | Bin 0 -> 502 bytes .../inhand-right-1.png | Bin 0 -> 524 bytes .../inhand-right-2.png | Bin 0 -> 535 bytes .../inhand-right-3.png | Bin 0 -> 542 bytes .../inhand-right.png | Bin 0 -> 523 bytes .../mag-unshaded-0.png | Bin 0 -> 140 bytes .../mag-unshaded-1.png | Bin 0 -> 153 bytes .../mag-unshaded-2.png | Bin 0 -> 155 bytes .../mag-unshaded-3.png | Bin 0 -> 157 bytes .../mag-unshaded-4.png | Bin 0 -> 157 bytes .../Guns/lasgun_generic_pistol.rsi/meta.json | 72 ++++++++++++++++++ 22 files changed, 110 insertions(+), 31 deletions(-) create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/base.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/icon.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-0.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-1.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-2.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-3.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-0.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-1.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-2.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-3.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/meta.json 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 4042dedfe26..8a84a48f1bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -270,10 +270,10 @@ - type: Appearance - type: entity - name: SHI 90c Kamakawi laser carbine + name: Jury Rigged SHI 90c 'Taiyo' Laser Rifle parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponLaserCarbine - description: Favoured by Nanotrasen Security for being cheap and easy to use. + description: A Taiyo laser rifle that has been jury rigged to run on an internal battery. It seems like someone welded the battery into the rifle, voiding the warranty. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml index aaeb0664033..57c29627e34 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml @@ -119,9 +119,9 @@ damage: 20 - type: Projectile impactEffect: BulletImpactEffectDisabler - #damage: - #types: - #Shock: 2 #removed this because it ceases to be non-lethal lmao + damage: + types: + Shock: 1 #can't remove this because it just makes it deal blunt... which is fucked soundHit: collection: WeakHit forceSound: true @@ -129,9 +129,12 @@ ###################### #Energy Cells + +#Lasrifle Energy Cell - type: entity - name: Lasgun Power Cell - id: lasgunpowercell + name: SHI 90c Las-rifle Power Cell + id: lasgunriflepowercell + description: The SHI 90c Las-rifle Power Cell is the most ubiquitous weapons-grade power cell in the taypan market today. Able to be used as a regular power cell, in times of need. parent: BaseItem components: - type: Item @@ -183,9 +186,11 @@ #proto: HullrotRedLaser #fireCost: 27 #should give atleast 40 shots, not too many that it's OP, but high enough that it's got viability as a gun. +#Laspistol Energy Cell - type: entity - name: Laspistol Power Cell - id: laspistolpowercell + name: SHI 60c Las-pistol Power Cell + id: lasgunpistolpowercell + description: The SHI 60c Las-pistol Power Cell is the most ubiquitous weapons-grade power cell in the taypan market today. Able to be used as a regular power cell, in times of need. parent: BaseItem components: - type: Item @@ -223,7 +228,7 @@ - type: Tag tags: - PowerCell - - EnergygunCell + - PistolEnergygunCell - type: Appearance - type: MachinePart part: PowerCell @@ -234,9 +239,11 @@ proto: InfantryLasboltPistol fireCost: 13 #gives it 80 shots, more ammo, but it's weaker than a proper lasgun. +#Disabler Energy Cell - type: entity - name: Disabler Power Cell + name: SHI 30c "Yamete" Disabler Power Cell id: lasgunpowercelldisabler + description: The SHI 30c "Yamete" Disabler Power Cell is a power cell tuned to non-lethal frequencies, for capturing your targets alive. Wish your foes a SHInotastic! ending with this power cell. parent: BaseItem components: - type: Item @@ -274,7 +281,7 @@ - type: Tag tags: - PowerCell - - EnergygunCell + - DisablerEnergyCell - type: Appearance - type: MachinePart part: PowerCell diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml index fb609ddbc28..bf8b362d0ff 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml @@ -2,8 +2,9 @@ #Lasrifle - type: entity - name: Las gun - id: lasgun + name: SHI 90c 'Taiyo' Laser Rifle + id: SHIlasgunrifle + description: SHI 90c 'Taiyo' Laser Rifle is Shinohara's most generic, reliable, and best selling energy rifle on the market. Able to slot in any power cell to use as it's ammunition. parent: BaseItem components: - type: Sprite @@ -42,7 +43,7 @@ slots: gun_magazine: name: Magazine - startingItem: lasgunpowercell + startingItem: lasgunriflepowercell insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: @@ -86,12 +87,13 @@ #Laspistol - type: entity - name: Las pistol - id: laspistol + name: SHI 60c 'Hoshi' Laser Pistol + id: SHIlasgunpistol + description: SHI 60c 'Hoshi' Laser Pistol is Shinohara's most generic, reliable, and best selling energy pistol on the market. Able to slot in any power cell to use as it's ammunition. Unable to use Las-rifle power cells. parent: BaseItem components: - type: Sprite - sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -103,19 +105,20 @@ steps: 5 zeroVisible: true - type: Clothing - sprite: _Crescent/Objects/Weapons/Guns/lasgun_generic.rsi + sprite: Objects/Weapons/Guns/Battery/taser.rsi quickEquip: false slots: - - Back - suitStorage + - Belt - type: Item - size: Huge + size: Small shape: - - 0,0,4,1 + - 0,0,1,0 + - 0,1,0,1 - type: AmmoCounter - type: Gun projectileSpeed: 35 #it go pew pew - fireRate: 5 + fireRate: 3 #slower then the regular las rifle selectedMode: FullAuto availableModes: - FullAuto @@ -126,13 +129,16 @@ slots: gun_magazine: name: Magazine - startingItem: lasgunpowercell + startingItem: lasgunpistolpowercell insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: tags: - PowerCell - PowerCellSmall + - PistolEnergygunCell + blacklist: + tags: - EnergygunCell - type: Appearance - type: StaticPrice @@ -149,18 +155,12 @@ swapKeys: true disableHeavy: true animation: WeaponArcThrust - wideAnimationRotation: 90 + wideAnimationRotation: 180 soundHit: collection: MetalThud - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 10 - type: DamageOtherOnHit staminaCost: 10 zeroVisible: true - - type: Wieldable - - type: GunRequiresWield # Shitmed Change - type: Cautery speed: 0.9 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-0.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic.rsi/mag-unshaded-0.png index 3d293e3392c9cb3adb87d6bef9982c1f9570be46..016d8ba5a76c0112a48860254da8e5f54a1767d7 100644 GIT binary patch delta 65 zcmdnT6g)w~nuCpjfuXpn>I;yP@^otpuoWB&bXih P$YJnw^>bP0l+XkKGw~4k delta 302 zcmWIE$238ro`so#fuS)Z{Wy?fEDmyaV!U}$ryj`REbxddW?q zA+A6=I5^nK%BsD+T}eqvR#rAMGxNWM#3>00O-;?7caNq5RdAIA`2{ol2Lc@svEh#3 zeW2)KPZ!6KiaBQ|9OOD=z|;1aqkdkldHFWOGoQ^QPx$t4TybR9J=Wl+RAWKoG`1)JTYi@J9?9g>d7dLVN|_%E=fXM7`=!eIOI)J4o!s zgOo#iFf@j?DQLXZi_`43yK7D0WPg|4oz8wU)0q}XNl8ih?_^XDudglx_I!8$p!8SW zmFWlt>GJdF3CFE=XxD~=aKBrrU~1damFRSPoHl7v5^JL1jd~4@dJO z%zz3C&I(boQKB|YpTr6lCLpWcvV9Q@0L+^pt<=%)iLziJllEBFbNXsDKjurhYg nMAZjDJjYCCWiKfuWwm?*RmAiwgn0V*00000NkvXXu0mjf@}%84 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/icon.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a85afab71278ecb6028711663b6733d3d71ae747 GIT binary patch literal 493 zcmVPx$r%6OXR9J=Wl+8-RKoH0OTCo(R^aG)a+VoZsYm2YY)+Z>%yZ8p`GpKJMzC=&b zG(Lkx5j-`G<{(|9Ap``W#EToU*$;DQK`_6|Zf0lxGn1VJNJvOX`0p&K4lmBn{P6ST z)wR-J6)V#b3ew=m;R9;*MqoDvIsoAIW)E6V+ujDa3hJs||9^~x16wo=g0SFV(3{DctndOdjo0FW;f zh5JtT7y!_}7e%pjx;3GF>bPjO+PKpV0FoIvY#jL1IiJf4MMU=B{HBfz02rC3dI$la zxxeKDfK5E^Y;Ci`4ObkDfsU!;#xJ10lf&@M;m$^0nt5LR{J{3cI%Bhm$JlJ*;VV;Q zk^_<%P(hQ2g=n!+qBi5nH9*{|M{-SG&+C)Bp;0lz<0q!+cOIhh3FU-rk zE4*&Ts7g)+Lv)aJ;JUrMZqIou<+%xpe-}j zUb*^sfoJmC%t`mI*w^gWZ7JSqd1v<18U{fKn3&d=+u5;Xm7t)-wyEnh7VotYTN~cR z#PIv7@(izqceA({lrw90Ulj>nX|wH{s~+!+GtXEV9)&2*oyW~!Fm=+y6Sr@)Oingm zBiXmdX4`j9#eUbjZf~#VUU~BLCF8vX{0uL?#PoP~*j{^lX;Y%(-Q!h4bF}VmF;}>; zqWph`Pg-&EEB!y+Kn>=H$7|=fBE$ z=dy83d}YPA+BpPmyb5)H_Vs-eo}k7*;b>Ny zf>Ekig5^AauWIH=&loq|n4(x9z4c1+mph*r3o9FRCZ%vNJP3cvQF8vz|J*i()q0!R eU0htYw3_S1?UR^(&_4kfc?_PeelF{r5}E*#M%W?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-1.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-1.png new file mode 100644 index 0000000000000000000000000000000000000000..9d2a4d004e61e16a7a01776b8b3fcea5506ae8ee GIT binary patch literal 509 zcmVPx$w@E}nRCt{2+P!MRP#6Z_SLxQ`c7jSlySYe=aaSZ1dJFa*yqIoXx|LFT0fK}= zXDL#;xOI_MDqX~m_UoWY{i~XIVt;s_EyH&>zgfN)AR;0nA|fIp(#*C@5s^SOA_Cho zgB69e7sa5tWI_O7KXn8{DU^x@0TA1?zEmuTp;Q!8TM)?xbb5n00I^e$a@7F<7)nW_ z>8{;`lViuPX*As^rZ*!V#h^|;{o&-(^8WG!_woz?P_8;?w`wb|b-Pvb7w^?g#uM*W z>85=HyotJx&#_K#5bO4b{$jG3(YJ5gwoJ)pMgYc(@Aikfr?!;#C(!8)VgO|Rd%OvC z80rnSWy*c~!G8|6Ws0E`&Mz!~@sm0LSor?4Y|E5YH(*zP{++5s^rIyrA|fIpA|fIp zA|m>6Ve$ZB=*kdiZ;npo0V3sP2)1phX>VHv%>#rnoguinzQUx@I@6Thl=d4CBo7eA ze1>4E%PhcGdwx^eH(=8|Kp5*X1WrCJLEGq&T+v)IA&2S!&S@QYw=Q1${pphm#mf+s ztIpC4fp_x1Do3EZ=l^dr1YuQ}Js=_?qAh#^f40eGBP}-6g>m~I#PSf#&*cZ7f!@IjmvP3^JaS5@cPgK&o8{^V_ zaOsN(d-mD0uFW@lY5DJ?U3A;~f}(%Z-m`Wnhz&AW=n zv(9zqCshewQe*q-wKIMFl*!9?Xa9I>#qeOkRLAc%?@uS+wY@*NIgE|rSn1-ADmJ0J zGUFQx7X7=LyXw09lDsB&pjs(k_SQciF7JM8wN2!cv&k&JKV`D!2N%CvS?lpz^u_rc`11k)iH)MGGR^QgjlT+x-XnXMEg}`FB*Dk?jaku;(=GZt0 zU6yR}m>$`%{o9{CTl5d?sccY5OXb)TmdKI;Vst E0FA5YbpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-3.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-left-3.png new file mode 100644 index 0000000000000000000000000000000000000000..57142eecd98275d5b0f3f919ffbd7fed482fadaa GIT binary patch literal 521 zcmV+k0`~ohP)Px$!%0LzRCt{2+CNLfKo|z_C*r2KCA39I+ytrVnL1Y_pQ3&TKTJ18+^UElK$Ivr z7b)V>%|)~rTuL3|>tLg;f0Oj$Kc3%~;f~AQd$+s~Ktx1DL_|bHq?xB&5s_45LX%Coez_#~HixHdZ7o^ciS5i}dv*j8}t=)=41DOVgj!p62j&}`r;?CW0I zyR=_{PPbPx$xJg7oRCt{2+CNXiKo|z_2jix3E5XJ@-B_Ah%8nuT9Zc{$@HslOv9R$WNE#Do zVjAPZ=0cP}3<<#zUk9n-pF+zW{>k&(I^5;@-t{`X4?sjjL_|bHM5LMTxgsKo#)t@f z&rLQcrF|2V=5t2^00+nC$XXVPg$n_Y*>rrda3NXCGO@HJdnP9B^hSG~-Y5eArLscU z$|Gu5HrmmsU6HVrN2#n#ENzLA0w~9RQ;sdK&yNV3HPjm(&Q2$5ix9Oda&|gFz2PBj z)@J9E_*Chpy#Vn-!-uC#r#H%U2jjUSeD!Vno;&yQ-N9J*(pJ)b2TYH?EIxniXcbxO z1-|FXU3C9>C-|N#S<9Mx`S=q8u=Mn}^>;K+m19c~1TySjiHRaa?TQTh zR}ut)D92u!KWUCY`w7@I50J*X41scNN!ms?a%}RsBRR1Sp{}dAy$R7D3^1DqNF&Y= zl*(#lh9KVgUzH=!-Shvq8G^JfnLQvPBBCw41LarSgduL+5dZ)H07*qoM6N<$f}iW- ANB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-0.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-0.png new file mode 100644 index 0000000000000000000000000000000000000000..5b51ce474146fea341efcdeef1b4a7f65a94242d GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zH+Z@@hE&XX zd+VSVQ=kajga2;bVu~#>f-f2GoUn-d?#bhL{(|)vgMH2}Ul<&D9Jh!~G<$c)#dGuI zsB4*u3?*W@toovapKR}JD`A}gTqJSg#Y!2O`Obvk@rr0Tf~2R?Xr+9 zZJf-NwNi`>ZI3%Y1uu#hU3)Rll=Z-&U&hQ9c3n>%7%(x!#Lc;VZ2O+DmlNMEU9>eO z_V`T2Gp1$R+qeAuv8Ma_a=}GzzKh)6=E@%36|jDqO4gN2#`5z^8GYCbx3{0kSCnnw zWHwBlYWHQro&<||D}MY7yea-$?_PWR6IIzJ&DCe_E^EmAEV{O^K;o=v{{E2l)1K(x zWt{(dZMgTQ_2q(d=REqRcC2{Pg6r~Uz9%1YFnjteepx`jY{Kz;%hwkpKl!`6AVA2B zyZh_6HkTg^PfL8dwo~`myZgqw&5q}!9o!nqzTxU?{wbWyCvWfHZ7@4>$F9D)`*sI> zNKAA6$H%bupTpC)_xHap2C8&omgrN@GOJ;D^8Wt*tSF{A(k5$TH_E)A`aR!ez^Ue~fYeck1kZk5zKn2g>0D)Om z|NmX(yVtVDh+8|~x5TjO|GXPpC6^g7LVDvJ0 My85}Sb4q9e0P}P0D*ylh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-2.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right-2.png new file mode 100644 index 0000000000000000000000000000000000000000..ea72601137b0998636266dbfcfb5f1057c094abf GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFM7H-hE&XX zduy*3v!e*>gUv~aie`z^1Xy%0x0J^GW{G5pcf7C2Klz;6)W9R`0x5!PoFkfit)wp| zY~b{iT;JN4bLYs0G_!wm*L!z8ymvY!=nk`hAOtW92>!S=`Te@XZ1L4fMti3|^^AX) zli#^oq~`6(4-dr{F1-9UH^=MDwACVI+qSbDIPy!F`Nnx_> za>ovywe#j`{Sb(rXwU4Ron^iG+xySIW<+k#y~<#9cb_o7Jj3Si??2C&0u=c=)pWbU zJaLU@*HdEGDp{;~^h@hV^7{75`z(_qHQuuc8*|%FdfRhw{Ry3re;$1eKnMMsFFs4@ WrZd|y19xCdGkCiCxvXPx$*hxe|RCt{2+P_M}P!tC6FQtQnxTTaLw4)$3UZZnM$t#Fh-@%9JrbxFc;u8o_ za4r(WrJIY`VsR-t#^a#3RFf)cZ|cAAx3xn!=Wuf~d-(80Z zu5v_Vd@I?wKiAh*C1=}kl_O8x8vsD3H?YzvFryI)006($z*F}IUb!G%xe(5xSQD1=3*wav z!!z%<8UTP&F+|X=N8W|u09@rrsTg9fso=L7xa~ip(;Ha+^_`_3JcIg;yX`;1Z#A&j zR45h0$laC&UYpO^cBJ{yhy0d1;H^&i`1|!F>>_7Bz*UZ123POntJQIAz% zF5PlwqdMkGM?^$KL_|bHL_|bHl$g%nKg-}vNNZN353_!g5)EJ^B7X*e%izlTDu18W$DIY!5)Gi!8(5>u2f)|) z`!wQq7EDY0-s)2@x-YPlUywz69^TF_F3x@2_xqUkPS86Gm6{j3v+yIC-ZA(UI}6o6 gvPVEfL`4733xEyTuTJfv>i_@%07*qoM6N<$f(6g}*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b23c4f39e3e914206637131f92f28aca5fcf956e GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zk9xW|hE&XX zduwCXp#TxK2luZnbT0H3(7bWcHK}K}QYE`$ZM&U&nz^{Syc0+3xge*PkDe*5)mW-v zb?Rk8@GOb!wdPT8|L3ytJeOH_{ox-5K`3AlY)q9ZdSMl^!N=L<+V)9()e)N0U9Ou% zEK~eEosnUI{j6n^Gz}wnEn66*$Jub>*ZD>Kf95I2ZEwiB%eEnBkNvE9>d|RMt4gKg zwlnO1enhVM0s~O~`cKxVT;aIooj*@Alo_g*8E(JfzjL>CigA*7@%*z@bJc*d*MGXc z5wK%VnCZ6S=fjk?e;Knr&6^i|u>1Svrl`Xwbxc}b+?~cY?do>Szc;m+zr7#YktW8cmgkx$Ui@g+x;?$pla2@g zy^;U8ZO1z4TfbLty2|;Yf7!|m!P(#5@9sDa)cf_lnFVY7XQtL1w{=^*ZTUH|ArY-_ z&ln0e7%(_rbPzm{xM1sn1~wZ70sf2^4Xt4w{Az9MA|w7q|C{2$&@i9(+>3L^Cnp83 zbd10LcFR7u^eIV~_q>UXoouXSs`2s_$mZ+Z^;V)iG6EA;067evu6{1-oD!M<8e264 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-3.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..f34af9bae07645fefed6861c96082d1f5018f342 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY;~ z2@3?R8k3a` wtupL36(`OtIIuxj+m_4ipa$FoE)Q0Qr9v|2f}c2801boFyt=akR{01NaoQvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-4.png b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..046c1328b3b3f510c881463bcea16090470561e6 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY;~ z2@DP$C(aW<2pR1MAQIJWNjSDl(H8 xxh?rBK1`VD*qEpuR|VF|<#td5Y>WUm!-QKZ0#-eB7lBqVc)I$ztaD0e0s!B)F_r)T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/meta.json b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/meta.json new file mode 100644 index 00000000000..8e2e71fb882 --- /dev/null +++ b/Resources/Textures/_Crescent/Objects/Weapons/Guns/lasgun_generic_pistol.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CEV Eris at commit https://github.com/discordia-space/CEV-Eris/commit/d75bd7c51620423bacf0b8accc8d29ffbfc387d8, edited by Emisse for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left-0", + "directions": 4 + }, + { + "name": "inhand-right-0", + "directions": 4 + }, + { + "name": "inhand-left-1", + "directions": 4 + }, + { + "name": "inhand-right-1", + "directions": 4 + }, + { + "name": "inhand-left-2", + "directions": 4 + }, + { + "name": "inhand-right-2", + "directions": 4 + }, + { + "name": "inhand-left-3", + "directions": 4 + }, + { + "name": "inhand-right-3", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 2ac6b0460e9faa47af90d859c1e04a966fdc1588 Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 05:47:46 +0800 Subject: [PATCH 4/8] damage nerfs --- .../Entities/Objects/Ammunition/energycell.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml index 57c29627e34..8c73dc937eb 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml @@ -8,9 +8,9 @@ - type: Projectile damage: types: - Heat: 26 + Heat: 15 Structural: 20 - harmorPenetration: 15 + #harmorPenetration: 15 stoppingPower: 1 color: "#ff0101" - type: Fixtures @@ -51,9 +51,9 @@ - type: Projectile damage: types: - Heat: 15 - Structural: 20 - harmorPenetration: 15 + Heat: 8 + Structural: 10 + #harmorPenetration: 15 stoppingPower: 1 color: "#07ff13" - type: Fixtures @@ -116,7 +116,7 @@ - Opaque # WWDP allow shooting through windows - type: Ammo - type: StaminaDamageOnCollide - damage: 20 + damage: 10 - type: Projectile impactEffect: BulletImpactEffectDisabler damage: From ccf7e2982f20356537542743a53dee0d5e17873c Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 08:01:27 +0800 Subject: [PATCH 5/8] linter fix?? --- .../_Crescent/Entities/Objects/Ammunition/energycell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml index 8c73dc937eb..e273df651a4 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/energycell.yml @@ -12,7 +12,7 @@ Structural: 20 #harmorPenetration: 15 stoppingPower: 1 - color: "#ff0101" + #color: "#ff0101" - type: Fixtures fixtures: projectile: @@ -55,7 +55,7 @@ Structural: 10 #harmorPenetration: 15 stoppingPower: 1 - color: "#07ff13" + #color: "#07ff13" - type: Fixtures fixtures: projectile: From 388b089865028d1780226e62f11c04df2af37773 Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 08:03:36 +0800 Subject: [PATCH 6/8] i hope linter fix? --- .../Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml index bf8b362d0ff..14efb57440c 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml @@ -51,6 +51,7 @@ - PowerCell - PowerCellSmall - EnergygunCell + - DisablerEnergyCell - type: Appearance - type: StaticPrice price: 500 @@ -137,6 +138,7 @@ - PowerCell - PowerCellSmall - PistolEnergygunCell + - DisablerEnergyCell blacklist: tags: - EnergygunCell From d660afaa778fa311a4262ee0606ad711a0234c87 Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 08:10:39 +0800 Subject: [PATCH 7/8] my linter fix --- .../Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml index 14efb57440c..758a8d05762 100644 --- a/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml +++ b/Resources/Prototypes/_Crescent/Entities/Objects/Weapons/energy.yml @@ -76,7 +76,6 @@ Blunt: 10 - type: DamageOtherOnHit staminaCost: 10 - zeroVisible: true - type: Wieldable - type: GunRequiresWield # Shitmed Change @@ -162,7 +161,6 @@ collection: MetalThud - type: DamageOtherOnHit staminaCost: 10 - zeroVisible: true # Shitmed Change - type: Cautery speed: 0.9 From 9cb6b8289c7ee71df32baf19d3b45a65f6d3706a Mon Sep 17 00:00:00 2001 From: Rubeebeebee Date: Thu, 26 Feb 2026 08:30:25 +0800 Subject: [PATCH 8/8] I AM A YAML WARRIOR!!! (added tags lmao) (should fix linter) --- Resources/Prototypes/_Crescent/tags.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/_Crescent/tags.yml b/Resources/Prototypes/_Crescent/tags.yml index cc8d80e967c..f6142c740fc 100644 --- a/Resources/Prototypes/_Crescent/tags.yml +++ b/Resources/Prototypes/_Crescent/tags.yml @@ -102,3 +102,13 @@ - type: Tag id: DualWield + +#lasgun stuff +- type: Tag + id: EnergygunCell + +- type: Tag + id: PistolEnergygunCell + +- type: Tag + id: DisablerEnergyCell