diff --git a/code/modules/clothing/suits/f13armor.dm b/code/modules/clothing/suits/f13armor.dm index 855cd76f3f..2dabc2ba68 100644 --- a/code/modules/clothing/suits/f13armor.dm +++ b/code/modules/clothing/suits/f13armor.dm @@ -151,7 +151,7 @@ desc = "An old military grade pre war combat armor." icon_state = "combat_armor" item_state = "combat_armor" - armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 55) + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 55) slowdown = 0.12 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 5) @@ -195,7 +195,7 @@ icon = 'icons/obj/clothing/suits.dmi' icon_state = "combat_armor_mk2" item_state = "combat_armor_mk2" - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 35, "bomb" = 65, "bio" = 65, "rad" = 15, "fire" = 65, "acid" = 35, "wound" = 60) + armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 35, "bomb" = 65, "bio" = 65, "rad" = 15, "fire" = 65, "acid" = 35, "wound" = 60) slowdown = 0.15 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8) diff --git a/code/modules/clothing/suits/f13factionarmor.dm b/code/modules/clothing/suits/f13factionarmor.dm index 420cd52a62..bdc74be28b 100644 --- a/code/modules/clothing/suits/f13factionarmor.dm +++ b/code/modules/clothing/suits/f13factionarmor.dm @@ -225,13 +225,13 @@ mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi' icon_state = "armor_prime" item_state = "armor_prime" - armor = list("melee" = 50, "bullet" = 30, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) + armor = list("melee" = 50, "bullet" = 25, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) slowdown = 0.03 /obj/item/clothing/suit/armor/f13/legion/prime/decan name = "legion prime decanus armor" desc = "Legion prime decanus armor-an extra reinforced baseball uniform." - armor = list("melee" = 55, "bullet" = 35, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) + armor = list("melee" = 55, "bullet" = 30, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) /obj/item/clothing/suit/armor/f13/legion/prime/heavydecan // Heavy Prime name = "legion heavy prime decanus armor" @@ -266,7 +266,7 @@ mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi' icon_state = "armor_veteran" item_state = "armor_veteran" - armor = list("melee" = 55, "bullet" = 35, "laser" = 25, "energy" = 15, "bomb" = 30, "bio" = 5, "rad" = 5, "fire" = 35, "acid" = 0, "wound" = 40) + armor = list("melee" = 55, "bullet" = 30, "laser" = 25, "energy" = 15, "bomb" = 30, "bio" = 5, "rad" = 5, "fire" = 35, "acid" = 0, "wound" = 40) slowdown = 0.03 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 4) // Slightly better armor @@ -295,14 +295,14 @@ mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi' icon_state = "armor_explorer" item_state = "armor_explorer" - armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 40, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) + armor = list("melee" = 40, "bullet" = 30, "laser" = 15, "energy" = 10, "bomb" = 40, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) /obj/item/clothing/suit/armor/f13/legion/vet/vexil name = "legion vexillarius armor" desc = " Worn by Vexillarius, this armor has been reinforced with circular metal plates on the chest and a back mounted pole for the flag of the Bull, making the wearer easy to see at a distance." icon_state = "armor_vexillarius" item_state = "armor_vexillarius" - armor = list("melee" = 50, "bullet" = 55, "laser" = 20, "energy" = 20, "bomb" = 25, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) + armor = list("melee" = 50, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 25, "bio" = 20, "rad" = 20, "fire" = 25, "acid" = 0, "wound" = 40) slowdown = 0.02 /obj/item/clothing/suit/armor/f13/legion/venator @@ -318,7 +318,7 @@ desc = "Every Centurion is issued some of the best armor available in the Legion, and adds better pieces from slain opponents over time." icon_state = "legion_centurion" item_state = "legion_centurion" - armor = list("melee" = 75, "bullet" = 45, "laser" = 30, "energy" = 25, "bomb" = 45, "bio" = 20, "rad" = 20, "fire" = 45, "acid" = 45, "wound" = 55) + armor = list("melee" = 75, "bullet" = 40, "laser" = 30, "energy" = 25, "bomb" = 45, "bio" = 20, "rad" = 20, "fire" = 45, "acid" = 45, "wound" = 55) slowdown = 0.05 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 10) // Rest in pieces @@ -335,7 +335,7 @@ desc = "Centurions who have led many patrols and ambushes against NCR Rangers have a distinct look from the many looted pieces of Ranger armor, and are often experienced in skirmishing." icon_state = "legion_rangercent" item_state = "legion_rangercent" - armor = list("melee" = 35, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 35, "bio" = 60, "rad" = 20, "fire" = 80, "acid" = 0, "wound" = 55) + armor = list("melee" = 35, "bullet" = 50, "laser" = 30, "energy" = 25, "bomb" = 35, "bio" = 60, "rad" = 20, "fire" = 80, "acid" = 0, "wound" = 55) /obj/item/clothing/suit/armor/f13/legion/legate name = "legion legate armor" @@ -363,7 +363,7 @@ desc = "It's a set of standard legion armor strengthened using numerous parts taken from a suit of power armor, sacrificing speed and bullet protection for greater protection against laser-based weaponary." icon_state = "legion-heavy" item_state = "legion-heavy" - armor = list("melee" = 60, "bullet" = 65, "laser" = 55, "energy" = 15, "bomb" = 40, "bio" = 55, "rad" = 25, "fire" = 55, "acid" = 15, "wound" = 30) + armor = list("melee" = 60, "bullet" = 50, "laser" = 55, "energy" = 15, "bomb" = 40, "bio" = 55, "rad" = 25, "fire" = 55, "acid" = 15, "wound" = 30) slowdown = 1.5 /obj/item/clothing/suit/armor/f13/legion/legionsalvaged/ComponentInitialize() @@ -419,7 +419,7 @@ icon_state = "ncr_infantry_vest" item_state = "ncr_infantry_vest" body_parts_covered = CHEST|GROIN|ARMS|LEGS - armor = list("melee" = 20, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) + armor = list("melee" = 20, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) slowdown = 0.12 pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt/ncr salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2) @@ -457,7 +457,7 @@ desc = "A standard issue NCR Infantry vest reinforced with a groinpad." icon_state = "ncr_reinforced_vest" item_state = "ncr_reinforced_vest" - armor = list("melee" = 25, "bullet" = 45, "laser" = 25, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) + armor = list("melee" = 25, "bullet" = 35, "laser" = 25, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) slowdown = 0.15 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 3) @@ -471,7 +471,7 @@ name = "NCR reinforced mantle vest" desc = "A standard issue NCR Infantry vest reinforced with a groinpad and a mantle." icon_state = "ncr_reinforced_mantle" - armor = list("melee" = 25, "bullet" = 45, "laser" = 25, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) + armor = list("melee" = 25, "bullet" = 35, "laser" = 25, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) slowdown = 0.15 /obj/item/clothing/suit/armor/f13/ncrarmor/mantle/reinforced/trenchraider @@ -506,7 +506,7 @@ desc = "A reinforced set of NCR mantle armour, with added padding on the groin, neck and shoulders. Intended for use by the officer class." icon_state = "ncr_lt_armour" item_state = "ncr_lt_armour" - armor = list("melee" = 25, "bullet" = 45, "laser" = 25, "energy" = 20, "bomb" = 50, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 50) + armor = list("melee" = 25, "bullet" = 40, "laser" = 25, "energy" = 20, "bomb" = 50, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 50) slowdown = 0.15 pocket_storage_component_path = /datum/component/storage/concrete/pockets/treasurer @@ -563,7 +563,7 @@ desc = "A thicker than average duster worn by NCR recon rangers out in the field. It's not heavily armored by any means, but is easy to move around in and provides excellent protection from the harsh desert environment." icon_state = "duster_recon" item_state = "duster_recon" - armor = list("melee" = 25, "bullet" = 35, "laser" = 15, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) + armor = list("melee" = 25, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) slowdown = 0.05 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 4) @@ -602,7 +602,7 @@ desc = "A set of standard issue ranger patrol armor that provides defense similar to a suit of pre-war combat armor. It's got NCR markings, making it clear who it was made by." icon_state = "ncr_patrol" item_state = "ncr_patrol" - armor = list("melee" = 25, "bullet" = 45, "laser" = 20, "energy" = 20, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 40) + armor = list("melee" = 25, "bullet" = 35, "laser" = 20, "energy" = 20, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 40) slowdown = 0.15 /obj/item/clothing/suit/armor/f13/combat/ncr_patrol/Initialize() @@ -1017,7 +1017,7 @@ desc = "A heavily reinforced set of military grade armor, commonly seen in the Divide now repurposed and reissued to Chief Rangers." icon_state = "elite_riot" item_state = "elite_riot" - armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 40, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55) + armor = list("melee" = 60, "bullet" = 50, "laser" = 40, "energy" = 40, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55) icon = 'icons/obj/clothing/suits.dmi' /obj/item/clothing/suit/armor/f13/rangercombat/desert @@ -1033,7 +1033,7 @@ desc = "a handmade tactical rig. The actual rig is made of a black, fiberous cloth, being attached to a dusty desert-colored belt. A flask and two ammo pouches hang from the belt." icon_state = "r_gear_rig" item_state = "r_gear_rig" - armor = list("melee" = 35, "bullet" = 40, "laser" = 35, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) + armor = list("melee" = 35, "bullet" = 30, "laser" = 35, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) slowdown = 0.05 pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt/ncr @@ -1042,7 +1042,6 @@ desc = "A refurbished set of NCRA 3rd Scouts armor, now with heavier plating together with arm and leg guards. A two-headed bear has been painted on its chest." icon_state = "refurb_scout" item_state = "refurb_scout" - armor = list("melee" = 35, "bullet" = 40, "laser" = 35, "energy" = 20, "bomb" = 25, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40) /obj/item/clothing/suit/armor/f13/ncrarmor/scout name = "NCR 3rd Scout combat armor" diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index e673ba4e53..b5c680f536 100644 --- a/code/modules/jobs/job_types/bos.dm +++ b/code/modules/jobs/job_types/bos.dm @@ -92,8 +92,8 @@ Head Paladin exp_requirements = 600 loadout_options = list( - /datum/outfit/loadout/hpa, //Laser Gatling, Super Sledge - /datum/outfit/loadout/hpb, //Tribeam, Powerfist + /datum/outfit/loadout/hpa, //Laser Gatling + /datum/outfit/loadout/hpb, //Bozar /datum/outfit/loadout/hpc //14mm pistol, Shield, Pre-war Ripper ) @@ -124,8 +124,8 @@ Head Paladin /datum/outfit/loadout/hpa name = "Heavy Weapons Head Paladin" backpack_contents = list( - /obj/item/gun/ballistic/automatic/m72 = 1, - /obj/item/ammo_box/magazine/m2mm = 2, + /obj/item/minigunpack = 1, + /obj/item/stock_parts/cell/ammo/ecp = 3, /obj/item/gun/energy/laser/wattz/magneto = 1, /obj/item/stock_parts/cell/ammo/ec = 2 ) @@ -253,8 +253,8 @@ Head Knight /datum/outfit/loadout/hka name = "Sniper Head Knight" backpack_contents = list( - /obj/item/gun/ballistic/rifle/mag/antimateriel = 1, - /obj/item/ammo_box/magazine/amr = 2 + /obj/item/gun/ballistic/automatic/marksman/sniper = 1, + /obj/item/ammo_box/magazine/w308 = 2 ) /datum/outfit/loadout/hkb @@ -362,8 +362,8 @@ Paladin /datum/outfit/loadout/paladinc name = "Heavy Paladin" backpack_contents = list( - /obj/item/gun/energy/laser/scatter = 1, - /obj/item/stock_parts/cell/ammo/mfc = 3, + /obj/item/gun/ballistic/automatic/lsw = 1, + /obj/item/ammo_box/magazine/m556/rifle = 3, /obj/item/gun/energy/laser/wattz/magneto = 1, /obj/item/stock_parts/cell/ammo/ec = 2, /obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1, @@ -374,8 +374,8 @@ Paladin /datum/outfit/loadout/paladind name = "Heavy Senior Paladin" backpack_contents = list( - /obj/item/gun/energy/laser/scatter = 1, - /obj/item/stock_parts/cell/ammo/mfc = 3, + /obj/item/gun/ballistic/automatic/lsw = 1, + /obj/item/ammo_box/magazine/m556/rifle = 3, /obj/item/gun/energy/laser/wattz/magneto = 1, /obj/item/stock_parts/cell/ammo/ec = 2, /obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1, diff --git a/code/modules/jobs/job_types/enclave.dm b/code/modules/jobs/job_types/enclave.dm index 1c9c03902e..a57f274a9d 100644 --- a/code/modules/jobs/job_types/enclave.dm +++ b/code/modules/jobs/job_types/enclave.dm @@ -237,7 +237,7 @@ /datum/outfit/loadout/gysergeantrifle name = "Support Sergeant" - suit_store = /obj/item/gun/ballistic/automatic/assault_carbine/worn + suit_store = /obj/item/gun/ballistic/automatic/assault_carbine backpack_contents = list( /obj/item/ammo_box/magazine/m5mm = 4, /obj/item/ammo_box/m5mmbox/shock = 1, diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm index 8aec03295e..02c8ee1ecc 100644 --- a/code/modules/jobs/job_types/legion.dm +++ b/code/modules/jobs/job_types/legion.dm @@ -178,9 +178,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al minimal_access = list(ACCESS_PUBLIC, ACCESS_LEGION, ACCESS_LEGION3, ACCESS_LEGION_COMMAND, ACCESS_LEGION2, ACCESS_CHANGE_IDS, ACCESS_LEGION1, ACCESS_LEGION4) loadout_options = list( - /datum/outfit/loadout/palacent, // M1919, Goliath, 10mm pistol - /datum/outfit/loadout/rangerhunter, // Hunting revolver, Sniper, Spatha - /datum/outfit/loadout/centurion, // City-Killer shotgun, 14mm pistol + /datum/outfit/loadout/palacent, // BAR, 10mm pistol + /datum/outfit/loadout/rangerhunter, // Unique sniper, hunting revolver, spatha + /datum/outfit/loadout/centurion, // 14mm pistol, goliath ) /datum/outfit/job/CaesarsLegion/Legionary/f13centurion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -221,9 +221,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al name = "Paladin-Slayer Centurion" suit = /obj/item/clothing/suit/armor/f13/legion/palacent head = /obj/item/clothing/head/helmet/f13/legion/palacent - suit_store = /obj/item/gun/ballistic/automatic/m1919 + suit_store = /obj/item/gun/ballistic/automatic/bar backpack_contents = list( - /obj/item/ammo_box/magazine/m762 = 3, + /obj/item/ammo_box/magazine/m762/ext = 3, /obj/item/gun/ballistic/automatic/pistol/n99/crusader = 1, /obj/item/ammo_box/magazine/m10mm_adv/simple = 2 ) @@ -232,10 +232,10 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al name = "Ranger-Hunter Centurion" suit = /obj/item/clothing/suit/armor/f13/legion/rangercent head = /obj/item/clothing/head/helmet/f13/legion/rangercent - suit_store = /obj/item/gun/ballistic/rifle/mag/antimateriel + suit_store =/obj/item/gun/ballistic/automatic/marksman/sniper/snipervenator backpack_contents = list( /obj/item/gun/ballistic/revolver/hunting = 1, - /obj/item/ammo_box/magazine/amr = 2, + /obj/item/ammo_box/magazine/w308 = 2, /obj/item/ammo_box/c4570 = 3, /obj/item/melee/onehanded/machete/spatha = 1 ) @@ -248,7 +248,6 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al backpack_contents = list( /obj/item/ammo_box/magazine/m14mm = 2, /obj/item/melee/unarmed/powerfist/goliath = 1, - /obj/item/book/granter/martial/cqc = 1, /obj/item/reagent_containers/pill/patch/healingpowder/berserker = 2 ) @@ -661,9 +660,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al /datum/outfit/loadout/sniper name = "Sniper" - suit_store = /obj/item/gun/ballistic/automatic/m1garand/sks + suit_store = /obj/item/gun/ballistic/rifle/repeater/trail backpack_contents = list( - /obj/item/ammo_box/magazine/sks = 3, + /obj/item/ammo_box/m44box = 2, /obj/item/attachments/scope = 1, /obj/item/melee/onehanded/machete/gladius = 1, /obj/item/grenade/smokebomb = 2 diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm index 33120b9b3c..ee3ae03247 100644 --- a/code/modules/jobs/job_types/ncr.dm +++ b/code/modules/jobs/job_types/ncr.dm @@ -441,7 +441,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. /datum/outfit/loadout/sergeantrifleman name = "Lead Rifleman" - suit_store = /obj/item/gun/ballistic/automatic/assault_rifle + suit_store = /obj/item/gun/ballistic/automatic/service/r82 head = /obj/item/clothing/head/f13/ncr suit = /obj/item/clothing/suit/armor/f13/ncrarmor/mantle/reinforced backpack_contents = list( @@ -558,7 +558,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. outfit = /datum/outfit/job/ncr/f13vetranger loadout_options = list( // ALL: Binoculars, Bowie knife, Sequoia - /datum/outfit/loadout/vrclassic, // DKS + /datum/outfit/loadout/vrclassic, // AMR /datum/outfit/loadout/vrlite, // Brush /datum/outfit/loadout/vrshotgunner // Lever Action Shotgun ) @@ -572,7 +572,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. id = /obj/item/card/id/dogtag/ncrvetranger uniform = /obj/item/clothing/under/f13/ranger/vet suit = /obj/item/clothing/suit/armor/f13/rangercombat - suit_store = /obj/item/gun/ballistic/revolver/sequoia head = /obj/item/clothing/head/helmet/f13/ncr/rangercombat gloves = /obj/item/clothing/gloves/rifleman shoes = /obj/item/clothing/shoes/f13/military/leather @@ -607,11 +606,11 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. ) /datum/outfit/loadout/vrshotgunner - name = "Veteran Ranger Shotgunner" - suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead + name = "Veteran Ranger Gunslinger" + suit_store = /obj/item/gun/ballistic/revolver/sequoia backpack_contents = list( /obj/item/storage/box/ration/ranger_breakfast = 1, - /obj/item/ammo_box/shotgun/buck = 3 + /obj/item/ammo_box/c4570box = 2 ) /datum/outfit/job/ncr/f13vetranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -700,7 +699,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. head = /obj/item/clothing/head/f13/ranger uniform = /obj/item/clothing/under/f13/ranger/patrol belt = /obj/item/storage/belt/military/assault/ncr - suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/auto5 + suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever backpack_contents = list( /obj/item/storage/box/ration/ranger_breakfast = 1, /obj/item/ammo_box/shotgun/buck = 3, @@ -737,7 +736,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. outfit = /datum/outfit/job/ncr/f13heavytrooper loadout_options = list( - /datum/outfit/loadout/shockht, // BAR, nobody uses the citykiller lol /datum/outfit/loadout/supportht, // R84 /datum/outfit/loadout/meleeht // Rocket Sledge, lighter armor in exchange for mobility and melee ) @@ -761,14 +759,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. /obj/item/storage/bag/money/small/ncrenlisted = 1 ) -/datum/outfit/loadout/shockht - name = "Shock Heavy Trooper" - backpack_contents = list( - /obj/item/gun/ballistic/automatic/bar = 1, - /obj/item/ammo_box/magazine/m762/ext = 2, - /obj/item/storage/box/ration/menu_four = 1 - ) - /datum/outfit/loadout/supportht name = "Support Heavy Trooper" backpack_contents = list( diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 7da914103b..20a701d431 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -693,7 +693,7 @@ mag_type = /obj/item/ammo_box/magazine/m9mmds slowdown = 0.05 extra_damage = 22 - extra_penetration = 0.05 + extra_penetration = 0.1 fire_delay = 4 burst_size = 1 spread = 0 @@ -942,7 +942,7 @@ force = 20 slowdown = 0.2 mag_type = /obj/item/ammo_box/magazine/garand308 - extra_damage = 40 + extra_damage = 30 extra_penetration = 0.2 fire_delay = 2 burst_size = 1 @@ -983,8 +983,7 @@ desc = "A well-tuned scoped M1C rifle crafted by master gunsmith from the Gunrunners. Chambered in 7.62x51." icon_state = "republics_pride" item_state = "scoped308" - extra_damage = 45 - extra_penetration = 0.3 + extra_damage = 40 zoomable = TRUE zoom_amt = 10 zoom_out_amt = 13 @@ -1003,8 +1002,8 @@ item_state = "sks" mag_type = /obj/item/ammo_box/magazine/sks fire_delay = 2 - extra_damage = 40 - extra_penetration = 0.1 + extra_damage = 30 + extra_penetration = 0.2 extra_speed = 100 bayonet_state = "bayonet" knife_x_offset = 24 @@ -1029,7 +1028,7 @@ extra_speed = 800 extra_penetration = 0.2 extra_damage = 35 - slowdown = 0.4 + slowdown = 0.3 zoom_amt = 10 zoom_out_amt = 13 semi_auto = TRUE @@ -1054,7 +1053,7 @@ icon_state = "venator_sniper" item_state = "venator_sniper" fire_delay = 6 - slowdown = 0.3 + slowdown = 0.2 zoom_amt = 15 zoom_out_amt = 17 extra_penetration = 0.2 @@ -1102,7 +1101,7 @@ fire_delay = 2.5 slowdown = 0.35 spread = 10 - extra_damage = 25 + extra_damage = 24 recoil = 0.1 is_automatic = TRUE automatic = 1 @@ -1290,7 +1289,7 @@ icon_state = "fnfal" item_state = "fnfal" force = 20 - extra_damage = 28 + extra_damage = 24 extra_penetration = 0.1 extra_speed = 400 fire_delay = 3.5 @@ -1317,7 +1316,7 @@ force = 24 //club slowdown = 1.5 //really goddamn big autofire_shot_delay = 2.3 - extra_damage = 30 + extra_damage = 28 extra_penetration = 0.2 spread = 10 recoil = 0.3 @@ -1485,7 +1484,7 @@ item_state = "sniper" slot_flags = SLOT_BACK mag_type = /obj/item/ammo_box/magazine/m2mm - extra_damage = 50 + extra_damage = 30 burst_size = 1 fire_delay = 10 zoomable = TRUE