diff --git a/_maps/RandomZLevels/VR/yuma_VR.dmm b/_maps/RandomZLevels/VR/yuma_VR.dmm
index 0695c6a8..30c2041a 100644
--- a/_maps/RandomZLevels/VR/yuma_VR.dmm
+++ b/_maps/RandomZLevels/VR/yuma_VR.dmm
@@ -1930,7 +1930,6 @@
/obj/item/gun/ballistic/shotgun/automatic/combat/auto5,
/obj/item/gun/ballistic/shotgun/automatic/combat/citykiller,
/obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever,
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead,
/obj/item/gun/ballistic/shotgun/hunting,
/obj/item/gun/ballistic/shotgun/police,
/turf/open/floor/holofloor/plating,
diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
index 35e8ab89..e43070e7 100644
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -467,9 +467,9 @@
subcategory = CAT_WEAPON
-//browning hi-power
+//stallard js-9
/datum/crafting_recipe/ninemil
- name = "9mm Pistol"
+ name = "Cheap 9mm Pistol"
result = /obj/item/gun/ballistic/automatic/pistol/ninemil
reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
/obj/item/stack/crafting/metalparts = 1,
@@ -482,7 +482,7 @@
//m1911
/datum/crafting_recipe/m1911
- name = "M1911"
+ name = ".45 Auto pistol"
result = /obj/item/gun/ballistic/automatic/pistol/m1911
reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
/obj/item/stack/crafting/metalparts = 2,
@@ -560,7 +560,7 @@
//remington rifle
/datum/crafting_recipe/remingtonhuntingrifle
- name = "Hunting Rifle"
+ name = "upgraded hunting rifle"
result = /obj/item/gun/ballistic/rifle/hunting/remington
reqs = list(/obj/item/stack/crafting/goodparts = 2,
/obj/item/stack/crafting/metalparts = 2,
@@ -573,7 +573,7 @@
//battle rifle
/datum/crafting_recipe/m1garand
- name = "M1 Garand"
+ name = "Battle Rifle"
result = /obj/item/gun/ballistic/automatic/m1garand
reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
/obj/item/stack/crafting/metalparts = 2,
@@ -767,7 +767,7 @@
always_available = FALSE
/datum/crafting_recipe/gaussrifle
- name = "M72 Gauss Rifle"
+ name = "Gauss Rifle"
result = /obj/item/gun/ballistic/automatic/m72
reqs = list(/obj/item/stack/sheet/metal = 15,
/obj/item/advanced_crafting_components/flux = 1,
@@ -784,21 +784,6 @@
subcategory = CAT_WEAPON
always_available = FALSE
-/datum/crafting_recipe/neostead
- name = "Neostead 2000"
- result = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt
- reqs = list(/obj/item/stack/sheet/metal = 10,
- /obj/item/advanced_crafting_components/assembly = 1,
- /obj/item/advanced_crafting_components/alloys = 1,
- /obj/item/advanced_crafting_components/receiver = 1,
- /obj/item/stack/crafting/goodparts = 15,
- )
- tools = list(TOOL_AWORKBENCH)
- time = 120
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
- always_available = FALSE
-
/datum/crafting_recipe/auto5
name = "Browning Auto 5"
result = /obj/item/gun/ballistic/shotgun/automatic/combat/auto5
@@ -978,7 +963,7 @@
//Grease gun
/datum/crafting_recipe/greasegun
- name = "Grease Gun"
+ name = "Cheap .45 Auto SMG"
result = /obj/item/gun/ballistic/automatic/smg/greasegun
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/crafting/metalparts = 3,
@@ -1004,7 +989,7 @@
//Uzi
/datum/crafting_recipe/uzi
- name = "Uzi"
+ name = "9mm SMG"
result = /obj/item/gun/ballistic/automatic/smg/uzi
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1034,7 +1019,7 @@
//Thompson
/datum/crafting_recipe/thompson
- name = "Thompson"
+ name = ".45 Auto SMG"
result = /obj/item/gun/ballistic/automatic/smg/thompson
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1094,7 +1079,7 @@
//R91 Assault Rifle
/datum/crafting_recipe/r91
- name = "R91 Assault Rifle"
+ name = "Assault Rifle"
result = /obj/item/gun/ballistic/automatic/assault_rifle/r91
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1110,7 +1095,7 @@
//Type 93 Assault Rifle
/datum/crafting_recipe/type93
- name = "Type 93 Assault Rifle"
+ name = "Chinese Assault Rifle"
result = /obj/item/gun/ballistic/automatic/assault_rifle/type93
reqs = list(/obj/item/stack/sheet/metal = 10,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1125,7 +1110,7 @@
//R84 LMG
/datum/crafting_recipe/r84
- name = "R84 LMG"
+ name = "Light Machine Gun"
result = /obj/item/gun/ballistic/automatic/lmg/r84
reqs = list(/obj/item/stack/sheet/metal = 10,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1141,7 +1126,7 @@
//Type 88 LMG
/datum/crafting_recipe/type88
- name = "Type 88 LMG"
+ name = "Chinese LMG"
result = /obj/item/gun/ballistic/automatic/lmg/type88
reqs = list(/obj/item/stack/sheet/metal = 20,
/obj/item/advanced_crafting_components/assembly = 1,
@@ -1220,7 +1205,7 @@
//aer9
/datum/crafting_recipe/AER9
- name = "AER-9"
+ name = "Laser Rifle"
result = /obj/item/gun/energy/laser/aer9
reqs = list(/obj/item/stack/sheet/metal = 15,
/obj/item/advanced_crafting_components/lenses = 1,
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index f2a57adf..3a0ff19a 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -171,7 +171,7 @@
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/bundle/crate/mosin
- name = "Mosin-Nagant spawner"
+ name = "M1903 spawner"
items = list(
/obj/item/gun/ballistic/rifle/mosin,
/obj/item/ammo_box/a762mm
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 66fc9c9a..04bc1393 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -826,11 +826,6 @@
icon_state = "blueprint2"
crafting_recipe_types = list(/datum/crafting_recipe/scoutcarbine)
-/obj/item/book/granter/crafting_recipe/blueprint/neostead
- name = "neostead 2000 blueprint"
- icon_state = "blueprint2"
- crafting_recipe_types = list(/datum/crafting_recipe/neostead)
-
/obj/item/book/granter/crafting_recipe/blueprint/gauss
name = "gauss rifle blueprint"
icon_state = "blueprint2"
diff --git a/code/modules/fallout/f13lootdrop.dm b/code/modules/fallout/f13lootdrop.dm
index cc58e493..d9c7165d 100644
--- a/code/modules/fallout/f13lootdrop.dm
+++ b/code/modules/fallout/f13lootdrop.dm
@@ -857,6 +857,7 @@
name = "very low tier non-hobo ballistic gun"
icon_state = "gunverylow_loot"
loot = list(/obj/effect/spawner/bundle/f13/ninemil,
+ /obj/effect/spawner/bundle/f13/js45,
/obj/effect/spawner/bundle/f13/caravan_shotgun,
/obj/effect/spawner/bundle/f13/remington,
/obj/effect/spawner/bundle/f13/widowmaker,
@@ -868,11 +869,13 @@
name = "low tier ballistic gun"
icon_state = "gunlow_loot"
loot = list(/obj/effect/spawner/bundle/f13/m1911,
+ /obj/effect/spawner/bundle/f13/js45,
/obj/effect/spawner/bundle/f13/thatgun,
/obj/effect/spawner/bundle/f13/n99,
/obj/effect/spawner/bundle/f13/colt357,
/obj/effect/spawner/bundle/f13/huntingshotgun,
/obj/effect/spawner/bundle/f13/police_pistol,
+ /obj/effect/spawner/bundle/f13/beretta,
/obj/effect/spawner/bundle/f13/beretta/select,
)
@@ -997,7 +1000,7 @@
)
/obj/effect/spawner/bundle/f13/mosin
- name = "mosin nagant and ammo spawner"
+ name = "m1903 and ammo spawner"
items = list(
/obj/item/gun/ballistic/rifle/mosin,
/obj/item/ammo_box/a762mm
@@ -1024,6 +1027,13 @@
/obj/item/ammo_box/magazine/m45
)
+/obj/effect/spawner/bundle/f13/js45
+ name = "js45 and ammo spawner"
+ items = list(
+ /obj/item/gun/ballistic/automatic/pistol/m1911/compact,
+ /obj/item/ammo_box/magazine/m45
+ )
+
/obj/effect/spawner/bundle/f13/ninemil
name = "9mm pistol and ammo spawner"
items = list(
@@ -1263,7 +1273,7 @@
)
/obj/effect/spawner/bundle/f13/beretta/select
- name = "select-fire beretta pistol and ammo spawner"
+ name = "select-fire vp70 pistol and ammo spawner"
items = list(
/obj/item/gun/ballistic/automatic/pistol/beretta/automatic,
/obj/item/ammo_box/magazine/m9mmds/
@@ -1283,13 +1293,6 @@
/obj/item/ammo_box/magazine/m14mm
)
-/obj/effect/spawner/bundle/f13/neostead
- name = "Neostead 2000 shotgun and ammo spawner"
- items = list(
- /obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt,
- /obj/item/ammo_box/shotgun/buck
- )
-
/obj/effect/spawner/bundle/f13/auto5
name = "Auto 5 shotgun and ammo spawner"
items = list(
@@ -2334,7 +2337,6 @@
icon_state = "blueprint_loot"
lootcount = 1
loot = list(
- /obj/item/book/granter/crafting_recipe/blueprint/neostead,
/obj/item/book/granter/crafting_recipe/blueprint/riotshotgun,
/obj/item/book/granter/crafting_recipe/blueprint/sniper,
/obj/item/book/granter/crafting_recipe/blueprint/brushgun,
diff --git a/code/modules/fallout/storage/boxes.dm b/code/modules/fallout/storage/boxes.dm
index 8f7c00e8..d7c015ff 100644
--- a/code/modules/fallout/storage/boxes.dm
+++ b/code/modules/fallout/storage/boxes.dm
@@ -74,7 +74,7 @@ list(/obj/item/stack/sheet/metal = 20,
)
var/randomgun2 = pick(
/obj/item/book/granter/crafting_recipe/blueprint/rangemaster,
- /obj/item/book/granter/crafting_recipe/blueprint/neostead,
+ /obj/item/book/granter/crafting_recipe/blueprint/citykiller,
)
var/randomgun3 = pick(
/obj/item/book/granter/crafting_recipe/blueprint/riotshotgun,
diff --git a/code/modules/jobs/job_types/enclave.dm b/code/modules/jobs/job_types/enclave.dm
index 73926e3c..681fcc45 100644
--- a/code/modules/jobs/job_types/enclave.dm
+++ b/code/modules/jobs/job_types/enclave.dm
@@ -296,7 +296,7 @@
loadout_options = list(
/datum/outfit/loadout/sgt_plasrifle, // Plasma rifle + Mk23
- /datum/outfit/loadout/sgt_cqc, //Neostead + Plaspistol
+ /datum/outfit/loadout/sgt_cqc, // citykiller + Plaspistol
/datum/outfit/loadout/sgt_classic, // AK-112 + Plaspistol
)
@@ -332,7 +332,7 @@
/datum/outfit/loadout/sgt_cqc
name = "Close Quarters Assaultman"
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller
backpack_contents = list(
/obj/item/ammo_box/shotgun/slug = 2,
/obj/item/ammo_box/shotgun/buck = 2,
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index 372fa168..06154739 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -212,7 +212,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/datum/outfit/loadout/ncrcptshotgun
name = "Frontliner"
- suit_store = /obj/item/gun/ballistic/automatic/shotgun/pancor
+ suit_store = /obj/item/gun/ballistic/automatic/shotgun/caws
backpack_contents = list(
/obj/item/ammo_box/magazine/d12g = 3,
)
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 0f91bfca..b78b304d 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -42,7 +42,8 @@
icon_state = "autopipe_belt-[round(ammo_count(),9)]"
/obj/item/ammo_box/magazine/m556mm
- name = "rifle magazine (5.56mm)"
+ name = "twenty-round magazine (5.56mm)"
+ desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds twenty rounds, ideal for infantrymen."
icon = 'icons/fallout/objects/guns/ammo.dmi'
icon_state = "mrifle"
ammo_type = /obj/item/ammo_casing/a556mm
@@ -55,7 +56,8 @@
start_empty = 1
/obj/item/ammo_box/magazine/m556mm/small
- name = "small rifle magazine (5.56mm)"
+ name = "ten-round rifle magazine (5.56mm)"
+ desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds ten rounds, ideal for hunting and target shooting."
icon_state = "mriflesmall"
max_ammo = 10
@@ -63,7 +65,8 @@
start_empty = 1
/obj/item/ammo_box/magazine/m556mm/extended
- name = "extended rifle magazine (5.56mm)"
+ name = "thirty-round magazine (5.56mm)"
+ desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds thirty rounds, ideal for modern warfare."
icon_state = "mrifleext"
max_ammo = 30
@@ -71,8 +74,8 @@
start_empty = 1
/obj/item/ammo_box/magazine/m556mm/drum
- name = "rifle drum magazine (5.56mm)"
- desc = "A large drum magazine chambered for 5.56."
+ name = "fifty-round magazine (5.56mm)"
+ desc = "An Armalite-style magazine with a reinforced spring meant for 5.56x45mm or .223 Remington ammo. Holds fifty rounds, ideal for suppressive fire."
icon_state = "mdrum"
max_ammo = 50
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index de2bbdaa..97a62cc9 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -85,7 +85,7 @@
name = "10mm pistol cylinder"
ammo_type = /obj/item/ammo_casing/c10mm
caliber = "10mm"
- max_ammo = 12
+ max_ammo = 8
/obj/item/ammo_box/magazine/internal/cylinder/rev44
name = "44 magnum cylinder"
@@ -93,6 +93,10 @@
caliber = "44"
max_ammo = 6
+/obj/item/ammo_box/magazine/internal/cylinder/rev44/percussion
+ name = "44 ball cylinder"
+ max_ammo = 5
+
/obj/item/ammo_box/magazine/internal/cylinder/rev357
name = "357 magnum cylinder"
ammo_type = /obj/item/ammo_casing/a357
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index fb444cdd..d25fbdb2 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1130,7 +1130,7 @@ CODE FOR RESKIN
)
-DUAL TUBE PUMP ACTION (seems redundant with neostead but why not keep it.)
+DUAL TUBE PUMP ACTION (seems redundant with x but why not keep it.)
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
. = ..()
. += "Alt-click to pump it."
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 3ccc3826..421ccb3e 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -444,9 +444,9 @@
//Scout carbine Keywords: NCR, 5.56mm, Semi-auto, 20 (10-50) round magazine. Special modifiers:spread -1
/obj/item/gun/ballistic/automatic/service/carbine
name = "scout carbine"
- desc = "A cut down version of the standard-issue service rifle tapped with mounting holes for a scope. Shorter barrel, lower muzzle velocity."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
- icon_state = "scout_carbine"
+ desc = "A Gun Runners made Ruger AC556 carbine meant to replace the service rifle for specialist and scouting uses. Chambered in 5.56mm."
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "ac556"
spread = 1.2
slowdown = 0.05
can_scope = TRUE
@@ -527,9 +527,10 @@
//M1 Garand Keywords: .308, Semi-auto, 8 rounds internal
/obj/item/gun/ballistic/automatic/m1garand
- name = "M1 Garand"
- desc = "The WWII American Classic. Still has that satisfiying ping."
- icon_state = "m1garand"
+ name = "battle rifle"
+ desc = "A pre-war sized down M1 Garand semi-automatic rifle chambered for .308, most sales of this particular model were due to a countrywide interest during the 2076 Memorial Day."
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "battle"
item_state = "rifle"
icon_prefix = "308"
force = 20
@@ -564,17 +565,17 @@
//Old Glory Keywords: UNIQUE, .308, Semi-auto, 8 rounds internal, Damage +10
/obj/item/gun/ballistic/automatic/m1garand/oldglory
- name = "Old Glory"
- desc = "This Machine kills communists!"
- icon_state = "oldglory"
+ name = "\improper Old Glory"
+ desc = "A modified hard-hitting variant of the battle rifle wrapped with a United States flag. You can see 'WELL THIS MACHINE KILLS COMMIES' etched on the handguard."
+ icon_state = "thismachine"
extra_damage = 10
extra_penetration = 0.12
//Republics Pride Keywords: UNIQUE, 7.62mm, Semi-auto, 8 rounds internal, Scoped, Damage -3, Penetration +0.1
/obj/item/gun/ballistic/automatic/m1garand/republicspride
- name = "Republic's Pride"
- desc = "A well-tuned scoped M1C rifle crafted by master gunsmith from the Gunrunners. Chambered in 7.62x51."
- icon_state = "republics_pride"
+ name = "\improper Republic's Pride"
+ desc = "A well-tuned battle rifle crafted by one of the Gun Runners' master gunsmiths."
+ icon_state = "lieutenant"
item_state = "scoped308"
zoomable = TRUE
zoom_amt = 10
@@ -609,9 +610,9 @@
//DKS 501 sniper rifle Keywords: .308, Semi-auto, 7 round magazine, Scoped, Extra speed +500, Fire delay +1, 43dmg
/obj/item/gun/ballistic/automatic/marksman/sniper
name = "sniper rifle"
- desc = "A DKS 501, chambered in .308 Winchester. With a light polymer body, it's suited for long treks through the desert."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
- icon_prefix = "sniperrifle"
+ desc = "A pre-war DKS 501 semi-automatic sniper rifle, chambered in .308 Winchester. With a light polymer body, it's suited for long treks through the desert."
+ icon = 'icons/obj/guns/gunfruits2022/rifles_large.dmi'
+ icon_prefix = "dks"
icon_state = "sniper_rifle"
item_state = "sniper_rifle"
mag_type = /obj/item/ammo_box/magazine/w308
@@ -650,12 +651,11 @@
/obj/item/gun/ballistic/automatic/marksman/sniper/snipervenator
name = "explorer sniper rifle"
- desc = "The customized sniper rifle, fitted with a telescopic sight for extreme accuracy and chambered for a high-ballistic performance centerfire cartridge. It is a superior version of the regular sniper rifle and is decorated with the flag of the bull and tokens of a hunt."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ desc = "A customized DKS-501 sniper rifle, fitted with a telescopic sight for extreme accuracy and chambered for a high-ballistic performance centerfire cartridge. It is a superior version of the regular sniper rifle and is decorated with the flag of the bull and tokens of a hunt."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi'
- icon_state = "venator_sniper"
+ icon_state = "hunterdks"
item_state = "venator_sniper"
fire_delay = 5
slowdown = 0.12
@@ -818,7 +818,7 @@
//FAL Keywords: 7.62mm, 10/20 Rounds, Superhigh tier
/obj/item/gun/ballistic/automatic/assault_rifle/fal
name = "automatic battle rifle"
- desc = "A uniquely powerful pre-war FAL PARA battle rifle developed by FN Herstal. The shorter barrel and lightweight polymer furniture made it ideal for paratroopers across the European Commonwealth. Chambered in 7.62mm."
+ desc = "A uniquely powerful pre-war FN FAL HPFA battle rifle developed by FN Herstal. It's incredibly hefty, but its accuracy and stopping power made it a staple across the European Commonwealth and South America. Chambered in 7.62mm."
icon_state = "fal"
item_state = "fal"
fire_sound = 'sound/f13weapons/762assault_rifle.ogg'
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 971f8d98..9bd9a74a 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -53,7 +53,7 @@
//.22 Sport Keywords: .22, Semi-auto, 16 round magazine, Suppressed
/obj/item/gun/ballistic/automatic/pistol/pistol22
name = ".22 pistol"
- desc = "A Ruger Mk. IV competition/hunting handgun chambered for the .22LR round."
+ desc = "An integrally suppressed Ruger Mk. IV competition/hunting handgun chambered for the .22LR round."
icon_state = "silenced22"
mag_type = /obj/item/ammo_box/magazine/m22
weapon_weight = WEAPON_LIGHT
@@ -69,7 +69,7 @@
//N99 10mm Keywords: 10mm, Semi-auto, 12/24 round magazine
/obj/item/gun/ballistic/automatic/pistol/n99
name = "10mm pistol"
- desc = "The Colt N99, an easily maintained, large-framed, long-barreled combat pistol in use by the US Army before the war. Comes with an integrated laser sight module."
+ desc = "The Colt N99 is an easily maintained, large-framed, long-barreled combat pistol in use by the US Army before the war. Comes with an integrated laser aiming module."
icon_state = "n99"
mag_type = /obj/item/ammo_box/magazine/m10mm
fire_delay = 3
@@ -102,9 +102,9 @@
//Crusader pistol
/obj/item/gun/ballistic/automatic/pistol/n99/crusader
- name = "\improper Crusader pistol" //DEPRECATED!!!!!!!
- desc = "A large-framed N99 pistol emblazoned with the colors and insignia of the Brotherhood of Steel. It feels heavy in your hand."
- force = 18
+ name = "\improper Crusader pistol" //No longer deprecated :)
+ desc = "A modified Brotherhood of Steel version of a large-frame US Army issue pistol of undisclosed make to be used by power armor users."
+ force = 20
icon_state = "crusader"
item_state = "crusader"
can_attachments = FALSE
@@ -114,7 +114,7 @@
//Type 17 Keywords: 10mm, Semi-auto, 12/24 round magazine. Special modifiers: damage +1, spread +1
/obj/item/gun/ballistic/automatic/pistol/type17
name = "Chinese pistol"
- desc = "A standard issue Chinese Type-17 combat pistol, hacked apart and turned into a magazine-fed 10mm self-loader."
+ desc = "A standard-issue Norinco Type 80 personal defense weapon issued to PLA officers and crewmen at the height of the Sino-American war. It found its way to the US in droves through separatist cells and the invasion force. Chambered in 10mm."
icon_state = "chinapistol"
mag_type = /obj/item/ammo_box/magazine/m10mm
fire_delay = 1
@@ -122,12 +122,12 @@
spread = 3
can_suppress = FALSE
fire_sound = 'sound/f13weapons/10mm_fire_02.ogg'
- extra_damage = 2
+ extra_penetration = 0.1
-//Browning Hi-power Keywords: 9mm, Semi-auto
+//Stallard Arms JS-9 Keywords: 9mm, Semi-auto
/obj/item/gun/ballistic/automatic/pistol/ninemil
- name = "9mm pistol"
- desc = "The gold standard of nine-millimeter pistols, the Browning Hi-Power. A single-action pistol manufactured by FN Herstal prior to the war, reliable even today."
+ name = "cheap 9mm pistol"
+ desc = "A mass produced pre-war Stallard Arms JS-9 pistol that looks as if it was milled in one piece from a solid block of pure steel. It's actually surprisingly reliable, despite the tattle-tales of many-a pretend gunsmiths."
icon_state = "ninemil"
mag_type = /obj/item/ammo_box/magazine/m9mmds
weapon_weight = WEAPON_LIGHT
@@ -148,6 +148,7 @@
//Blacklisted Parts
blacklistedparts = list("stock")
extra_damage = 5
+ block_chance = 1
//Maria Keywords: UNIQUE, 9mm, Semi-auto, 10 round magazine. Special modifiers: fire delay -1, damage +10, penetration +0.2
/obj/item/gun/ballistic/automatic/pistol/ninemil/maria
@@ -174,11 +175,11 @@
fire_sound = 'sound/f13weapons/9mm.ogg'
-//Hi-Power+ Keywords: 9mm, Semi-auto. Special modifiers: spread -1
-/obj/item/gun/ballistic/automatic/pistol/beretta
- name = "Advanced 9mm pistol"
- desc = "A combat modification of the standard Browning Hi-Power, made for private security firms. It features a longer barrel and a heavier trigger pull."
- icon_state = "beretta"
+//Hi-Power Keywords: 9mm, Semi-auto. Special modifiers: spread -1
+/obj/item/gun/ballistic/automatic/pistol/beretta //misleading old typepath, too much work to change it now
+ name = "9mm pistol"
+ desc = "The gold standard of nine-millimeter pistols, the Browning Hi-Power. A single-action pistol manufactured by FN Herstal prior to the war, reliable even today."
+ icon_state = "hipower"
mag_type = /obj/item/ammo_box/magazine/m9mmds
weapon_weight = WEAPON_LIGHT
spread = 1
@@ -190,11 +191,11 @@
fire_sound = 'sound/f13weapons/9mm.ogg'
extra_damage = 8
-//Beretta M93R Keywords: 9mm, Automatic, 15 round magazine
-/obj/item/gun/ballistic/automatic/pistol/beretta/automatic
- name = "Advanced 9mm autopistol"
- desc = "Ye sons of the self-loader, weep over Browning, who clothed you in steel, with mechanical delights, who put reliability upon your designs. An utter affront to any gunsmith, a modified Browning Hi-Power that fires fully automatic - with a permanently attached muzzle brake."
- icon_state = "m93r"
+//H&K VP70 Keywords: 9mm, Automatic, 15 round magazine
+/obj/item/gun/ballistic/automatic/pistol/beretta/automatic //ditto
+ name = "9mm folk's pistol"
+ desc = "A modified pre-war H&K VP70 with select-fire capabilities, extremely lightweight thanks to its sleek polymer frame. It was used to great effect by the European Commonwealth before their ultimate collapse in 2060."
+ icon_state = "vp70"
w_class = WEIGHT_CLASS_NORMAL
fire_delay = 3
burst_size = 2
@@ -253,6 +254,17 @@
blacklistedparts = list("stock")
extra_damage = 5
+//JS45
+/obj/item/gun/ballistic/automatic/pistol/m1911/compact
+ name = "compact .45 Auto pistol"
+ desc = "A mass produced pre-war Maverick JS-45 pistol that looks as if it was milled in one piece from a solid block of pure steel. It won't hit as hard as a full-size pistol, but it's a lot lighter and fits in more places."
+ icon_state = "js45"
+ w_class = WEIGHT_CLASS_SMALL
+ slowdown = 0.03
+ recoil = 0.85
+ can_attachments = FALSE
+ extra_damage = 0
+
//M1911 Custom Keywords: .45 ACP, Semi-auto, 8 round magazine. Special modifiers: damage +1
/obj/item/gun/ballistic/automatic/pistol/m1911/custom
name = "Customized .45 Auto pistol"
@@ -322,10 +334,10 @@
//Blacklisted Parts
blacklistedparts = list("stock")
-//El Capitan Keywords: 14mm, Semi-auto, 7 round magazine, Heavy. Special modifiers: damage -2
+//The Captain Keywords: 14mm, Semi-auto, 7 round magazine, Heavy. Special modifiers: AP +10%
/obj/item/gun/ballistic/automatic/pistol/deagle/elcapitan
- name = "El Capitan"
- desc = "An expertly modified Mk. XIX Desert Eagle, re-chambered to SIG's 14.5mm ammunition. It's chromed, with a golden trigger - and features a large muzzle brake to help mitigate the recoil."
+ name = "\improper The Captain"
+ desc = "A pre-war L.A.R. Manufacturing \"Grizzly Mk. V\" pistol based on the M1911, firing SIG's 14mm cartridge. This one has been custom-fit by the Gun Runners and is one of several gifted to influential NCR Officers as a token of veterancy."
icon_state = "elcapitan"
item_state = "deagle"
mag_type = /obj/item/ammo_box/magazine/m14mm
@@ -357,7 +369,7 @@
//14mm Pistol Keywords: 14mm, Semi-auto, 7 rounds, Heavy
/obj/item/gun/ballistic/automatic/pistol/pistol14
name = "14mm pistol"
- desc = "The SIG Sauer P-127 pistol is an excellent pre-war hand cannon, chambered for the powerful 14.5mm round - and intended for use in big game hunting and competition shooting."
+ desc = "The SIG Sauer P-127 pistol is a pre-war cannon hand manufactured in the European Commonwealth, chambered for the powerful 14mm round - and intended for use in big game hunting and competition shooting."
icon_state = "pistol14"
mag_type = /obj/item/ammo_box/magazine/m14mm
force = 15
@@ -390,9 +402,9 @@
extra_penetration = 0.15 //35% AP Total
/obj/item/gun/ballistic/automatic/pistol/pistol14/custom
- name= "Custom 14mm pistol" //IDK WTF THIS IS
+ name= "custom 14mm pistol" //IDK WTF THIS IS
desc = "A Swiss SIG-Sauer 14mm handgun, this one is a finely tuned custom firearm. How'd this get into service?"
- icon_state = "lildev"
+ icon_state = "pistol14_compact"
w_class = WEIGHT_CLASS_SMALL
fire_delay = 4
@@ -404,7 +416,6 @@
mag_type = /obj/item/ammo_box/magazine/m14mm
force = 25
fire_delay = 10
- icon_state = "nexus"
recoil = 2
fire_sound = 'sound/f13weapons/magnum_fire.ogg'
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 0296dca7..569f1121 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -130,7 +130,7 @@
// .38 Detective Keywords: .38, Double action, 6 rounds cylinder, Short barrel, Bootgun
/obj/item/gun/ballistic/revolver/detective
name = ".38 revolver"
- desc = "An easily concealable, poorly-made .38 revolver. The manufacturer is unknown"
+ desc = "An easily concealable, poorly-made .38 revolver. The manufacturer is unknown."
icon_state = "detective"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
@@ -146,8 +146,8 @@
//S&W 45 Keywords: .45, Single action, 7 rounds cylinder, Long barrel
/obj/item/gun/ballistic/revolver/revolver45
- name = ".45 Auto revolver"
- desc = "A customized S&W Model 625 revolver chambered for .45 ACP."
+ name = ".45 Casull revolver"
+ desc = "A simple Casull revolver chambered for .45 Auto. Its origins are lost to the mist of time."
item_state = "45revolver"
icon_state = "45revolver"
icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
@@ -157,8 +157,6 @@
fire_sound = 'sound/f13weapons/45revolver.ogg'
extra_damage = 5
-
-
////////////////////
// .357 REVOLVERS //
////////////////////
@@ -188,13 +186,6 @@
icon = 'icons/fallout/objects/guns/ballistic.dmi'
icon_prefix = "357chain"
-/obj/item/gun/ballistic/revolver/colt357/mateba //this is a skin that rigbe wanted
- name = "\improper Unica 6 auto-revolver"
- desc = "A pre-war high-power autorevolver commonly used by people who think they look cool."
- icon_state = "mateba"
- item_state = "mateba"
- fire_sound = 'sound/f13weapons/magnum_fire.ogg'
-
//Lucky Keywords: UNIQUE, .357, Double action, 6 rounds cylinder, Block chance, Fire delay -1
/obj/item/gun/ballistic/revolver/colt357/lucky
name = "Lucky"
@@ -204,13 +195,13 @@
icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
w_class = WEIGHT_CLASS_SMALL
fire_delay = 3
- block_chance = 50
- extra_penetration = 0.05
+ block_chance = 40
+ extra_penetration = 0.1
//Police revolver Keywords: .357, Double action, 6 rounds cylinder, Pocket Pistol
/obj/item/gun/ballistic/revolver/police
name = "police revolver"
- desc = "An unmarked snub-nosed double-action pre-war revolver meant for police use, phased out long ago in favor of semi-automatic pistols."
+ desc = "An unmarked snub-nosed double-action pre-war revolver meant for law enforcement, it was phased out long ago in favor of self-loading pistols. Chambered in .38 Special or .357 Magnum."
icon_state = "police"
icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev357
@@ -228,7 +219,7 @@
//.44 Magnum revolver Keywords: .44, Double action, 6 rounds cylinder
/obj/item/gun/ballistic/revolver/m29
name = ".44 magnum revolver"
- desc = "A robust S&W Model 29 revolver, uniquely powerful and reliable. Do you feel lucky, punk?"
+ desc = "An uniquely powerful S%W Model 29 double-action revolver, chambered for .44 Magnum rounds. Do you feel lucky, punk?"
item_state = "model29"
icon_state = "m29"
icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
@@ -239,7 +230,7 @@
scope_x_offset = 6
scope_y_offset = 24
fire_sound = 'sound/f13weapons/44mag.ogg'
- extra_damage = 5
+ extra_damage = 3 //35
/obj/item/gun/ballistic/revolver/m29/alt
name = "modern .44 magnum revolver"
@@ -247,18 +238,7 @@
item_state = "44magnum"
icon_state = "mysterious_m29"
can_scope = FALSE
- extra_damage = 5
- extra_speed = 80
-
-//Chiappa Rhino Keywords: Enclave, .44, Double action, 6 rounds cylinder
-/obj/item/gun/ballistic/revolver/m29/rhino_america
- name = "Rhino America"
- desc = "A revolver machined from a solid aluminium block. This one is coated in gold paint with its grip painted to look like the flag of the United States of America. This model has been specifically made to fire .44 magnum cartridges."
- item_state = "rhino_america"
- icon_state = "rhino_america"
- can_scope = FALSE
- extra_damage = 23 //for a combined total of 55 damage, as good as the 14mm pistol and plasma pistol.
- fire_delay = 4 //it should still fire slow but not too slow
+ extra_speed = 100
//Peacekeeper Keywords: Experimental, .44, Double action, 6 rounds cylinder
/obj/item/gun/ballistic/revolver/m29/peacekeeper
@@ -281,29 +261,35 @@
w_class = WEIGHT_CLASS_SMALL
spread = 3
extra_damage = 0
+ extra_speed = -30
-//.44 single action Keywords: .44, Single action, 6 rounds cylinder, Long barrel
+//.44 single action Keywords: .44, Single action, 5 rounds cylinder, Long barrel
/obj/item/gun/ballistic/revolver/revolver44
- name = "\improper .44 magnum single-action revolver"
- desc = "I hadn't noticed, but there on his hip, was a moderately sized iron..."
+ name = "\improper .44 percussion revolver"
+ desc = "A five pound sixteen-inch single-action Colt Walker chambered in .44 ball. It hits a /lot/ harder than other revolvers, at the heavy cost of speed and armor penetration. It would take a Texan to shoot it."
item_state = "44colt"
icon_state = "44colt"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
- fire_delay = 5
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/percussion
+ fire_delay = 6
spread = 0
+ recoil = 3
fire_sound = 'sound/f13weapons/44revolver.ogg'
-
+ extra_damage = 10
+ extra_speed = -150
+ extra_penetration = -0.1
+ icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
//Desert Ranger revolver Keywords: .44, Single action, 6 rounds cylinder,
/obj/item/gun/ballistic/revolver/revolver44/desert_ranger
- name = "desert ranger revolver"
- desc = "I hadn't noticed, but there on his hip, was a really spiffy looking iron..."
- fire_delay = 4
+ name = "desert ranger .44 revolver"
+ desc = "A five pound sixteen-inch single-action Colt Walker chambered in .44 ball. They hail from back east, what used to be called Nevada. Their heritage stretches back to the days of the Texas Rangers."
+ fire_delay = 3
+ extra_speed = 0
//Sheriff's revolver Keywords: .44, Single action, 6 rounds cylinder, 5 less damage than sequoia, 20% more pen
/obj/item/gun/ballistic/revolver/revolver44/sheriff
- name = "Biggest Iron"
+ name = "Big Iron"
desc = "There was forty feet between them, when they stopped to make their play..."
force = 25
casing_ejector = TRUE//WHAT THE FUCK IS THIS GUN? FASTEST HAND IN THE WEST BETWEEN SHOTS, THAT'S WHAT.
@@ -384,16 +370,18 @@
extra_damage = 9
extra_penetration = 0.05 //10-15% AP Total
-//Colt 6520 Revolver Keywords: 10mm, Semi-Automatic, 12 rounds internal, Revolver - Somehow! (Balanced around N99 - that can take attach, this can't)
+//Colt 6520 Revolver Keywords: 10mm, Semi-Automatic, 8 rounds internal, Revolver - Somehow! (Balanced around N99 - that can take attach, this can't)
/obj/item/gun/ballistic/revolver/colt6520
- name = "Colt 6520 revolver"
- desc = "A Colt 6520 'automatic' revolver. This oddity was developed by Colt prior to the Great War, featuring a slide mechanism working in tandum with the revolving cylander. This weapon manages to eject its shells automatically!"
- icon_state = "colt6520"
+ name = "10mm revolver"
+ desc = "A very modern pre-war double-action revolver with a separated top that breaks open, making reloading much easier and automatically ejecting all spent rounds. Chambered in 10mm, it was an inexpensive alternative to the Colt 6520."
+ icon_state = "10milrev"
+ icon = 'icons/obj/guns/gunfruits2022/pistols.dmi'
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/colt6520
fire_sound = 'sound/f13weapons/10mm_fire_02.ogg'
recoil = 0.3
fire_delay = 4 // Slightly higher than the n99
extra_damage = 10 // +4 damage compared to n99
+ extra_speed = 100
/////////////
// NEEDLER //
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 1f79a2ac..961e8f9d 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -107,8 +107,9 @@
//Cowboy Repeater Keywords: .357, Lever action, 12 round internal, Long barrel
/obj/item/gun/ballistic/rifle/repeater/cowboy
name = "cowboy repeater"
- desc = "A lever action rifle chambered in .357 Magnum. Smells vaguely of whiskey and cigarettes."
- icon_state = "cowboyrepeater"
+ desc = "A beautifully preserved lever action rifle chambered in .357 Magnum, for the cowboy in all of us."
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "crep"
item_state = "cowboyrepeater"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube357
extra_speed = 300
@@ -120,8 +121,9 @@
//Trail carbine Keywords: .44, Lever action, 12 round internal, Long barrel
/obj/item/gun/ballistic/rifle/repeater/trail
name = "trail carbine"
- desc = "A lever action rifle chambered in .44 Magnum."
- icon_state = "trailcarbine"
+ desc = "A wonderfully kept lever action rifle chambered in .44 Magnum. Don't suffer the lawman to live."
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "tcar"
item_state = "trailcarbine"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube44
extra_speed = 200
@@ -133,8 +135,9 @@
//Brush gun Keywords: .45-70, Lever action, 10 round internal, Long barrel
/obj/item/gun/ballistic/rifle/repeater/brush
name = "brush gun"
- desc = "A short lever action rifle chambered in the heavy 45-70 round. Issued to NCR Veteran Rangers in the absence of heavier weaponry."
- icon_state = "brushgun"
+ desc = "A heavy and expensive lever-action rifle chambered for thhe outrageously powerful .45-70 Government round. It's favored by NCR Rangers."
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "brushie"
item_state = "brushgun"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube4570
extra_speed = 100
@@ -163,8 +166,9 @@
//Hunting Rifle Keywords: .308, Bolt-action, 5 rounds internal
/obj/item/gun/ballistic/rifle/hunting
name = "hunting rifle"
- desc = "A sturdy hunting rifle, chambered in .308. and in use before the war."
- icon_state = "308"
+ desc = "A sturdy and reliable pre-war Remington hunting rifle that has seen better days. Chambered in .308"
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
+ icon_state = "hunting"
item_state = "308"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/hunting
sawn_desc = "A hunting rifle, crudely shortened with a saw. It's far from accurate, but the short barrel makes it quite portable."
@@ -192,7 +196,7 @@
//Remington rifle Keywords: 7.62, Bolt-action, 5 rounds internal
/obj/item/gun/ballistic/rifle/hunting/remington
- name = "Remington rifle"
+ name = "upgraded hunting rifle"
desc = "A militarized hunting rifle rechambered to 7.62. This one has had the barrel floated with shims to increase accuracy."
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/hunting/remington
fire_delay = 5
@@ -215,7 +219,7 @@
//Paciencia Keywords: UNIQUE, .308, Bolt-action, 3 rounds internal, Scoped
/obj/item/gun/ballistic/rifle/hunting/paciencia
name = "Paciencia"
- desc = "A modified .308 hunting rifle with a reduced magazine but an augmented receiver. A Mexican flag is wrapped around the stock. You only have three shots- make them count."
+ desc = "A modified .308 hunting rifle with a reduced magazine but an augmented receiver. A Mexican flag is wrapped around the stock. You only have three shots - make them count."
icon_state = "paciencia"
item_state = "paciencia"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/hunting/paciencia
@@ -239,10 +243,11 @@
..()
//Mosin-Nagant Keywords: LEFT-OVER FOR RUSSIAN MOBS, 7.62, Bolt-action, 5 rounds internal. Better pen than the Enfield, lower damage.
-/obj/item/gun/ballistic/rifle/mosin
- name = "Mosin-Nagant m38"
- desc = "A rusty old Russian bolt action chambered in 7.62."
- icon_state = "mosin"
+/obj/item/gun/ballistic/rifle/mosin //I'll probably nuke this holdover later
+ name = "old army rifle"
+ desc = "A venerable bolt-action Springfield M1903 originally used by the US Army as far back as its model name suggests. It has definitely seen better days."
+ icon_state = "m1903"
+ icon = 'icons/obj/guns/gunfruits2022/rifles.dmi'
item_state = "308"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction
extra_speed = 600
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index dac1f68a..5ab368b2 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -15,7 +15,7 @@
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
- icon_prefix = "shotgunpump"
+ icon_prefix = "shotgun"
icon_state = "shotgun"
item_state = "shotgun"
w_class = WEIGHT_CLASS_BULKY
@@ -96,8 +96,8 @@
//Caravan shotgun Keywords: Shotgun, Double barrel, saw-off, extra damage +3, extra pen 5%
/obj/item/gun/ballistic/revolver/caravan_shotgun
name = "caravan shotgun"
- desc = "A common over-under double barreled shotgun made in the post-war era."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ desc = "A beat-up pre-war European style over/under double barrel shotgun. It still works, surprisingly."
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "caravan"
@@ -109,7 +109,7 @@
spread = 20
force = 20
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/simple
- sawn_desc = "Short and concealable, terribly uncomfortable to fire, but worse on the other end."
+ sawn_desc = "A beat-up pre-war European style over/under double barrel shotgun. The stock has been mostly sawn away, and so has the barrel."
fire_sound = 'sound/f13weapons/caravan_shotgun.ogg'
recoil = 1.55
@@ -133,9 +133,9 @@
//Widowmaker Keywords: Shotgun, Double barrel, saw-off, extra damage +2, extra pen 15%
/obj/item/gun/ballistic/revolver/widowmaker
- name = "Winchester Widowmaker"
- desc = "Old-world Winchester Widowmaker double-barreled 12 gauge shotgun, with mahogany furniture"
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ name = "coach gun"
+ desc = "An All-American wild west classic, courtesy of Winchester. Omar's coming!"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "widowmaker"
@@ -147,7 +147,7 @@
fire_delay = 2
spread = 20
force = 20
- sawn_desc = "Someone took the time to chop the last few inches off the barrel and stock of this shotgun. Now, the wide spread of this hand-cannon's short-barreled shots makes it perfect for short-range crowd control."
+ sawn_desc = "...\"What is this, a pirate gun?\"..."
fire_sound = 'sound/f13weapons/max_sawn_off.ogg'
recoil = 0.55
@@ -170,14 +170,14 @@
//Single shotgun
/obj/item/gun/ballistic/revolver/singleshotgun
- name = "Pardner 77 single-shot shotgun"
+ name = "single-shot shotgun"
desc = "An old-world New England Pardner shotgun, 2077 production line - right before the nukes."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
- icon_state = "pardner"
+ icon_state = "single"
item_state = "shotgundouble"
- icon_prefix = "pardner"
+ icon_prefix = "single"
mag_type = /obj/item/ammo_box/magazine/internal/shot/pardner
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
@@ -186,26 +186,27 @@
slowdown = 0.1
extra_damage = 4
extra_penetration = 0.05
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
/obj/item/gun/ballistic/revolver/singleshotgun/axe
- name = "Pardner 77 hatchet"
+ name = "'77 hatchet shotgun"
desc = "A New England Pardner that has been sawn down and had a fireaxe tightly attached to the barrel. The stock has been replaced by something more comfortable to hold on to."
- icon_state = "pardneraxe"
+ icon_state = "singleaxe"
slowdown = 0.08
force = 35
armour_penetration = 0.1 //Not for the bullet. This is the gun.
wound_bonus = 15 //Same as above
extra_damage = 2 //Half of parent
- icon_prefix = "pardneraxe"
+ icon_prefix = "singleaxe"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
//Hunting shotgun Keywords: Shotgun, Pump-action, 4 rounds
/obj/item/gun/ballistic/shotgun/hunting
name = "hunting shotgun"
- desc = "A traditional hunting shotgun with wood furniture and a four-shell capacity underneath."
- icon_state = "pump"
+ desc = "The pinnacle of firearms engineering, a pump-action shotgun with wood furniture. With its 12 gauge chamber, it doesn't matter what you're hunting - it'll go down."
+ icon_state = "hunting"
item_state = "shotgunpump"
- icon_prefix = "shotgunpump"
+ icon_prefix = "hunting"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
fire_delay = 3
@@ -221,12 +222,12 @@
//Police Shotgun Keywords: Shotgun, Pump-action, 6 rounds, Folding stock, Flashlight rail
/obj/item/gun/ballistic/shotgun/police
name = "police shotgun"
- desc = "A pre-war shotgun with large magazine and folding stock, made from steel and polymers. Flashlight attachment rail."
- icon_state = "shotgunpolice"
+ desc = "A pre-war pump-action SPAS-12 shotgun that was widely adopted by police institutions across the European Commonwealth and United States."
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
+ icon_state = "police"
item_state = "shotgunpolice"
- icon_prefix = "shotgunpolice"
+ icon_prefix = "police"
mag_type = /obj/item/ammo_box/magazine/internal/shot/police
- sawn_desc = "Portable but with a poor recoil managment."
w_class = WEIGHT_CLASS_NORMAL
recoil = 0.5
fire_delay = 3
@@ -261,13 +262,14 @@
update_icon()
/obj/item/gun/ballistic/shotgun/police/update_icon_state()
- icon_state = "[current_skin ? unique_reskin[current_skin] : "shotgunpolice"][stock ? "" : "fold"]"
+ icon_state = "[current_skin ? unique_reskin[current_skin] : "police"][stock ? "" : "fold"]"
//Trench shotgun Keywords: Shotgun, Pump-action, 5 rounds, Bayonet
/obj/item/gun/ballistic/shotgun/trench
name = "trench shotgun"
- desc = "A military shotgun designed for close-quarters fighting, equipped with a bayonet lug."
+ desc = "A pump-action combat shotgun that can take a bayonet, with a blisteringly fast rate of fire. Banned by NO international conventions."
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
icon_state = "trench"
item_state = "shotguntrench"
mag_type = /obj/item/ammo_box/magazine/internal/shot/trench
@@ -309,24 +311,25 @@
//Browning Auto-5 Keywords: Shotgun, Semi-auto, 4 rounds internal
/obj/item/gun/ballistic/shotgun/automatic/combat/auto5
- name = "Browning Auto-5"
- desc = "A semi automatic shotgun with a four round tube."
+ name = "repeating shotgun"
+ desc = "The crown jewel of self-loading shotguns, Browning's own Auto-5. It was the first commercially succesful semi-automatic shotgun ever made."
fire_delay = 5
recoil = 2
icon_state = "auto5"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
item_state = "shotgunauto5"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
fire_sound = 'sound/f13weapons/auto5.ogg'
insert_sound = 'sound/weapons/guns/insert_shell_auto.ogg'
-
//Lever action shotgun Keywords: Shotgun, Lever-action, 5 round magazine, Pistol grip
/obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever
name = "lever action shotgun"
- desc = "A pistol grip lever action shotgun with a five-shell capacity underneath plus one in chamber."
- icon_state = "shotgunlever"
+ desc = "An old-timey sawn down Model 1887 lever action shotgun that was quickly forgotten due to the existence of other more effective repeating shotguns. It looks cool, though."
+ icon_state = "lever"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
item_state = "shotgunlever"
- icon_prefix = "shotgunlever"
+ icon_prefix = "lever"
mag_type = /obj/item/ammo_box/magazine/internal/shot/trench
fire_delay = 6
slowdown = 0.25
@@ -340,73 +343,11 @@
knife_x_offset = 23
knife_y_offset = 23
-
-//Neostead 2000 Keywords: BOS, Shotgun, Semi-auto, 12 rounds internal
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead
- name = "Neostead 2000"
- desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
- icon_state = "neostead"
- item_state = "shotguncity"
- fire_delay = 5 //why was this worse than the leveraction?
- recoil = 1.3
- mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
- force = 10
- insert_sound = 'sound/weapons/guns/insert_shell_auto.ogg'
- var/toggled = FALSE
- var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead/examine(mob/user)
- . = ..()
- . += "Alt-click to switch tubes."
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead/Initialize(mapload)
- . = ..()
- if (!alternate_magazine)
- alternate_magazine = new mag_type(src)
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead/attack_self(mob/living/user)
- . = ..()
- if(!magazine.contents.len)
- toggle_tube(user)
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead/proc/toggle_tube(mob/living/user)
- var/current_mag = magazine
- var/alt_mag = alternate_magazine
- magazine = alt_mag
- alternate_magazine = current_mag
- toggled = !toggled
- if(toggled)
- to_chat(user, "You switch to tube B.")
- else
- to_chat(user, "You switch to tube A.")
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead/AltClick(mob/living/user)
- if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
- return
- toggle_tube(user)
-
-//Neostead 2000 NO TUBE SWAP Keywords: Khan, Shotgun, Semi-auto, 12 rounds internal
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt
- name = "Neostead 2000"
- desc = "An advanced shotgun with two separate magazine tubes."
- icon_state = "neostead"
- item_state = "shotguncity"
- fire_delay = 5
- recoil = 1.3
- mag_type = /obj/item/ammo_box/magazine/internal/shot/tube_noalt
- force = 10
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt/khan
- name = "Cold Water"
- desc = "A personalized Neostead shotgun belonging to a Senior Enforce of the Great Khans."
- fire_delay = 3.5
- recoil = 1
- force = 12
-
//Winchester City-Killer Keywords: Shotgun, Full-auto, 10 rounds internal
/obj/item/gun/ballistic/shotgun/automatic/combat/citykiller
- name = "Winchester City-Killer shotgun"
- desc = "A semi automatic shotgun with black tactical furniture made by Winchester Arms. This particular model uses an internal tube magazine."
+ name = "combat shotgun"
+ desc = "A bullpup variant of the Winchester City-Killer combat shotgun in excellent condition. It's been fitted with the DesertWarfare© environmental sealant modification for extra reliability."
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
icon_state = "citykiller"
item_state = "shotguncity"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com/citykiller
@@ -419,12 +360,12 @@
//Riot shotgun Keywords: Shotgun, Semi-auto, 12 round magazine, Pistol grip
/obj/item/gun/ballistic/automatic/shotgun/riot
- name = "Riot shotgun"
- desc = "A compact riot shotgun with a large ammo drum and semi-automatic fire, designed to fight in close quarters."
- icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ name = "riot shotgun"
+ desc = "An accurate long-barreled semi-automatic shotgun designed for riot control use by the National Guard. It takes drum magazines."
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
- icon_state = "shotgunriot"
+ icon_state = "riot"
item_state = "shotgunriot"
w_class = WEIGHT_CLASS_BULKY
mag_type = /obj/item/ammo_box/magazine/d12g
@@ -448,10 +389,11 @@
recoil = 1
slowdown = 0.65 //added so it's not just a straight upgrade sort of unique. total of 0.8 slowdown when used with S.E armor
-/obj/item/gun/ballistic/automatic/shotgun/pancor
- name = "Pancor Jackhammer"
- desc = "The Jackhammer, despite its name, is an easy to control shotgun, even when fired on full automatic. The popular bullpup design, which places the magazine behind the trigger, makes the weapon well balanced & easy to control." //Nod to Fallout 2 in the description :)
- icon_state = "pancor"
+/obj/item/gun/ballistic/automatic/shotgun/caws
+ name = "precision shotgun"
+ desc = "A carefully engineered H&K CAWS shotgun with a long barrel, scope, and cutting edge ergonomics. It was fielded in limited quantities to United States special forces and certain counter-terror organisations in the European Commonwealth."
+ icon_state = "caws"
+ icon = 'icons/obj/guns/gunfruits2022/shotguns.dmi'
item_state = "cshotgun1"
fire_sound = 'sound/f13weapons/repeater_fire.ogg'
mag_type = /obj/item/ammo_box/magazine/d12g
diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi
index 730e5e45..3aec8fd8 100644
Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/lmgs.dmi b/icons/obj/guns/gunfruits2022/lmgs.dmi
index 44825938..07a33729 100644
Binary files a/icons/obj/guns/gunfruits2022/lmgs.dmi and b/icons/obj/guns/gunfruits2022/lmgs.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/pistols.dmi b/icons/obj/guns/gunfruits2022/pistols.dmi
index 2055403b..8593e80b 100644
Binary files a/icons/obj/guns/gunfruits2022/pistols.dmi and b/icons/obj/guns/gunfruits2022/pistols.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/rifles.dmi b/icons/obj/guns/gunfruits2022/rifles.dmi
index 56bfbaec..2a8614ba 100644
Binary files a/icons/obj/guns/gunfruits2022/rifles.dmi and b/icons/obj/guns/gunfruits2022/rifles.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/rifles_large.dmi b/icons/obj/guns/gunfruits2022/rifles_large.dmi
new file mode 100644
index 00000000..5b9ef1f4
Binary files /dev/null and b/icons/obj/guns/gunfruits2022/rifles_large.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/shotguns.dmi b/icons/obj/guns/gunfruits2022/shotguns.dmi
new file mode 100644
index 00000000..33dbf7e5
Binary files /dev/null and b/icons/obj/guns/gunfruits2022/shotguns.dmi differ
diff --git a/icons/obj/guns/gunfruits2022/smgs.dmi b/icons/obj/guns/gunfruits2022/smgs.dmi
index cd27cdda..6c0d01fd 100644
Binary files a/icons/obj/guns/gunfruits2022/smgs.dmi and b/icons/obj/guns/gunfruits2022/smgs.dmi differ