From 1b3c5adec42226f3dc664404d8fd46fc89ff6e74 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:41:46 +0300 Subject: [PATCH] [MIRROR] Restocking part I, a semi-replacement of the Szot Dynamica guns we already have. (#5200) * Restocking part I, a semi-replacement of the Szot Dynamica guns we already have. (#4578) * Add files via upload * Add files via upload * pistol desc's redone * Update rifle.dm * Update submachinegun.dm * Update pistol.dm * Update plasma.dm * Update rifle.dm * forgor to never use quotation marks. * Update pistol.dm * Update rifle.dm * Update submachinegun.dm * Update pistol.dm * fixes this (i have no idea how these work) * fixes this one too, they need to keep my ass away from line breaks * ditto * ok this should be last * wylom: removing extra line * miecz change * bobr (cleaned up) * Add files via upload * miecz grammar-check * shifts the miecz one pixel to the left, because it was lopsided * wylom fits on armor slots, and mod holsters now (little silly on the latter, but all the rifles do) * slows down the miecz to be equal with the wespe, upping it's TTK by an entire second, making it less outstanding * cuts back on the bobr's inaccuracy, to make up for it being slightly worse then sawn-offs by default (requires two hands, so you can't dual-wield them) * [MIRROR] Restocking part I, a semi-replacement of the Szot Dynamica guns we already have. --------- Co-authored-by: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com> Co-authored-by: StealsThePRs --- .../szot_dynamica/ammo/pistol.dm | 6 +-- .../szot_dynamica/ammo/plasma.dm | 5 +- .../szot_dynamica/ammo/rifle.dm | 6 +-- .../szot_dynamica/pistol.dm | 45 ++++++++---------- .../szot_dynamica/rifle.dm | 39 +++++++-------- .../szot_dynamica/submachinegun.dm | 20 ++++---- .../szot_dynamica/guns_lefthand.dmi | Bin 942 -> 535 bytes .../szot_dynamica/guns_righthand.dmi | Bin 939 -> 551 bytes .../szot_dynamica/guns_worn.dmi | Bin 1968 -> 1018 bytes .../szot_dynamica/inhands_64_left.dmi | Bin 1425 -> 664 bytes .../szot_dynamica/inhands_64_right.dmi | Bin 1373 -> 657 bytes .../szot_dynamica/guns_32.dmi | Bin 1646 -> 753 bytes .../szot_dynamica/guns_48.dmi | Bin 1230 -> 1500 bytes .../szot_dynamica/guns_64.dmi | Bin 1034 -> 501 bytes 14 files changed, 55 insertions(+), 66 deletions(-) diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm index 1a35e8f899a..a6b8c01a7cc 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm @@ -18,10 +18,10 @@ /obj/projectile/bullet/c27_54cesarzowa name = ".27-54 Cesarzowa piercing bullet" - damage = 18 + damage = 23 armour_penetration = 30 - wound_bonus = -30 - bare_wound_bonus = -10 + wound_bonus = 5 + bare_wound_bonus = 10 /obj/item/ammo_box/c27_54cesarzowa name = "ammo box (.27-54 Cesarzowa piercing)" diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm index 2f4c5bcbb13..a9256c79a14 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm @@ -15,7 +15,6 @@ icon_state = "plasma_glob" damage = 10 speed = 1.5 - bare_wound_bonus = 55 // Lasers have a wound bonus of 40, this is a bit higher - wound_bonus = -50 // However we do not very much against armor + bare_wound_bonus = 40 + wound_bonus = -20 // Not to great at wounding through armor. pass_flags = PASSTABLE | PASSGRILLE // His ass does NOT pass through glass! - weak_against_armour = TRUE diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm index a96faa34fcd..4c17aa86dfb 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm @@ -54,10 +54,10 @@ name =".60 Strela bullet" icon_state = "gaussphase" speed = 0.4 - damage = 50 + damage = 70 armour_penetration = 50 - wound_bonus = 20 - bare_wound_bonus = 30 + wound_bonus = 15 // Toned back down, as it's getting alot more damage. + bare_wound_bonus = 15 demolition_mod = 1.8 /// How much damage we add to things that are weak to this bullet var/anti_materiel_damage_addition = 30 diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm index f74e774fb0c..714c845baf7 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm @@ -3,7 +3,7 @@ /obj/item/gun/ballistic/automatic/pistol/plasma_thrower name = "\improper Słońce Plasma Projector" - desc = "An outdated sidearm rarely seen in use by some members of the CIN. \ + desc = "A full auto plasma-spewer, in the flavor of 'dirt cheap.' \ Uses plasma power packs. \ Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled." icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' @@ -37,17 +37,13 @@ /obj/item/gun/ballistic/automatic/pistol/plasma_thrower/examine_more(mob/user) . = ..() - . += "The 'Słońce' started life as an experiment in advancing the field of accelerated \ - plasma weaponry. Despite the design's obvious shortcomings in terms of accuracy and \ - range, the CIN combined military command (which we'll call the CMC from now on) took \ - interest in the weapon as a means to counter Sol's more advanced armor technology. \ - As it would turn out, the plasma globules created by the weapon were really not \ - as effective against armor as the CMC had hoped, quite the opposite actually. \ - What the plasma did do well however was inflict grevious burns upon anyone unfortunate \ - enough to get hit by it unprotected. For this reason, the 'Słońce' saw frequent use by \ - army officers and ship crews who needed a backup weapon to incinerate the odd space \ - pirate or prisoner of war." - + . += "Originally started as the best means to deterring large crowds, it quickly found a second life \ + as a frontier all-arounder on account of it's cheap-and-rechargable packs, full auto capabilities, \ + and one hell of an intimidation factor. \ + Earlier claims by competitors passed it off as terrible against armor, \ + but in reality, it's about as effective as any ballistic you could get your hands on! \ + As long as your sector, and local-command permits automatic weapons, that is... and grevious wounds." + return . // Plasma sharpshooter pistol @@ -55,7 +51,7 @@ /obj/item/gun/ballistic/automatic/pistol/plasma_marksman name = "\improper Gwiazda Plasma Sharpshooter" - desc = "An outdated sidearm rarely seen in use by some members of the CIN. \ + desc = "An accurate, plasma spitting pistol-'prototype,' atleast it shoots straight.\ Uses plasma power packs. \ Fires relatively accurate globs of searing plasma." icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' @@ -89,11 +85,8 @@ . += "The 'Gwiazda' is a further refinement of the 'Słońce' design. with improved \ energy cycling, magnetic launchers built to higher precision, and an overall more \ - ergonomic design. While it still fails to perform against armor, the weapon is \ - significantly more accurate and higher power, at expense of a much lower firerate. \ - Opinions on this weapon within military service were highly mixed, with many preferring \ - the sheer stopping power a spray of plasma could produce, with others loving the new ability \ - to hit something in front of you for once." + ergonomic design. Early reports speak highly of it's ability to shoot in a straight line. \ + Why it's ended up here is anyone's guess, but the best one would be: 'Testing market sustainability.'" return . @@ -102,14 +95,15 @@ /obj/item/gun/ballistic/revolver/shotgun_revolver name = "\improper Bóbr 12 GA revolver" - desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a four shell cylinder. That's right, shell, this one shoots twelve guage." + desc = "A dated attempt at upsizing a revolver to a 'servicable' caliber for frontier-and-distance planets. \ + A revolver type design with a four shell cylinder. That's right, shell, this one shoots twelve guage." accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga recoil = SAWN_OFF_RECOIL weapon_weight = WEAPON_MEDIUM icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' icon_state = "bobr" fire_sound = 'modular_nova/modules/sec_haul/sound/revolver_fire.ogg' - spread = SAWN_OFF_ACC_PENALTY + spread = 15 /obj/item/gun/ballistic/revolver/shotgun_revolver/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) @@ -118,11 +112,10 @@ . = ..() . += "The 'Bóbr' started development as a limited run sporting weapon before \ - the military took interest. The market quickly changed from sport shooting \ - targets, to sport shooting SolFed strike teams once the conflict broke out. \ - This pattern is different from the original civilian version, with a military \ - standard pistol grip and weather resistant finish. While the 'Bóbr' was not \ - a weapon standard issued to every CIN soldier, it was available for relatively \ - cheap, and thus became rather popular among the ranks." + quickly being eaten up by both militias and the general populace on most frontiers, \ + Especially favored by cargo-runners, and pirates due to the ease of finding more 12G. \ + Unlike the silver and wood sporting variants, this is the pure survival model replacing the grip with a \ + standard rubberized pistol grip and weather resistant finish. While the 'Bóbr' isn't the most appealing \ + weapon to grace someone's hands, it might be the most practical." return . diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm index daff5ddc8ba..b341014a9c0 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm @@ -2,7 +2,7 @@ /obj/item/gun/ballistic/automatic/lanca name = "\improper Lanca Battle Rifle" - desc = "A relatively compact, long barreled bullpup battle rifle chambered for .310 Strilka. Has an integrated sight with \ + desc = "A relatively compact, long barreled battle rifle chambered for .310 Strilka. Has an integrated sight with \ a surprisingly functional amount of magnification, given its place of origin." icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi' @@ -55,16 +55,15 @@ /obj/item/gun/ballistic/automatic/lanca/examine_more(mob/user) . = ..() - . += "The Lanca is a now relatively dated replacement for Kalashnikov pattern rifles \ - adopted by states now combining to form the CIN. While the rifle that came before them \ - had its benefits, leadership of many armies started to realize that the Kalashnikov-based \ - rifles were really showing their age once the variants began reaching the thousands in serial. \ - The solution was presented by a then new company, Szot Dynamica. This new rifle, not too \ - unlike the one you are seeing now, adopted all of the latest technology of the time. Lightweight \ - caseless ammunition, well known for its use in Sakhno rifles, as well as various electronics and \ - other incredible technological advancements. These advancements may have already been around since \ - before the creation of even the Sakhno, but the fact you're seeing this now fifty year old design \ - must mean something, right?" + . += "The Lanca started as an attempt to replace the confusing position of the Miecz, \ + Originally started as an attempt to upscale the Miecz to a marksman caliber. \ + It eventually ended up as little more then an odd cousin to it's starting frame. \ + Upscaled heavily from the classic 7.62x24mm catridge, to a full size .310, which \ + Necessitated a redoing of the entire bolt, and upper receiver, coupled with a much stronger recoil spring. \ + Then, to make up for all the added weight, the stock was replaced with a lighter skeletonized one, \ + and the barrel assembly was changed out for a minimalist design. \ + All in all, you get less rifle, for the priveledge of a bigger caliber. \ + ...And a scope." return . @@ -76,8 +75,8 @@ /obj/item/gun/ballistic/automatic/wylom name = "\improper Wyłom Anti-Materiel Rifle" - desc = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, \ - the massively overperforming penetration of which being the reason this weapon was discontinued." + desc = "A massive, outdated beast of an anti materiel rifle supposedly designed for 'fauna control.' Fires the devastating .60 Strela caseless round, \ + the massively overperforming penetration of which being the reason this weapon was eventually restricted from galactic trade." icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi' base_pixel_x = -16 // This baby is 64 pixels wide pixel_x = -16 @@ -89,7 +88,8 @@ icon_state = "wylom" inhand_icon_state = "wylom" worn_icon_state = "wylom" - w_class = WEIGHT_CLASS_HUGE + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_HEAVY slot_flags = ITEM_SLOT_BACK accepted_magazine_type = /obj/item/ammo_box/magazine/wylom @@ -125,12 +125,9 @@ . += "The 'Wyłom' AMR was a weapon not originally made for unaided human hands. \ The original rifle had mounting points for a specialized suit attachment system, \ - not too much unlike heavy smartguns that can be seen across the galaxy. CIN military \ - command, however, deemed that expensive exoskeletons and rigs for carrying an organic \ - anti material system were simply not needed, and that soldiers should simply 'deal with it'. \ - Unsurprisingly, soldiers assigned this weapon tend to not be a massive fan of that fact, \ - and smekalka within CIN ranks is common with troops finding novel ways to carry and use \ - their large rifles with as little effort as possible. Most of these novel methods, of course, \ - tend to shatter when the rifle is actually fired." + but that quickly fell through once it was announced, as exosuit hunting, isnt a common trend on the frontier. \ + This is the spitting image of anti-armo-... anti-anything. \ + There's a laser etched warning label, informing users of the weapon to be wary of side-blast. \ + ...And to not use it if you arent of appropriate size, but the sizing chart is no where to be seen." return . diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm index 98308772dc1..e7b4a22ef62 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm @@ -2,9 +2,9 @@ /obj/item/gun/ballistic/automatic/miecz name = "\improper Miecz Submachine Gun" - desc = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber .27-54 cartridges. \ - Due to the intended purpose of the weapon, and less than optimal ranged performance of the projectile, it has \ - nothing more than basic glow-sights as opposed to the ranged scope Lanca users might be used to." + desc = "A short barrel, weapon riding the line between submachine gun, and a rifle. \ + Features an over-the-top carry handle, pre-threaded barrel, and magazine indicating sights. \ + Whatever the hell that means." icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi' icon_state = "miecz" @@ -30,7 +30,7 @@ suppressor_y_offset = 0 burst_size = 1 - fire_delay = 0.2 SECONDS + fire_delay = 0.3 SECONDS actions_types = list() spread = 5 @@ -49,12 +49,12 @@ /obj/item/gun/ballistic/automatic/miecz/examine_more(mob/user) . = ..() - . += "The Miecz is one of the newest weapons to come out of CIN member state hands and \ - into the wild, typically the frontier. It was built alongside the round it fires, the \ - .27-54 Cesarzawa pistol round. Based on the proven Lanca design, it seeks to bring that \ - same reliable weapon design into the factor of a submachinegun. While it is significantly \ - larger than many comparable weapons in SolFed use, it more than makes up for it with ease \ - of control and significant firerate." + . += "The Miecz is one of the staple weapons of the frontier, simple, effective, and based on \ + a figuratively 'tested' design, though you couldn't be sure which one that is. \ + Fires the .24-57 'pistol' caliber round, if only to dodge it's classification as a rifle. \ + Overall, it's decently accurate, lightweight, somehow still squeezes into your bag, \ + and might feel a little more homely then the next gun over... or, atleast that's what the label says. \ + The Wood-Substitute material is known to have various side-effects, contact your local health department before use." return . diff --git a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi index 41197c607447cdacdc7bcff51e0e00aadc33ffdb..a395e032b125e20e51d0e6191ae9bf490fa141fd 100644 GIT binary patch delta 404 zcmV;F0c-xQ2bTnp7(E0700013M{Ml?000|MOjJbx002}}VKg*C9v(6)A|FX48Vw8? zZ#*r+!O7aN$uj@|00DGTPE!Ct=GbPDA$WfQG)Y83R7i>KR6S3_FciGlRaoN;ogF_^ z*2sp;5e=|b;-hO?gXapV3jcuqY~lpc$UvEao;>*7yZ7P22ORMa5s5T8C}4`@LBW+V z4)NMZW@dFz%QJD-yzH7B5fN#v-&-|VCWy7usW7&xZtfOfVDs}~(%jm@Wd0UA=k9+u zQ3DkjxApME3eQ>V!EnB;IS|UvGKG9i4oKu{DqtEt;9a=-GHSf5>)eN)n-D}9$ y*^g+I=AnRR(^0gdFc0XlfPLW|PJZToE#3fbAu%|yvYep+0000s0>Rd{~_|4BqaRCt{2n$2qyK^Vp-8U?|ktt8T_ zO%u$aH3~`*1jVnrUJBldf%-pqQL0}29~y}CCiJ3rzfcgQ=)o8dN^GK1Ot3b1^Rn_x zeAmflll^G6DfIclGP9GNci#7%+0Eg7lp=%>LI@#*5VHN)8Fu3M_$e!!otz&VOV5AD z@)p*+dgZXbUnrF9-+q6st*YF~18sJ@fel$KKC_>LU5Q2FL)(!6Gs`&2 z_4>N*i}P&>`0}-tfb(=3LH_L_L4f)V56r1UQB@FI?W&viUEmbJy>y z$*GJUOC%DW32=hA%y>Yp_SUu&cN?tL{u@{*C`;aPfK1lwO?4>s$96O-V7q_t;HFL- zPC*zDml=-}-x-y69GMhnhDS#29nBm|S!YjYlzIFB#t)7R>3-?mPd&#>wt$_IqYi$o z{njmP;&c@szEG79)xakpGUP*rcTAFl<8FQo<+VZ*a1HGp?fEgo@A7Q7HMSI{gA%Na zq4f&b3(Pm|^~dWz11GoS?ht=M2qAJuWtPmLa>=s^}mM4#Xs527!Kn>SuHdN-gS*tI987mzZzN%?)Ot+MP^qnBWU>l57L za{AgT@#iczeL{y5L2L9-hdA{DCX&QnHF^+MpWxIZG#U+U=VQ5|OY46U18~zPw4DGq zylV7t2G4x2?pEbw%%LM#w*&1}qi_8lPM_c;lRlwK@YqB@+J%l?2wJ0;IY9IRz)c0R z5xVIUoF@sT_58K-dShO_spv63`UD%V8a*@s@~n&v@^4TyKtS{fPQU!>6I^kt(W4z? t@Iuu3gq~oLNEh%4^$8n<5JCtE%U{e+1}*gB)^h*=002ovPDHLkV1l_-lBxgz diff --git a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi index f780bc4732d40f0ae2cddc15e562c7461dadcbd7..371aa5570fdff12b61942d0146f3d239d2bb43db 100644 GIT binary patch delta 420 zcmV;V0bBm72d4y(7(fIA00013M{Ml?0016POjJbx002}}VKg*C9v(6c3>irz8Y?0n zZ#*r+!O8#s|4CnVD*ylh0d!JMQvg8b*k+L-cz*#wNklo`BzWeUH&NS%(PC7b8nMw`@ z1n0D4R_q3rAZ)LMvv#z$iT$uec)FRf)*8&5KrWW=i^%FRor1U~`Vpp$eToZEKRiYqEmiK36(#BSf=oimVrUzQ*K3bER~V{6h6 z{a@6_UmxJ4V^XSAvs5Z;1$6%H@5*y-^tk6~VXr1zt8;G)V4znisdYr?zAe81A!Md5 zJuY4#66OF3`3OPijO+R-03ys0>Sa^Q|{7FPXRCt{2n$K$!K@`WQ8ViC&TiHmf zHcc>x)+i`N5EOsi^-}1q7^we)7p3aO|Dl0MZ$dA6@FLZUf*_?m7~{bbo2UdES`FTM zS@V7R(%IdK$?C3I^nDw{KpUsey^buPtn#{WdF@ zczyk=I)7;|wcoAQ)XV1u$As8<`tAJ(l};X3T&D&2+1BAj#NPzInM!5ZlZd`cY;Uq_ zN3B*PKW~dAmAiMH^5D%`T&R<8eFI`G{21Y6;glVt{8a8$#kg~~^#m%F_P&4hWIM5M zMJjn*^$!fvMk2O$G#3B?f7z@y25nLM^X50>fETYys`REzM|E)lV>UcCrX&8huoAs0 zJDH))YUZ%|qcFwlpl{EhojRJJ58C>%M8bRzppHAE-38MPOtEoJ$j_HE4B#7;ouQ0s z@<5N*cfy^52|{x&2!bF8f*^kgf*=TjAP9mW2+^dI*VnMnUx5F_k1u_In{H|Zbd5qN zbn?dDZH)ltMhx!$-_i$wUugvJaB3nbjetoX0DJg%!>_*3DwuG`+L1nhgK%pEkks_m zyJ~bSMSYfKc{Bq-Xar39fbHO23!u$+hPvH6hIDjJzHk|?l6NG<8pp`ygHm7X< zzi<1ktAmLxqaVNe0M9NU$;^rU)aLi~GpACt+WGs>NE=`p128dPh(T)v_^x3c1JCC^ zNq7d&PM)KUftCRr80e$2u(DwsbpeTXekeE^8EMnGQ#J+{#G q0U#+9=pJS~o2RY@coD4APmF~fwZLU|Nre8y8Ez=jVF{!=Sb_9N_EWm0@yvYOb6^1EZhmk8 z<2XsX=|+%X1gj@IEirE>fVqqMI|x6_R?Bp*8#d-C#TDc4X%X1K4#K+t>@4xmNAUR? zc&*^wRxu}n4nLS8J$`>MMQnb6cN#BM7C*oN#ypr8fpH@7!OFk%R9}s$S~GV6)b2eq zMH)W{Wd{*xFU}V#KM(-02k)OH20LrDD5#YBJiljc1Yeeyx&|CX7vpQ03z(Dm(fmGJL84 z(+GeC0Hzk1&vk$Y$ni%3LVP?hgfW0R)kh3ri~uw%>Va105m@j1Jt@9 z^D~V$oN5O6Rs$UyE5P|V0t7%8aDFE834m#e?V?#z{GUAK3qJ`AL`gl^F#rGn07*qo IM6N<$f*~K0+5i9m delta 1892 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 Y0nrggnl*sO>i_@%07*qoM6N<$g8a$vAOHXW delta 1302 zcmaKsZBWt&0LF>woO)X++tQV_?bLQ@X-=}t#5t|Bsa-0s8ro(W5^4xS6Dg-HXG)5u z6OD{ghXQH_Ng~>sy^4{qNuXf)j(_n56vWoR;n z5D4_AfBe%T425o?2?_cxic+an%9B~q4i9w@tqmlfP#h`}HzZsTlOSE2EG(6LGHPg^ z?>V$?-5)DEHBz-dJqdp*ZnWdFzMp`9 z4FgEn(N}Jg_4{hIk5bNYl)h|7FBN^8D7#wgK|9_~CW#x&%DD(wvKXB7_!GtaUDpVf z9$LLU(|ZbYW^9MoI)!qr3iHj{8$j1BVkmXYgxZFVv$2OIF-2oJC4vlhF0X8tN#81SMEiz)&z?O|kmpD6!m1kI%H{K{ZhA0`I+@JIAo zf$dX*KEJ0DbC%#=W~jo((kgM#^OD&oZ$dJNWECLTytpftVZs}9n! z&o4&G%LnMPyzc&KTrv$`0TS!RZ)b9kIp`pfk~HYkbeV?P3^e%Sctl@)FWn@wnpgcH zpP1mc>Y5@6)0!L@{AD4pb$eEfN^cHnZZ2M=sYFo=?2U<`a|}%l%hyLu=!QmQ4_<@| zoo??b4UFfUjTwRT$Ytr)}t_pgPw}^&wwSSK``h zBG7gva>h30(Ffe?w@{EpU8_$;*T8S7KR{cZfYjPtz?Gy@p^OcNatUzfG%S-nh0KKA zJ1iJWDl>BZF_rOcT9tqWD`B;R$$`IP%)C_L+I**^B%x)}C(x~Ui4{PLzD!52UZp?2 zHJdv?06P~R+@MZ0xnKcA{TVgX?4C8u6oSv`a&YXo1`LFO(YTHv?dMD0!qi9?^1_Dq z7X1%(s9xl0o`kfNX$a_pZLEg6n?jzZ&s>ciQ;iSzpQdB&CEJs2(0SB?PJ*7}=7NfL ziHdGvu-)$gQbpZQ)EE$&M2e0$j1sEopTh~@q@6IFz37*x?OqkrF z?6tvQVE41-H$o@h;@kT@_a1=l-g#zYj*_UJ;1%oQQLEuoIBi_(S?UXAWtG4r5=h$s z1$}V>wycF0#3NoJ?6nFkH)>>{gZpglekyl7rZj92l-$wB-+Xv&0*6|zvIZRKh#|)8 zP+ba7%B|oVAKjtx#A#+>O7B#9ciPcS1xgL`j?6+HfPjPCsJEGt!(iI(k+#J~y}&nOjrpM`n)@fALpQEVVg&*8smS?L9I= zvnh>1)|~H-nY9>d1(h$5PZNRe1+f~fIw<7 zmK?lLc*2@=fKPO%m<*3_A1kC`l0r_bTABg>V91z~CiL1i;M!c+NcVNJLVAqeZEPv6 z*l4xqv2`3xRG#kc&UM0KQl6dQ-cZDQ>Ohl3zg2Qr@wM}JkDn{ISUxEK_V+3 zIXx^53>m_~$?NOu&EA}5oPRMArdE3CPxk3h4ef}V$i4Ko~}w1vqi=^Je?(U6c47v#X4K6UII&o(C?pS}d4shGhZlK`D9k zwx13jN%Nne9`dZk^liW>7OUDR;KU-8uffpPc<(KKxUiy{_S)E$Y81D zNc-g0;(E)*7YEo4mn}EtUs_kWX*w;gG=Q35t*Kwx4;SvFv>18S&1-cx>?ec}LI@#* z5b~cfA=mskGRdoUI8iUC4sd#5<&O5Sx*zDAf0Ptz9Ufpy9dkXn(gXV@-qKMS%f}Ap ztZBrKx`rc$hXn!09=6pme0s^uNl%FG(ovlm=e@Sh4ql^zRy&lINf%%=JO+@`}iLI@$h=^Z*NL~99Y R5KsUB002ovPDHLkV1fyD?1KOR delta 1249 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 diff --git a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi index 14ad4187cd30c17a3e50e4abe11df341118eac26..ed31cfd766214430a966397ec42a5af4377bd749 100644 GIT binary patch delta 382 zcmV-^0fGLC2=xPAiBL{Q4GJ0x0000DNk~Le0000$0000$1Oos709Z$C?EnA(Bv4FL zMF0Q*G&DjU9x_x^VP0WDIXx^QD<6Y`UJVQx!okVw>+6b&o^*JqT>t<80d!JMQvg8b z*k+L-f`0)2Nkl8VS5%yvTxfK!#>ttNpzFH-eT#1YsJ)jDTUB4a zX18}v6JAco-f$XQp=HsI314s!$v9ETkBW8vNs!58u1J`2^O0G27DP(ul-eds^!=X! cl^3}gpU0Rm1}Brmn*aa+07*qoM6N<$f|Ny{-v9sr delta 919 zcmV;I18Ds91BwVCiBL{Q4GJ0x0000DNk~Le0001h0000W2nGNE0NNsOC6Qi&e*;lT zL_t(|ob8y;YZE~f$0sN~6oZ>7;Mvsw3Mhtq1Lm9LiMD@fEUk#SF2w7Kj?qp z!N0&CP@x)%AhaN~rcK0_rgW=B2vlY5capc6%x;=3BxyEz9~fqKX7|nPeBZpCSs@sP zVHk#C7=~e(4&qonjEs#X|mAuW!`!p9q`JpUucLle}SGy&gAFf7D}Rs$+`)2_wm=>7h504df3_HR*c?C& z*C>;?FJ3MQa*PTC{)h>22)(REfKcd^?RmAoEn`QB)p8q&PY&@TGip||0Y_Bp&@bxr z-1cyX<9ZLUYix>CN_*J9BYFdVDbj=cbFywIHej_sdVELxDHP}2$$6+Ak;W)|leV^u zyyXNaM@7)O7vfj5lSm|`f1|+`+1xe4(qSmiX5GGR=U{Vy;wmYxG+NP9w+F3j2m`UE zZaooKE)UE4kDrz+?A*QgP)yuBDPkAR(hB}(>zqQoQOH}4qzaBQ^^ZK4>yl;F2_Uo{ zwGPUeN*qHX!X+F4lXfPuCxrnd{VJ+e*x43MyTc*lk`|9jJ?=dK3RLAZ7RC-F%%o!76vO7SUD(DP3BlHhc&`~>WS zvRC`}B-f4&5O3=Fy>ap1i)I0@Hh=zc0 z1M93_+MuPi`_;3$-bSdqd78WngF_}JkHijzCQXPB=kOBruLNUHBraK-)K+$48;Al( z)!N|%1H%!S4r?0|G(DX(ks~?vgL?Y2cv$<*2IHi6Q4{L%ZJu6vkEWoD@ARA4OX35J z6XVqr>dC>q@-7WWT`lb(J|KbhbkyT&Nyq`5ME0Wi?LgBuCJ+}JI-D@7{m