cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shotguns and Bolt-Action Rifles

Browse Source
This commit is contained in:
Casey
2022-03-21 05:53:54 -04:00
committed by CHOMPStation2
parent f8325863d6
commit dc618675c1
21 changed files with 441 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -742,27 +742,25 @@
// Clip
/obj/item/ammo_magazine/clip/c12g
name = "ammo clip (12g slug)"
icon_state = "12gclipslug" // Still a placeholder sprite. Feel free to make a better one.
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with slugs."
icon_state = "12gclipslug"
desc = "A metal clip for holding and quickly loading two shotgun shells."
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g
matter = list(MAT_STEEL = 1070) // slugs shells x2 + 350 metal for the clip itself.
matter = list(MAT_STEEL = 1070)
max_ammo = 2
multiple_sprites = 1
/obj/item/ammo_magazine/clip/c12g/pellet
name = "ammo clip (12g buckshot)"
icon_state = "12gclipshell"
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with buckshot."
ammo_type = /obj/item/ammo_casing/a12g/pellet
matter = list(MAT_STEEL = 1070) // buckshot and slugs cost the same
matter = list(MAT_STEEL = 1070)
/obj/item/ammo_magazine/clip/c12g/beanbag
name = "ammo clip (12g beanbag)"
icon_state = "12gclipbean"
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with beanbags."
ammo_type = /obj/item/ammo_casing/a12g/beanbag
matter = list(MAT_STEEL = 710) //beanbags x2 + 350 metal
matter = list(MAT_STEEL = 710)
///////// .75 Gyrojet /////////

16
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -290,14 +290,25 @@
return
..()
/*
* Automatic Shotgun
*/
/obj/item/weapon/gun/projectile/automatic/as24
name = "automatic shotgun"
desc = "The AS-24 is a rugged looking automatic shotgun produced exclusively for the SCG Fleet by Hephaestus Industries. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds."
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by professional armed forces across human space."
desc = "The AS-24 is a rugged looking automatic shotgun produced exclusively for the SCG Fleet by Hephaestus \
Industries. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds."
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' \
branding for its military-grade equipment used by professional armed forces across human space."
icon_state = "ashot"
<<<<<<< HEAD
item_state = null
wielded_item_state = "woodarifle-wielded" //Placeholder
w_class = ITEMSIZE_HUGE //CHOMP Edit.
=======
item_state = "ashot"
wielded_item_state = "ashot-wielded"
w_class = ITEMSIZE_LARGE
>>>>>>> e6662604ec... Merge pull request #12499 from GhostActual/shotguns-galore
force = 10
caliber = "12g"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
@@ -312,7 +323,6 @@
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0),
list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.0, 0.6, 0.6))
// list(mode_name="6-round bursts", burst=6, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30, -30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2, 1.2)),
)
/obj/item/weapon/gun/projectile/automatic/as24/update_icon()

133
code/modules/projectiles/guns/projectile/boltaction.dm
View File

@@ -1,13 +1,20 @@
// For all intents and purposes, these work exactly the same as pump shotguns. It's unnecessary to make their own procs for them.
////////Base Rifle////////
/*
* Bolt-Action Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle
name = "bolt-action rifle"
desc = "The Hedberg-Hammarstrom Volsung is a modern interpretation of an almost ancient weapon design. The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
item_state = "boltaction"
desc = "The Weissen Company Type-19 is a modern interpretation of an almost ancient weapon design. \
The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
description_fluff = "The frontier’s largest home-grown firearms manufacturer, \
the Weissen Arms Company are the leading manufacturer of - not only quality - \
but affordable rifles for the average frontiersman looking to protect his \
claim. The company operates just one production plant in the Mytis system, \
but their weapons have found popularity on garden worlds as far afield as \
the Tajaran homeworld due to their excellent build quality, precision, and \
stopping power. Thier bolt-action rifles and brushguns are a staple amongst \
the rural communities that dot this infinite frontier."
icon_state = "boltaction"
item_state = "boltaction"
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
max_shells = 5
caliber = "7.62mm"
@@ -17,24 +24,53 @@
action_sound = 'sound/weapons/riflebolt.ogg'
pump_animation = "boltaction-cycling"
////////Practice Rifle////////
/*
* Practice Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice
name = "practice bolt-action rifle"
icon_state = "boltaction_practice"
desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds."
desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. \
Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds."
ammo_type = /obj/item/ammo_casing/a762/practice
pump_animation = "boltaction_practice-cycling"
max_shells = 4
////////Ceremonial Rifle////////
/*
* Moist Nugget
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/moistnugget
name = "mosin-nagant"
icon_state = "moistnugget"
item_state = "rifle"
desc = "Developed from 1882 to 1891, it was used by the armed forces of the Russian Empire, the Soviet \
Union and various other nations. It is one of the most mass-produced military bolt-action rifles in history. Uses 7.62mm rounds."
description_fluff = "Hailing from the Human homeworld, the M1891, otherwise known as the Mosin-Nagant is one of the most \
prevalant and cheapest rifles of its time. This modern remake of the classic design was used by early colonists of the \
Commonwealth to stake claims. It was favored because of how cheap and easy the weapon was to manufacture as well as its \
ease of use making it a better choice for those that didn't have proper firearms training."
ammo_type = /obj/item/ammo_casing/a762
pump_animation = "moistnugget-cycling"
/*
* Ceremonial Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
name = "ceremonial bolt-action rifle"
desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds."
item_state = "boltaction_c"
desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. \
Clearly not intended to be used in combat. Uses 7.62mm rounds."
item_state = "ceremonial_rifle"
icon_state = "ceremonial_rifle"
ammo_type = /obj/item/ammo_casing/a762/blank
pump_animation = "ceremonial_rifle-cycling"
max_shells = 5
var/sawn_off = FALSE
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob)
if(sawn_off)
to_chat(user, "<span class='warning'>The [src] is already shortened!</span>")
return
if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL)
to_chat(user, "<span class='notice'>You begin to shorten the barrel and stock of \the [src].</span>")
if(loaded.len)
@@ -43,39 +79,72 @@
user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>The rifle goes off in your face!</span>")
return
if(do_after(user, 30))
if(sawn_off)
return
icon_state = "sawn_rifle"
w_class = ITEMSIZE_NORMAL
recoil = 2 // Owch
accuracy = -15 // You know damn well why.
item_state = "gun"
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
slot_flags &= ~SLOT_BACK // You can't sling it on your back
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) // But you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
name = "sawn-off rifle"
desc = "The firepower of a rifle, now the size of a pistol, with an effective combat range of about three feet. Uses 7.62mm rounds."
pump_animation = "sawn_rifle-cycling"
to_chat(user, "<span class='warning'>You shorten the barrel and stock of \the [src]!</span>")
sawn_off = TRUE
else
..()
//Lever actions are the same thing, but bigger.
/*
* Surplus Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/surplus
name = "surplus rifle"
desc = "An ancient weapon from an era long past, crude in design, but still just as effective \
as any modern interpretation. Uses 7.62mm rounds."
icon_state = "surplus"
item_state = "rifle"
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
max_shells = 4
slot_flags = null
caliber = "7.62mm"
origin_tech = list(TECH_COMBAT = 1) // Old(er) as shit rifle doesn't have very good tech.
ammo_type = /obj/item/ammo_casing/a762
load_method = SINGLE_CASING|SPEEDLOADER
action_sound = 'sound/weapons/riflebolt.ogg'
pump_animation = "surplus-cycling"
////////Standard Lever Action Rifle////////
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
name = "lever-action rifle"
desc = "The Hedberg-Hammarstrom Edda is the latest version of an almost ancient weapon design from the 19th century, popular with some due to its simplistic design. This one uses a lever-action to move new rounds into the chamber. Uses 7.62mm rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
item_state = "leveraction"
icon_state = "leveraction"
/*
* Scoped Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/scoped
name = "scoped bolt-action rifle"
desc = "The Weissen Company Type-19 is a modern interpretation of an almost ancient weapon design. \
The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
description_fluff = "The frontier’s largest home-grown firearms manufacturer, \
the Weissen Arms Company are the leading manufacturer of - not only quality - \
but affordable rifles for the average frontiersman looking to protect his \
claim. The company operates just one production plant in the Mytis system, \
but their weapons have found popularity on garden worlds as far afield as \
the Tajaran homeworld due to their excellent build quality, precision, and \
stopping power. Thier bolt-action rifles and brushguns are a staple amongst \
the rural communities that dot this infinite frontier."
icon_state = "scoped-boltaction"
item_state = "boltaction_scoped"
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
max_shells = 5
caliber = "7.62mm"
load_method = SINGLE_CASING
pump_animation = "leveraction-cycling"
origin_tech = list(TECH_COMBAT = 2)// Old as shit rifle doesn't have very good tech, but it does have a scope.
ammo_type = /obj/item/ammo_casing/a762
load_method = SINGLE_CASING|SPEEDLOADER
action_sound = 'sound/weapons/riflebolt.ogg'
pump_animation = "scoped-boltaction-cycling"
////////Vintage Lever Action Rifle////////
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
name = "vintage repeater"
desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds."
item_state = "levercarbine"
icon_state = "levercarbine"
pump_animation = "levercarbine-cycling"
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ui_action_click()
scope()
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/verb/scope()
set category = "Object"
set name = "Use Scope"
set popup_menu = 1

55
code/modules/projectiles/guns/projectile/boltaction_vr.dm
View File

@@ -1,55 +0,0 @@
/obj/item/weapon/gun/projectile/shotgun/pump/rifle
desc = "The Weissen Company Type-19 is a modern interpretation of an almost ancient weapon design. The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the APEX Arms Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
The company operates just one production plant in the Mytis system, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
icon = 'icons/obj/gun_vr.dmi'
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice //For target practice
name = "practice rifle"
icon = 'icons/obj/gun_vr.dmi'
icon_state = "boltaction_p"
item_state = "boltaction_p"
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi')
max_shells = 4
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
max_shells = 5
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
desc = "The Weissen Company Thunderking is the latest version of an almost ancient weapon design from the 19th century, popular with some due to its simplistic design. This one uses a lever-action to move new rounds into the chamber. Uses 7.62mm rounds."
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
The company operates just one production plant in the Mytis system, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "levergun"
max_shells = 6
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
desc = "The Weissen Company's version of an iconic manually operated lever action rifle, the Bushhog, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds."
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
The company operates just one production plant in the Mytis system, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "levergunv"
item_state = "leveraction"
max_shells = 5
caliber = "7.62mm"
load_method = SINGLE_CASING
pump_animation = null
////////////////////////surplus gun - for derelicts (04/26/2021)////////////////////////
/obj/item/weapon/gun/projectile/shotgun/pump/surplus
name = "surplus rifle"
desc = "An ancient weapon from an era long pas, crude in design, but still just as effective as any modern interpretation. Uses 7.62mm rounds."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "boltaction_s"
item_state = "boltaction_p"
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi')
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
max_shells = 4
slot_flags = null
caliber = "7.62mm"
origin_tech = list(TECH_COMBAT = 1) // Old(er) as shit rifle doesn't have very good tech.
ammo_type = /obj/item/ammo_casing/a762
load_method = SINGLE_CASING|SPEEDLOADER
action_sound = 'sound/weapons/riflebolt.ogg'
pump_animation = null

101
code/modules/projectiles/guns/projectile/leveraction.dm Normal file
View File

@@ -0,0 +1,101 @@
/*
* Lever-Action Rifle
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
name = "lever-action rifle"
desc = "The Weissen Company's version of an iconic manually operated lever action rifle, \
the Bushhog, offering adequate stopping power due to it's still powerful cartridge while at \
the same time having a rather respectable firing rate due to it's mechanism. It is very probable \
this is a replica instead of a museum piece, but rifles of this pattern still see usage as \
colonist guns in some far off regions. Uses 7.62mm rounds."
description_fluff = "The frontier<65>s largest home-grown firearms manufacturer, the Weissen \
Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \
the wild frontier wilderness - and its wildlife - in mind. The company operates just one \
production plant in the Mytis system, but their weapons have found popularity on garden \
worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
precision, and stopping power."
icon_state = "leveraction"
item_state = "huntrifle"
max_shells = 5
caliber = "7.62mm"
load_method = SINGLE_CASING
pump_animation = "leveraction-cycling"
/*
* Vintage Lever-Action
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
name = "vintage lever-action rifle"
desc = "The Weissen Company's version of an iconic manually operated lever action rifle, \
the Bushhog, offering adequate stopping power due to it's still powerful cartridge while at \
the same time having a rather respectable firing rate due to it's mechanism. It is very probable \
this is a replica instead of a museum piece, but rifles of this pattern still see usage as \
colonist guns in some far off regions. Uses 7.62mm rounds."
description_fluff = "The frontier<65>s largest home-grown firearms manufacturer, the Weissen \
Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \
the wild frontier wilderness - and its wildlife - in mind. The company operates just one \
production plant in the Mytis system, but their weapons have found popularity on garden \
worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
precision, and stopping power."
icon_state = "levercarbine"
pump_animation = "levercarbine-cycling"
/*
* Cowboy Repeater
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/repeater
name = "repeater"
desc = "The Weissen Company's answer to varmint shooting on frontier ranches, the T-7 Boone \
gives ranchers and farmers alike a perfect rider rifle for protecting the fenceline. Uses .357 rounds."
description_fluff = "The frontier<65>s largest home-grown firearms manufacturer, \
the Weissen Arms Company are the leading manufacturer of - not only quality - \
but affordable rifles for the average frontiersman looking to protect his \
claim. The company operates just one production plant in the Mytis system, \
but their weapons have found popularity on garden worlds as far afield as \
the Tajaran homeworld due to their excellent build quality, precision, and \
stopping power. Thier bolt-action and brushguns are a staple amongst the rural communities \
that dot this infinite frontier."
icon_state = "repeater"
max_shells = 8
caliber = ".357"
pump_animation = "repeater-cycling"
/*
* Brushgun
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/brushgun
name = "brushgun"
desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \
the T-10 Cassidy Uses .44 rounds."
description_fluff = "The frontier<65>s largest home-grown firearms manufacturer, \
the Weissen Arms Company are the leading manufacturer of - not only quality - \
but affordable rifles for the average frontiersman looking to protect his \
claim. The company operates just one production plant in the Mytis system, \
but their weapons have found popularity on garden worlds as far afield as \
the Tajaran homeworld due to their excellent build quality, precision, and \
stopping power. Thier bolt-action and brushguns are a staple amongst the rural communities \
that dot this infinite frontier."
icon_state = "brushgun"
max_shells = 8
caliber = ".44"
pump_animation = "brushgun-cycling"
/*
* Trailgun
*/
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/trailgun
name = "brushgun"
desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \
the T-10 Cassidy Uses .44 rounds."
description_fluff = "The frontier<65>s largest home-grown firearms manufacturer, \
the Weissen Arms Company are the leading manufacturer of - not only quality - \
but affordable rifles for the average frontiersman looking to protect his \
claim. The company operates just one production plant in the Mytis system, \
but their weapons have found popularity on garden worlds as far afield as \
the Tajaran homeworld due to their excellent build quality, precision, and \
stopping power. Thier bolt-action and brushguns are a staple amongst the rural communities \
that dot this infinite frontier."
icon_state = "trailgun"
max_shells = 8
caliber = ".44"
pump_animation = "trailgun-cycling"

39
code/modules/projectiles/guns/projectile/semiauto.dm
View File

@@ -1,11 +1,17 @@
/*
* M1 Garand
*/
/obj/item/weapon/gun/projectile/garand
name = "semi-automatic rifle"
desc = "A vintage styled frontier rifle by Hedberg-Hammarstrom. The distinctive 'ping' is considered traditional, though its origins are much debated.. Uses 7.62mm rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
desc = "A vintage styled frontier rifle by Hedberg-Hammarstrom. The distinctive 'ping' is considered \
traditional, though its origins are much debated. Uses 7.62mm rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a \
range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its \
wildlife - in mind. The company operates just one production plant in Kalmar, but their weapons have found \
popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
precision, and stopping power."
icon_state = "garand"
item_state = "boltaction"
item_state = "rifle"
w_class = ITEMSIZE_LARGE
caliber = "7.62mm"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -23,14 +29,19 @@
else
icon_state = "[initial(icon_state)]-e"
//Bastard child of a revolver and a semi-auto rifle.
//Standard Revolving Rifle
/*
* Revolver Rifle
* Bastard child of a revolver and a semi-auto rifle.
*/
/obj/item/weapon/gun/projectile/revolvingrifle
name = "revolving rifle"
desc = "The Gungnir is a novel, antique idea brought into the modern era by Hedberg-Hammarstrom. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
desc = "The Gungnir is a novel, antique idea brought into the modern era by Hedberg-Hammarstrom. \
The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. \
Uses .44 magnum revolver rounds."
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a \
range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its \
wildlife - in mind. The company operates just one production plant in Kalmar, but their weapons have found \
popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
precision, and stopping power."
icon_state = "revolvingrifle"
item_state = "rifle"
@@ -43,9 +54,13 @@
max_shells = 6
ammo_type = /obj/item/ammo_casing/a44/rifle
//Vintage Revolving Rifle
/*
* Vintage Revolver Rifle
*/
/obj/item/weapon/gun/projectile/revolvingrifle/vintage
name = "vintage revolving rifle"
desc = "The Willhem is the Gungir's older cousin by Hedberg-Hammarstrom, the perfect collector piece. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
desc = "The Willhem is the Gungir's older cousin by Hedberg-Hammarstrom, the perfect collector piece. \
The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. \
Uses .44 magnum revolver rounds."
icon_state = "vintagerevolvingrifle"

101
code/modules/projectiles/guns/projectile/shotgun.dm
View File

@@ -1,5 +1,9 @@
/*
* Shotgun
*/
/obj/item/weapon/gun/projectile/shotgun/pump
name = "shotgun"
<<<<<<< HEAD
// desc = "The mass-produced MarsTech Meteor 29 shotgun is a favourite of police and security forces on many worlds. Uses 12g rounds." //CHOMP Disable
desc = "I used the shotgun. You know why? Cause the shotgun doesn't miss, and unlike the shitty hybrid taser it stops \
a criminal in their tracks in two hits. Bang, bang, and they're fucking done. I use four shots just to make damn sure. \
@@ -10,6 +14,11 @@
impossible to aim and do about next to jack shit, fuck all. The shotgun is the superior law enforcement weapon. Because it stops crime. \
And it stops crime by reducing the number of criminals roaming the fucking halls." //CHOMP Add
description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
=======
desc = "The mass-produced MarsTech Meteor 29 shotgun is a favourite of police and security forces on many worlds. Uses 12g rounds."
description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \
MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
>>>>>>> e6662604ec... Merge pull request #12499 from GhostActual/shotguns-galore
icon_state = "shotgun"
item_state = "shotgun"
max_shells = 4
@@ -40,17 +49,22 @@
/obj/item/weapon/gun/projectile/shotgun/pump/proc/pump(mob/M as mob)
playsound(src, action_sound, 60, 1)
if(chambered)//We have a shell in the chamber
chambered.loc = get_turf(src)//Eject casing
// We have a shell in the chamber
if(chambered)
if(chambered.caseless)
qdel(chambered) // Delete casing
else
chambered.loc = get_turf(src) // Eject casing
chambered = null
// Load next shell
if(loaded.len)
var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
loaded -= AC //Remove casing from loaded list.
var/obj/item/ammo_casing/AC = loaded[1] // Load next casing.
loaded -= AC // Remove casing from loaded list.
chambered = AC
if(pump_animation)//This affects all bolt action and shotguns.
flick("[pump_animation]", src)//This plays any pumping
if(pump_animation) // This affects all bolt action and shotguns.
flick("[pump_animation]", src) // This plays any pumping
update_icon()
@@ -70,10 +84,14 @@
ammo_type = /obj/item/ammo_casing/a12g
pump_animation = null
/*
* Combat Shotgun
*/
/obj/item/weapon/gun/projectile/shotgun/pump/combat
name = "combat shotgun"
desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds."
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by armed forces across human space."
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' \
branding for its military-grade equipment used by armed forces across human space."
icon_state = "cshotgun"
item_state = "cshotgun"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
@@ -85,6 +103,9 @@
/obj/item/weapon/gun/projectile/shotgun/pump/combat/empty
ammo_type = null
/*
* Double-Barreled Shotgun
*/
/obj/item/weapon/gun/projectile/shotgun/doublebarrel
name = "double-barreled shotgun"
desc = "A truely classic weapon. No need to change what works. Uses 12g rounds."
@@ -102,6 +123,9 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1)
ammo_type = /obj/item/ammo_casing/a12g/beanbag
var/unique_reskin
var/sawn_off = FALSE
burst_delay = 0
firemodes = list(
list(mode_name="fire one barrel at a time", burst=1),
@@ -119,8 +143,49 @@
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump)
..(user, allow_dump=1)
//this is largely hacky and bad :( -Pete
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/verb/rename_gun()
set name = "Name Gun"
set category = "Object"
set desc = "Rename your gun."
var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN)
var/mob/M = usr
if(src && input && !M.stat && in_range(M,src))
name = input
to_chat(M, "You name the gun [input]. Say hello to your new friend.")
return 1
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/verb/reskin_gun()
set name = "Resprite gun"
set category = "Object"
set desc = "Click to choose a sprite for your gun."
var/mob/M = usr
var/list/options = list()
options["Default"] = "dshotgun"
options["Cherry Red"] = "dshotgun_d"
options["Ash"] = "dshotgun_f"
options["Faded Grey"] = "dshotgun_g"
options["Maple"] = "dshotgun_l"
options["Rosewood"] = "dshotgun_p"
options["Olive Green"] = "dshotgun_o"
options["Blued"] = "dshotgun_b"
var/choice = tgui_input_list(M,"Choose your sprite!","Resprite Gun", options)
if(sawn_off)
to_chat(M, "<span class='warning'>The [src] is already shortened and cannot be resprited!</span>")
return
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
unique_reskin = options[choice]
to_chat(M, "Your gun is now sprited as [choice]. Say hello to your new friend.")
return 1
//this is largely hacky and bad :( -Pete //less hacky and bad now :) -Ghost
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
if(sawn_off)
to_chat(user, "<span class='warning'>The [src] is already shortened!</span>")
return
if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
to_chat(user, "<span class='notice'>You begin to shorten the barrel of \the [src].</span>")
if(loaded.len)
@@ -130,25 +195,35 @@
Fire_userless(user)
burst = burstsetting
return
if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY
icon_state = "sawnshotgun"
if(do_after(user, 30)) // SHIT IS STEALTHY EYYYYY
if(sawn_off)
return
if(unique_reskin)
icon_state = "[unique_reskin]_sawn"
else
icon_state = "dshotgun_sawn"
item_state = "sawnshotgun"
w_class = ITEMSIZE_NORMAL
force = 5
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
slot_flags &= ~SLOT_BACK // you can't sling it on your back
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) // but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
name = "sawn-off shotgun"
desc = "Omar's coming!"
to_chat(user, "<span class='warning'>You shorten the barrel of \the [src]!</span>")
sawn_off = TRUE
else
..()
/*
* Sawn-Off Shotgun
*/
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn
name = "sawn-off shotgun"
desc = "Omar's coming!" // I'm not gonna add "Uses 12g rounds." to this one. I'll just let this reference go undisturbed.
icon_state = "sawnshotgun"
icon_state = "dshotgun_sawn"
item_state = "sawnshotgun"
slot_flags = SLOT_BELT|SLOT_HOLSTER
ammo_type = /obj/item/ammo_casing/a12g/pellet
w_class = ITEMSIZE_NORMAL
force = 5
sawn_off = TRUE