From 37bc649eefcff0fb552ce637545807b6993fb86f Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 23 Apr 2023 19:58:45 -0400 Subject: [PATCH] CHIMP handcannon (#15667) --- Content.Server/Anomaly/AnomalySystem.cs | 18 +++--- .../Components/AnomalousParticleComponent.cs | 29 +++++++++ .../Anomaly/Components/AnomalyComponent.cs | 28 --------- .../Catalog/Research/technologies.yml | 4 ++ .../Guns/Ammunition/Cartridges/magnum.yml | 59 ++++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 39 +++++++++++- .../Weapons/Guns/Revolvers/revolvers.yml | 39 ++++++++++++ .../Entities/Structures/Machines/lathe.yml | 4 ++ .../Prototypes/Recipes/Lathes/devices.yml | 10 ++- .../Prototypes/Recipes/Lathes/security.yml | 21 +++++++ Resources/Prototypes/tags.yml | 3 + .../anomalous_casing.rsi/base-spent.png | Bin 0 -> 767 bytes .../Casings/anomalous_casing.rsi/base.png | Bin 0 -> 744 bytes .../Casings/anomalous_casing.rsi/meta.json | 20 ++++++ .../Casings/anomalous_casing.rsi/overlay.png | Bin 0 -> 481 bytes .../Weapons/Guns/Revolvers/chimp.rsi/base.png | Bin 0 -> 637 bytes .../Revolvers/chimp.rsi/equipped-BELT.png | Bin 0 -> 233 bytes .../Guns/Revolvers/chimp.rsi/inhand-left.png | Bin 0 -> 716 bytes .../Guns/Revolvers/chimp.rsi/inhand-right.png | Bin 0 -> 762 bytes .../Revolvers/chimp.rsi/mag-unshaded-1.png | Bin 0 -> 148 bytes .../Revolvers/chimp.rsi/mag-unshaded-2.png | Bin 0 -> 148 bytes .../Guns/Revolvers/chimp.rsi/meta.json | 32 ++++++++++ 22 files changed, 267 insertions(+), 39 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base-spent.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/overlay.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs index 45e4836480..730592cc2f 100644 --- a/Content.Server/Anomaly/AnomalySystem.cs +++ b/Content.Server/Anomaly/AnomalySystem.cs @@ -66,27 +66,27 @@ public sealed partial class AnomalySystem : SharedAnomalySystem private void OnStartCollide(EntityUid uid, AnomalyComponent component, ref StartCollideEvent args) { - if (!TryComp(args.OtherFixture.Body.Owner, out var particleComponent)) + if (!TryComp(args.OtherFixture.Body.Owner, out var particle)) return; - if (args.OtherFixture.ID != particleComponent.FixtureId) + if (args.OtherFixture.ID != particle.FixtureId) return; // small function to randomize because it's easier to read like this float VaryValue(float v) => v * Random.NextFloat(MinParticleVariation, MaxParticleVariation); - if (particleComponent.ParticleType == component.DestabilizingParticleType) + if (particle.ParticleType == component.DestabilizingParticleType) { - ChangeAnomalyStability(uid, VaryValue(component.StabilityPerDestabilizingHit), component); + ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerDestabilizingHit), component); } - else if (particleComponent.ParticleType == component.SeverityParticleType) + else if (particle.ParticleType == component.SeverityParticleType) { - ChangeAnomalySeverity(uid, VaryValue(component.SeverityPerSeverityHit), component); + ChangeAnomalySeverity(uid, VaryValue(particle.SeverityPerSeverityHit), component); } - else if (particleComponent.ParticleType == component.WeakeningParticleType) + else if (particle.ParticleType == component.WeakeningParticleType) { - ChangeAnomalyHealth(uid, VaryValue(component.HealthPerWeakeningeHit), component); - ChangeAnomalyStability(uid, VaryValue(component.StabilityPerWeakeningeHit), component); + ChangeAnomalyHealth(uid, VaryValue(particle.HealthPerWeakeningeHit), component); + ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerWeakeningeHit), component); } } diff --git a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs index 6d8e248c14..4444d49e3d 100644 --- a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs +++ b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Anomaly; +using Content.Shared.Anomaly.Components; namespace Content.Server.Anomaly.Components; @@ -20,4 +21,32 @@ public sealed class AnomalousParticleComponent : Component /// [DataField("fixtureId")] public string FixtureId = "projectile"; + + /// + /// The amount that the increases by when hit + /// of an anomalous particle of . + /// + [DataField("severityPerSeverityHit")] + public float SeverityPerSeverityHit = 0.025f; + + /// + /// The amount that the increases by when hit + /// of an anomalous particle of . + /// + [DataField("stabilityPerDestabilizingHit")] + public float StabilityPerDestabilizingHit = 0.04f; + + /// + /// The amount that the increases by when hit + /// of an anomalous particle of . + /// + [DataField("healthPerWeakeningeHit")] + public float HealthPerWeakeningeHit = -0.05f; + + /// + /// The amount that the increases by when hit + /// of an anomalous particle of . + /// + [DataField("stabilityPerWeakeningeHit")] + public float StabilityPerWeakeningeHit = -0.1f; } diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs index 813b3b38c1..cf2e12524e 100644 --- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs @@ -149,46 +149,18 @@ public sealed class AnomalyComponent : Component [DataField("severityParticleType")] public AnomalousParticleType SeverityParticleType; - /// - /// The amount that the increases by when hit - /// of an anomalous particle of . - /// - [DataField("severityPerSeverityHit")] - public float SeverityPerSeverityHit = 0.025f; - /// /// The particle type that destabilizes the anomaly. /// [DataField("destabilizingParticleType")] public AnomalousParticleType DestabilizingParticleType; - /// - /// The amount that the increases by when hit - /// of an anomalous particle of . - /// - [DataField("stabilityPerDestabilizingHit")] - public float StabilityPerDestabilizingHit = 0.04f; - /// /// The particle type that weakens the anomalys health. /// [DataField("weakeningParticleType")] public AnomalousParticleType WeakeningParticleType; - /// - /// The amount that the increases by when hit - /// of an anomalous particle of . - /// - [DataField("healthPerWeakeningeHit")] - public float HealthPerWeakeningeHit = -0.05f; - - /// - /// The amount that the increases by when hit - /// of an anomalous particle of . - /// - [DataField("stabilityPerWeakeningeHit")] - public float StabilityPerWeakeningeHit = -0.1f; - #region Points and Vessels /// /// The vessel that the anomaly is connceted to. Stored so that multiple diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 9db86f498a..59549821ec 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -536,6 +536,10 @@ unlockedRecipes: - AnomalyVesselCircuitboard - APECircuitboard + - WeaponPistolCHIMP + - CartridgeAnomalousParticleDelta + - CartridgeAnomalousParticleEpsilon + - CartridgeAnomalousParticleZeta - type: technology name: technologies-robotics-technology diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 8c04c664d1..7cec8c1eb5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -52,3 +52,62 @@ components: - type: CartridgeAmmo proto: BulletMagnumRubber + +- type: entity + id: BaseAnomalousCartridge + parent: BaseCartridgeMagnum + description: Packs twice the punch of a standard A.P.E. particle. + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Tag + tags: + - Cartridge + - CartridgeCHIMP + +- type: entity + id: CartridgeAnomalousParticleDelta + parent: BaseAnomalousCartridge + name: cartridge (delta particle) + components: + - type: Sprite + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - state: overlay + color: crimson + - type: CartridgeAmmo + proto: AnomalousParticleDeltaStrong + +- type: entity + id: CartridgeAnomalousParticleEpsilon + parent: BaseAnomalousCartridge + name: cartridge (epsilon particle) + components: + - type: Sprite + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - state: overlay + color: plum + - type: CartridgeAmmo + proto: AnomalousParticleEpsilonStrong + +- type: entity + id: CartridgeAnomalousParticleZeta + parent: BaseAnomalousCartridge + name: cartridge (zeta particle) + components: + - type: Sprite + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - state: overlay + color: goldenrod + - type: CartridgeAmmo + proto: AnomalousParticleZetaStrong diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 90e1457f68..2f13902101 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -338,10 +338,23 @@ - type: Projectile damage: types: - Heat: 3 + Heat: 5 - type: TimedDespawn lifetime: 3 + +- type: entity + parent: AnomalousParticleDelta + id: AnomalousParticleDeltaStrong + noSpawn: true + components: + - type: AnomalousParticle + particleType: Delta + severityPerSeverityHit: 0.05 + stabilityPerDestabilizingHit: 0.08 + healthPerWeakeningeHit: -0.1 + stabilityPerWeakeningeHit: -0.2 + - type: entity parent: AnomalousParticleDelta id: AnomalousParticleEpsilon @@ -351,6 +364,18 @@ - type: AnomalousParticle particleType: Epsilon +- type: entity + parent: AnomalousParticleEpsilon + id: AnomalousParticleEpsilonStrong + noSpawn: true + components: + - type: AnomalousParticle + particleType: Epsilon + severityPerSeverityHit: 0.05 + stabilityPerDestabilizingHit: 0.08 + healthPerWeakeningeHit: -0.1 + stabilityPerWeakeningeHit: -0.2 + - type: entity parent: AnomalousParticleDelta id: AnomalousParticleZeta @@ -360,6 +385,18 @@ - type: AnomalousParticle particleType: Zeta +- type: entity + parent: AnomalousParticleZeta + id: AnomalousParticleZetaStrong + noSpawn: true + components: + - type: AnomalousParticle + particleType: Zeta + severityPerSeverityHit: 0.05 + stabilityPerDestabilizingHit: 0.08 + healthPerWeakeningeHit: -0.1 + stabilityPerWeakeningeHit: -0.2 + # Launcher projectiles (grenade / rocket) - type: entity id: BulletRocket diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 356935d77b..7f8f69e1d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -125,3 +125,42 @@ capacity: 5 chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] + +- type: entity + id: WeaponPistolCHIMP + parent: BaseWeaponRevolver + name: C.H.I.M.P. handcannon + description: Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-1 + visible: false + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Appearance + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Clothing + sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeCHIMP + proto: CartridgeAnomalousParticleDelta #when revolvers stop sucking cock, make this spawn empty + capacity: 10 + chambers: [ True, True, True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: Gun + fireRate: 1.5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 05ed6926d3..51cd4e7a94 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -236,6 +236,10 @@ - PowerCellSmall - PowerCellMedium - PowerCellHigh + - WeaponPistolCHIMP + - CartridgeAnomalousParticleDelta + - CartridgeAnomalousParticleEpsilon + - CartridgeAnomalousParticleZeta - SynthesizerInstrument - RPED - ClothingShoesBootsMag diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 36b66a7cc4..00adffa50a 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -63,4 +63,12 @@ completetime: 2 materials: Plastic: 200 - Glass: 150 \ No newline at end of file + Glass: 150 + +- type: latheRecipe + id: WeaponPistolCHIMP + result: WeaponPistolCHIMP + completetime: 5 + materials: + Steel: 500 + Glass: 400 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index fa10006ca9..cc0f870dd7 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -144,6 +144,27 @@ Steel: 10 Glass: 5 +- type: latheRecipe + id: CartridgeAnomalousParticleDelta + result: CartridgeAnomalousParticleDelta + completetime: 2 + materials: + Plastic: 25 + +- type: latheRecipe + id: CartridgeAnomalousParticleEpsilon + result: CartridgeAnomalousParticleEpsilon + completetime: 2 + materials: + Plastic: 25 + +- type: latheRecipe + id: CartridgeAnomalousParticleZeta + result: CartridgeAnomalousParticleZeta + completetime: 2 + materials: + Plastic: 25 + - type: latheRecipe id: TargetHuman result: TargetHuman diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 10b1880985..f80c8482e8 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -94,6 +94,9 @@ - type: Tag id: CartridgeCaselessRifle +- type: Tag + id: CartridgeCHIMP + - type: Tag id: CartridgeHeavyRifle diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base-spent.png new file mode 100644 index 0000000000000000000000000000000000000000..165c06cfde7a10b1b41531c667b91017cc6823c7 GIT binary patch literal 767 zcmVEX>4Tx04R}tkv&MmKp2MKrfNkh4t5Z6$WWauh)U5-s#pXIrLEAagUO|T(4-+r zad8w}3l9D)RvlcNb#-tR1i>E=Cr2km7b)?(q|hS9JC1vJ?|WbFz5|3tg{fxO1fXh` zk&4H}Y;IKyyrRdMvxrK})D!8&3_QozJ$!t>i|{P(x<5z1k~bOP6N%@TZdk+{#L-Pl z=e$oGVkJo-J|`YG=z_$LT$f#b<6LxD;F%#KlbRM=HVZ9{7G`j3`I{))?VoeF}# z;dBrO!A%ep+$|^QK*05GUfh8oGR@h`X$~V zm}d(l-}~_8O8|?-V)^elCWq2Aom=<1eYLf{IakZ~eNwFj6M-Tk6G-AmWpeh{0_W`u z!RNZM zy8{4_xdd|=lHmiXw$T;LhHtE{;C(W|-cb`Wmk6W4(dmG;Kry_1c?AG?d456|1=_Dl zOW?ck^|fWACruhc0NAe|s{3SEYB)d~!o}K>VlIPM^}snNg_rsfg;C(hTtZ|5%w<1@ x>p-4?sRRJDPL4|n*AkeOFqw9X#bWuhd;mgVfw89R8^izr002ovPDHLkV1iENUJ3vJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..c10f0a8c99d0a9566d15d82d028d6af31092ff65 GIT binary patch literal 744 zcmVP)aTScvv4ho7mWN5{qg`yyiT8A!0O08hkC3#I+AxXnaiWFDD#i8IJ zy7)EtALuH$DhPrih&cEc__auh_cetUXgQko&;c+4$r2N(rSK9 z>U+lkMya9*%FMPFGMO~GuAfKvM1P2jS>4ZdT!RJGW`M7sc$Qh*A)Y5rZ#kCWJ>n5o zk_*Hq#4%16B)%28;_;i{qQ_r?c`myM_{B`A*v3j5vl2Imr-&nlUSZAqh%X7L=E^el zajFT}$RdR#Bq*q06FMBkshgBpXJ4Y>TSA#UjNTTi;N&QxMBW&w6`HD2*GO0C(NPt- z|IgFbW~ROAp(N1z>bjp%pl=_j*If7a)OG7;K;Q+qHe3EO$<0?m{TzQpYyYEvEVjTr>*w_UjBd_U*h3mT0^^WQP@6h%># zId|G!vAb8v^s+2Vs@F=M0LvuPgnsZK^3?u1z}4loC~uT`d48qS?ka~^mASM$@(;Wq z6wSMPZksm%#BoeAO~m=dne=LR z_luE()3`DgaTmVQkWbR-hk`a#%MSwRIU_YF+@>vjYgyS a6U+hJ$b4waTScvv4ho7mWN5{qg`yyiT8A!0O08hkC3#I+AxXnaiWFDD#i8IJ zy7)EtALuH$DhPrih&cEc__auh_cetUXgQko&;c+4$r2N(rSK9 z>U+lkMya9*%FMPFGMO~GuAfKvM1P2jS>4ZdT!RJGW`M7sc$Qh*A)Y5rZ#kCWJ>n5o zk_*Hq#4%16B)%28;_;i{qQ_r?c`myM_{B`A*v3j5vl2Imr-&nlUSZAqh%X7L=E^el zajFT}$RdR#Bq*q06FMBkshgBpXJ4Y>TSA#UjNTTi;N&QxMBW&w6`HD2*GO0C(NPt- z|IgFbW~ROAp(N1z>bjp%pl=_j*If7a)OG7;K;Q+qHe3EOHCL?D+A9b0D!d) XQ>G8|Qb!+=00000NkvXXu0mjfFtXXo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..9aff53108099ef30265d2fccf0746f86a707fa5c GIT binary patch literal 637 zcmV-@0)qXCP)Px%H%UZ6R9J=WmCtL_U>L_gl~Tlw1~h#k*peP5>NY4W2dzUrdmJ^49mXz-S3!30 zFYq9OSJ^J&K_v|D!h~(O%tMvIx+&`+!Hr?oLsNnW8N`F+W$V@->m~^1b9qSK=gs%~ zJnzFBh>3~$-%0ekadK)p1PFo#@8(`49zJ>!x{gDCe;R;aAGb)2W@Wsfp6B_q$A|Qi zy$X*Q1%y!Xyc$60Iu5sP-vmGim1?cbz#W5XtxVd``CMK-@_WZJFgZ0HM#2$7sN6Nj z+U^rVB?uZPGcZBu_IE-Gc1za=8g-w=g(dmCx$zYMO=R%A znl!WH?IMJVAJhS4Jh1_QOINR;iOhj_iwjHg?039f0NIV^*t3E0fr)VN>@bV=Cye4X z`o8?c59;Jf1)0-qtXn!77$2Aj2QLo;pt=dl{4tT_oUAyC&Fo)q)cqrK+TH_^xF6K9 zT#I`{_gVk8MokYp`9^gU)bvos`S~|TYISu4mTRFX3bU0NX<~WLMp2YQxxVjnBUz-< zx6Y6|NTqL`wfWVSg|=MSUwvf4)J?Xxw^-h@xu|KZ*!F?_xqLqS?l{M~UC(q%uv`m3 ziodPCP5`XfcH(-m7)HXqh(n7GMAgq$W>6Fb-}et0$mR2L5PA`gXgdR@ZXRfTBz{uS zjs{YrS<;418Xa@)G-O)Sb_PByyeC&Gu&MqaHJbe^23oc;`t3%%dinHJS{@S<^Uv`c X47KxtG*O3ppt*!In=DVif{XXAok79*#q<$~wl6o@r3tGGXT@SCkdrvLRn zaYmqShQ(WA=l}oPW+)cS?037kuOs5U`9+h}7II~ijaQfKv@7b}pAc!Jvvgs~9i1+* z4_@yl6@qjDfnZ?TGO2;b6Mw<&;$U--d17& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..547f6f9497388f6c5c1134f4c3528824b056bd52 GIT binary patch literal 716 zcmV;-0yF)IP)Px%hDk(0RCt{2+P!PrKo|z_=Yq#zf(hA*!DuZVLdUiT8Is_TehtAxhJJwSp>*mP zO7LG`8c+&$Jvv!B6f_EyWGo&sc?pG*X0Q>#78--ELs0NnT%EY{mFE3z!q(k;kM&`= z7a)WXLI@#*5JJdZ!&DFGdEU@*<#R*K&!_R`RX+AywYnq1Fu;fRg`sme=VRkf!a0vS z6;iRkDZzgGMF4=G71(&Xfu*HI)as6i6GE--h_&?RqHdkDI{ zo5fiE!mT0H>W;Ad1pwEf1>GK8_keNE@i0^9M^}|<$^(cB-Q3Ny&D}g}`z-|B9-6ib zYkPTO2+`uL?PWA=7eTj&w%>y1dD<@hi1GkR)grsN_ca_~xh%GK-Qyw}9#apT8_h_X8v` zt%pE{@>}5XlSfkh07;DY5G?*;I6P~xB+nV;w}4DPKoXOB2ujr=%Vmm`vH=e z)Px%v`IukRCt{2+OcaIVHgJR=Zr&#AVEU5B7|E@htT~4ha@DVC5v^)P#b7FlujK( z3H}Arz(uHWv>lQ_;l_hYG8TtSE+tUX49X#T+|VKE*Fo-jJ#_kD8b zoxUGH2qA6PT&cT(BSWwX!u=F?3qEiIx_Rk=3= z07$t1a5sN`b^)N*__ua#ZVYwDW;qSXJ`&E)F3@TjSXl5@V?-29xH&j4?o2c?qKG#a=}UZbvPNUdgIS*G*2a}_8S4>0uWt*XcU0x0z@0>_BQOzNSxxn8JqbdfC3O*fM^te=mJEe07Mrc8U-M_0MRG_ z(FKS$^8xhD1}DY1eu2KXVMo+&j^heo=1+l7EX`LvA$2J&j7|4a&n#< z8IED|_c*x6_NT|?SYJETDX^TzoIQjbHh+)GZ_PrSMhYM&=Q(2xS8dz{oxexnw`L)3 zBL(o~driv8c@6}hzlSww%|hHlodR|U!0`EdSi{yV#3k}oz%9rcgHiasUflNwk$)EV sTSstT3fnAs)y99v-GmTA2q8iJ0b59Bug`1q!~g&Q07*qoM6N<$g621ANB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2254251dad1cfe78952b035600949a0ae49b1406 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY;~ z2@q% svo@ZzI3K7Z(16SBpaxJogERv})I{N^*Y>5yfhIF}y85}Sb4q9e0G%8#3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..029a50922ab826dfc71deb490bfcfb0ad91b0090 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY;~ z2@$qbi mPF^(UayzI2)fw2p%fKMdA-IR@zi=VYWCl-HKbLh*2~7ZjvM+i7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json new file mode 100644 index 0000000000..e5f6d6c61f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} -- 2.52.0