mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
Shotgun additions and minor tweaks (#3554)
* 24-round shotgun mag fixes + making it relevant. Adds the AS-24 Shotgun to the traitor uplink for 100 TCs, also makes automatic shotgun magazines costs the appropriate amount (13,000 metal up from 2200) * Magazine variety. Nothing really new here. Beanbag / pellet mags for the admin-only AS-24. * shotgun 6-shell clips, autolathe and shotgun tweaks. +6-shell quickloader clips for shotguns, with proper metal costs for slugs, beanbags and buckshot. +minor tweak to shotguns to allow the quickloaders to work in a non-silly way (load_method = SINGLE_CASING|SPEEDLOADER) since there are literally no other shotgun speedloaders this probably shouldn't be an issue (as it's ever so slightly quicker than loading with a box) +added sprites for quickloading clips. * Requested changes. -6 round shotgun clip sprites +4 round shotgun clip sprites -/+ adjusted shotgun clips to 4 rounds * cherrypicking * fixes did a bad * literally a number
This commit is contained in:
@@ -159,9 +159,18 @@
|
|||||||
path =/obj/item/ammo_magazine/m762
|
path =/obj/item/ammo_magazine/m762
|
||||||
hidden = 1
|
hidden = 1
|
||||||
|
|
||||||
/datum/category_item/autolathe/arms/shotgun_magazine
|
/datum/category_item/autolathe/arms/shotgun_clip_slug
|
||||||
name = "24rnd shotgun magazine (12g)"
|
name = "4-round 12g shell clip (slug)"
|
||||||
path =/obj/item/ammo_magazine/m12gdrum
|
path =/obj/item/ammo_magazine/clip/c12g
|
||||||
|
|
||||||
|
/datum/category_item/autolathe/arms/shotgun_clip_pellet
|
||||||
|
name = "4-round 12g shell clip (buckshot)"
|
||||||
|
path =/obj/item/ammo_magazine/clip/c12g/pellet
|
||||||
|
hidden = 1
|
||||||
|
|
||||||
|
/datum/category_item/autolathe/arms/shotgun_clip_beanbag
|
||||||
|
name = "4-round 12g shell clip (beanbag)"
|
||||||
|
path =/obj/item/ammo_magazine/clip/c12g/beanbag
|
||||||
hidden = 1
|
hidden = 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -467,7 +467,7 @@
|
|||||||
icon_state = "12g"
|
icon_state = "12g"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "12g"
|
caliber = "12g"
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 2200)
|
matter = list(DEFAULT_WALL_MATERIAL = 13000) //did the math. now fixed the exploityness of this thing. Have fun!
|
||||||
ammo_type = /obj/item/ammo_casing/a12g
|
ammo_type = /obj/item/ammo_casing/a12g
|
||||||
max_ammo = 24
|
max_ammo = 24
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -511,4 +511,32 @@
|
|||||||
ammo_type = /obj/item/ammo_casing/cap
|
ammo_type = /obj/item/ammo_casing/cap
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 600)
|
matter = list(DEFAULT_WALL_MATERIAL = 600)
|
||||||
max_ammo = 7
|
max_ammo = 7
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/clip/c12g
|
||||||
|
name = "ammo clip (12g slug)"
|
||||||
|
icon_state = "12gclip_s" //largely a codersprite, looks good enough. 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."
|
||||||
|
caliber = "12g"
|
||||||
|
ammo_type = /obj/item/ammo_casing/a12g
|
||||||
|
matter = list(DEFAULT_WALL_MATERIAL = 1790) // slugs shells x4 + 350 metal for the clip itself.
|
||||||
|
max_ammo = 4
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/clip/c12g/pellet
|
||||||
|
name = "ammo clip (12g buckshot)"
|
||||||
|
icon_state = "12gclip_p"
|
||||||
|
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(DEFAULT_WALL_MATERIAL = 1790) // buckshot and slugs cost the same
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/clip/c12g/beanbag
|
||||||
|
name = "ammo clip (12g beanbag)"
|
||||||
|
icon_state = "12gclip_bean"
|
||||||
|
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(DEFAULT_WALL_MATERIAL = 1070) //beanbags x4 + 350 metal
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
slot_flags = SLOT_BACK
|
slot_flags = SLOT_BACK
|
||||||
caliber = "12g"
|
caliber = "12g"
|
||||||
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
|
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
|
||||||
load_method = SINGLE_CASING
|
load_method = SINGLE_CASING|SPEEDLOADER
|
||||||
ammo_type = /obj/item/ammo_casing/a12g/beanbag
|
ammo_type = /obj/item/ammo_casing/a12g/beanbag
|
||||||
handle_casings = HOLD_CASINGS
|
handle_casings = HOLD_CASINGS
|
||||||
fire_sound = 'sound/weapons/shotgun.ogg'
|
fire_sound = 'sound/weapons/shotgun.ogg'
|
||||||
@@ -49,6 +49,7 @@
|
|||||||
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
|
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
|
||||||
max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8.
|
max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8.
|
||||||
ammo_type = /obj/item/ammo_casing/a12g
|
ammo_type = /obj/item/ammo_casing/a12g
|
||||||
|
load_method = SINGLE_CASING|SPEEDLOADER
|
||||||
|
|
||||||
/obj/item/weapon/gun/projectile/shotgun/doublebarrel
|
/obj/item/weapon/gun/projectile/shotgun/doublebarrel
|
||||||
name = "double-barreled shotgun"
|
name = "double-barreled shotgun"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 22 KiB |
Reference in New Issue
Block a user