From a332245ff0ebf205924f802da4c26c592e8f1c74 Mon Sep 17 00:00:00 2001 From: Apersos-coll Date: Thu, 17 Sep 2026 00:41:01 -1000 Subject: [PATCH] EPU-U001 Integrity (Another CC Official gun) (#6507) * Added Commander Tex's Pistol of doom and despare * Downgraded damage/dps freedom made the description alot more light and it now referenced tex barely, so its basically not only his weapon but now just a CC official pistol that anyone can use and the description helps * Update battery_guns.yml Change numba 1 Signed-off-by: Apersos-coll * Update battery_guns.yml 2 slight change again, and some fixes to the whachamacallit Signed-off-by: Apersos-coll * Removed paralyzer bolt Signed-off-by: Apersos-coll * whoopsies, forgot to fix the copyright to be ME cause I made this, and freedom helped :) Signed-off-by: Apersos-coll * Fixed name on stuffs so it functions * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Apersos-coll Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../Weapons/Guns/Battery/battery_guns.yml | 55 ++++++++++++++++++ .../Weapons/Guns/Projectiles/hitscan.yml | 21 +++++++ .../Battery/pulsegun_integrity.rsi/base.png | Bin 0 -> 629 bytes .../Battery/pulsegun_integrity.rsi/icon.png | Bin 0 -> 614 bytes .../pulsegun_integrity.rsi/inhand-left.png | Bin 0 -> 548 bytes .../pulsegun_integrity.rsi/inhand-right.png | Bin 0 -> 563 bytes .../Battery/pulsegun_integrity.rsi/mag-0.png | Bin 0 -> 238 bytes .../Battery/pulsegun_integrity.rsi/mag-1.png | Bin 0 -> 224 bytes .../Battery/pulsegun_integrity.rsi/mag-2.png | Bin 0 -> 224 bytes .../Battery/pulsegun_integrity.rsi/mag-3.png | Bin 0 -> 224 bytes .../Battery/pulsegun_integrity.rsi/mag-4.png | Bin 0 -> 224 bytes .../pulsegun_integrity.rsi/mag-unshaded-0.png | Bin 0 -> 151 bytes .../pulsegun_integrity.rsi/mag-unshaded-1.png | Bin 0 -> 151 bytes .../pulsegun_integrity.rsi/mag-unshaded-2.png | Bin 0 -> 151 bytes .../pulsegun_integrity.rsi/mag-unshaded-3.png | Bin 0 -> 151 bytes .../pulsegun_integrity.rsi/mag-unshaded-4.png | Bin 0 -> 149 bytes .../Battery/pulsegun_integrity.rsi/meta.json | 55 ++++++++++++++++++ 17 files changed, 131 insertions(+) create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/base.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-0.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-1.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-2.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-3.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-4.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/meta.json diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1262434f5db..770c832ba37 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -751,3 +751,58 @@ - type: Tag tags: - UnstableCoreRefractor + +- type: entity + name: EPU-001 Integrity + parent: [BaseWeaponBatterySmall, BaseCentcommContraband] + id: WeaponPulseGunIntegrity + description: Hefty and unforgiving are both words you might describe this unit of a sidearm with. It's heavier than most laser pistols, but features better ergonomics than usual. It's a heavily modified Pulse-pattern pistol, using a technology kept confidential at the highest level. The sturdy metal frame is engraved in a few places, along the front cover it reads 'EPU-001', and the grip has a shiny NT logo made of pure brushed terran gold. The only thing you can tell, is that it's almost certainly a weapon for person of high status. Are you supposed to have this..? + suffix: Admeme + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + storedOffset: -2,-5 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: _DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi + - type: Gun + selectedMode: FullAuto + fireRate: 2.5 + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser3.ogg + - type: BatteryAmmoProvider + proto: CompactPulse + fireCost: 250 + - type: EnergyGun + fireModes: + - proto: CompactPulse + fireCost: 250 + name: lethal + - proto: BulletDisabler + fireCost: 150 + name: paralyze + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: BatterySelfRecharger + autoRechargeRate: 150 + - type: Tag + tags: + - Sidearm + - LaserWeapon + - ConcealCarry diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 9c9e2795023..d9b722a1eec 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -166,3 +166,24 @@ Radiation: 4 - type: HitscanTemperature heatChange: 11000 + +- type: entity + parent: BasicHitscan + id: CompactPulse + name: compact pulse + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 25 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..9365fb45db606a30277afd0add53cc20d584f5a0 GIT binary patch literal 629 zcmV-*0*d{KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t!h)K~z{r?UlQW z8c`I+j}|H-K~a1bF3Kt*DQtvD8aqjy!b*sLSFpFSu-IN$?5slY5hCM8B!aR-e4rAY z?00sqJI;=e!c;py7`}Us(lV z*zI;+uh(np_xl#)pwVblaXOv+nU>vdN8N7s)m{gQcs#C@N+lW$2K2PiUbU=NE2>tj zbJ{JYBs0@$)x@!(n=q|B%Q1j->uK&R6r$N|My*!sz|*SgS#IM&8jVJ5jv{Vi z?>S#66eyWY?lqs!QzQ~$wOXxg?DzY5R7RXEKzp2++uzM2JxJeaCjVlEfdFsAd_GsB zXJCr1m&+wz`tHHe5onJe=8`0_A)bk5v&rAfX0r-r3S*bcwb#jHLO!35I-L&ndcBil zzIX(B^IR^cpu2j#&M_3Ps5U-l4h(NV_o{LXqv3E!?RJ~*&tx(RPURAVa~wSZVJ;94 z(KXG%*%6?7{3u<^P>*2&qFa~?(D}8y2S+zbBoc=IUjOSPOiWDPDn$PPFcuExPa*@D P00000NkvXXu0mjfM2j1P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc036f9badde5481ae81739575fb505ab642afe GIT binary patch literal 614 zcmV-s0-61ZP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0sBcrK~z{r?UXxf z0znjoZv^py1O*Wvg+Ym8k;2Bp&dw@@jgo)kp9$Dnrn9lL3c*K+tcgepAxnIqqE0+F zPFOd)D#Sn_`@!YR%Z?>Q;mdtN`5P$V(Z AW&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b8d3c067d3504196d0687a5f686e3c2fb2c65382 GIT binary patch literal 548 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Ldzu978JN-rlm$VsaEY{xMy|rhy~Qakfd+ zjS9y6i6Kr_{F`HU$td@_O7SO5kJ_;Hf`ZQvJ!4LZ#n!KTSU&wekaX?m=6%m+JhK%R z1cQn7%OA#1mhN?XxA5ww=Z6nYJDs}r`H~xtCt3fW6|(<+`R%vY;%50OGcbL0p4$50 zrgHd)6O$UQW?g-7>;3ms29?MEu7>(C6+1KCR9>#bIm1V-uUmm*!R41Xj$b~oEPwjs z12WGxwQYUF`0a7ZRC7*Me}^9vx{ofhVLklt!mhh{k{5nIe(>geqv11y>85K^`R(Vp zeq#C1Xg<4lzp-}LqKmJ;?wfQWZ@a%*<97+}gPYs7*4?;a>~6H_FaL-7X-+~GmtuC` zJ=b6Jc&|a7j7`z}mf17TKkqwz|6f67j0*xh@z*?-T)yt#bfNP*zg3>}PQLzy&v# j;r|;tIy#mlf8$g;uDDp_-f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2be4c2667b5a71547df7a43d00d040f6b726945d GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4JSNZ978JN-rlm$Yc`NzEm+=pgi#=9ox^m! zloOM$n{{PV7XB1$~YEB$@hoRa^X zXteoN;Jlc@Up`35ByZg+uQ%U+OPbYI1sT*Ccb-_vKi^XOz_;L2@2|T*{Jn3NqeBRn0 zkXx_Wbh2X)Z=sBLPSyALUF|(C2vEYDp|ARS>z3-=?MeIm-&B!yG=rzBpUXO@geCxqee}Bk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-0.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..5b489e6a21a61ffb88d8bc43a3c14b9939989215 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V6&%-V@QPi+l#(j4GIFR4>CiW$^-6H&eXfr zc&D?xAb7&mND-GW?vCBx8_!s9KW}7V_`vPd@oz<)=H;mPsHC2g&%T9fGCZH-_5SjL zch_xluP=>ib+~rxJyQ>FvJS7CqTZcPh7aO6G*chWS^fNV?&)T)m6zAw;GA&$vX3s% cdIlRu6NXQ^+NH}R-JgN@p00i_>zopr03{|@1^@s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4920b70aa385a1050e96f8527e0d4b49859ed319 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5z5zV@QPi+l!7|4GIFR7cw=^$g-5jE$c2* zD33ej+kGWu(TW988XSMO|2*ULd@&2d1yRk^np0wJx}Mp8Gdm5_?1K-lWH7$`B4+0E ziZ78)8kUv**KU=u7I7(_n)7qZhf_!lvI6;>1s;*b3=DjSL74G){)!Z!V5z5zV@QPi+l!7|4GIFR7cw=^$g-5jE$c2* zD33ej+kGWu(TW988XSMO|2*ULd@&2d1yRk^np0wJx}Mp8Gdm5_?1K-lWH7$`B4+0E ziZ78)8kUv**KU=u7I7(_n)7qZhf_!lvI6;>1s;*b3=DjSL74G){)!Z!V5z5zV@QPi+l!7|4GIFR7cw=^$g-5jE$c2* zD33ej+kGWu(TW988XSMO|2*ULd@&2d1yRk^np0wJx}Mp8Gdm5_?1K-lWH7$`B4+0E ziZ78)8kUv**KU=u7I7(_n)7qZhf_!lvI6;>1s;*b3=DjSL74G){)!Z!V5z5zV@QPi+l!7|4GIFR7cw=^$g-5jE$c2* zD33ej+kGWu(TW988XSMO|2*ULd@&2d1yRk^np0wJx}Mp8Gdm5_?1K-lWH7$`B4+0E ziZ78)8kUv**KU=u7I7(_n)7qZhf_!lvI6;>1s;*b3=DjSL74G){)!Z!ppK`DV@QPi+oO(x3<4so2d?`}nD4;I%98H! rAg4@Unqgl+^19;Hb?gic!lvI6;>1s;*b3=DjSL74G){)!Z!ppK`DV@QPi+oKzK83Y(u4#=NSD4TS{IXmzW sOV-Y8J%*Zv-!`6Gde)kOVUM@ja|xE^K{Iyk1?pq)boFyt=akR{0MJ+~!T!lvI6;>1s;*b3=DjSL74G){)!Z!ppK`DV@QPi+oO(x3<3-+2fS4~lT-v9joVo6 rrG4Mb_<(zBZ>e7GJw}EHv6~oYr?bj@`Skw?P#=S*tDnm{r-UW|iX$q_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..6449a0506b9d3f90148ed0f50856a9ef3afb767f GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppK`DV@QPi+oKx=83Y(uHpri~n09%lTed(S r=M}w7A%=YczaySsdM3-ja8Fe_y@T~AXIcl)00st6S3j3^P6!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+oO)W3<^9f8;sjEo+L6lD|53| pO#XJ6;X~`r)xS2rV_^88XZgyV&9D37^yxrd44$rjF6*2UngCf4D!2du literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/meta.json new file mode 100644 index 00000000000..68bc849dac3 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by apersos, or coll for Delta V also with TheFreedomCommanders insight", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "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 + } + ] +}