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 41197c60744..a395e032b12 100644 Binary files a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi and b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi differ 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 f780bc4732d..371aa5570fd 100644 Binary files a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi and b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi differ diff --git a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi index 9cd37f1dd16..429ff16a261 100644 Binary files a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi and b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi differ diff --git a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_left.dmi b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_left.dmi index d905ea52455..4bc422aaf17 100644 Binary files a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_left.dmi and b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_left.dmi differ diff --git a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_right.dmi b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_right.dmi index fa499ae34bc..4ebfc1f3eec 100644 Binary files a/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_right.dmi and b/modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_right.dmi differ diff --git a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi index 88f2a23b843..fe9c40dfd0a 100644 Binary files a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi and b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi differ diff --git a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi index fdcbfa196bc..21a5a05cff1 100644 Binary files a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi and b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi differ 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 14ad4187cd3..ed31cfd7662 100644 Binary files a/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi and b/modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi differ