cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ballistics v3.2

Browse Source
This commit is contained in:
Cadyn
2021-01-19 17:31:36 -08:00
parent 6b56c8436b
commit 35543399cd
10 changed files with 564 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
code/modules/projectiles/ammunition/zz_autolathe_ch.dm Normal file
View File

@@ -0,0 +1,98 @@
//Created the autolathe entries here to keep stuff organized and also compact so the files aren't too spread out.
/datum/category_item/autolathe/arms/smg_mp5
name = "mp5 magazine(9x19mm standard)"
path = /obj/item/ammo_magazine/mp5mag
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_ap
name = "mp5 magazine(9x19mm armor-piercing)"
path = /obj/item/ammo_magazine/mp5mag/ap
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_hp
name = "mp5 magazine(9x19mm hollow-point)"
path = /obj/item/ammo_magazine/mp5mag/hp
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_rubber
name = "mp5 magazine(9x19mm rubber)"
path = /obj/item/ammo_magazine/mp5mag/rubber
/datum/category_item/autolathe/arms/pistol_fiveseven
name = "five-seven magazine(5.7x28mm standard)"
path = /obj/item/ammo_magazine/a57
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_ap
name = "five-seven magazine(5.7x28mm armor-piercing)"
path = /obj/item/ammo_magazine/a57/ap
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_hp
name = "five-seven magazine(5.7x28mm hollow-point)"
path = /obj/item/ammo_magazine/a57/hp
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_rubber
name = "five-seven magazine(5.7x28mm rubber)"
path = /obj/item/ammo_magazine/a57/rubber
/datum/category_item/autolathe/arms/smg_p90
name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
path = /obj/item/ammo_magazine/m9mmp90
hidden = 1
/datum/category_item/autolathe/arms/svd_762
name = "SVD magazine (7.62x54mmR)"
path = /obj/item/ammo_magazine/m762svd
hidden = 1
/datum/category_item/autolathe/arms/svd_762_ap
name = "SVD magazine (7.62x54mmR armor-piercing)"
path = /obj/item/ammo_magazine/m762svd/ap
hidden = 1
/datum/category_item/autolathe/arms/asval_9x39
name = "AS-Val magazine(9x39mm standard)"
path = /obj/item/ammo_magazine/asval
hidden = 1
/datum/category_item/autolathe/arms/asval_9x39_ap
name = "AS-Val magazine(9x39mm armor-piercing)"
path = /obj/item/ammo_magazine/asval/ap
hidden = 1
/datum/category_item/autolathe/arms/akm_762x39
name = "AKM magazine (7.62x39mm standard)"
path = /obj/item/ammo_magazine/akm
hidden = 1
/datum/category_item/autolathe/arms/akm_762x39_ap
name = "AKM magazine (7.62x39mm armor-piercing)"
path = /obj/item/ammo_magazine/akm/ap
hidden = 1
/datum/category_item/autolathe/arms/akm_762x39_hp
name = "AKM magazine (7.62x39mm hollow-point)"
path = /obj/item/ammo_magazine/akm/hp
hidden = 1
/datum/category_item/autolathe/arms/m16_556
name = "M16 magazine (5.56x45mm standard)"
path = /obj/item/ammo_magazine/m16
hidden = 1
/datum/category_item/autolathe/arms/m16_556_ap
name = "M16 magazine (5.56x45mm armor-piercing)"
path = /obj/item/ammo_magazine/m16/ap
hidden = 1
/datum/category_item/autolathe/arms/m16_556_hp
name = "M16 magazine (5.56x45mm hollow-point)"
path = /obj/item/ammo_magazine/m16/hp
hidden = 1
/datum/category_item/autolathe/arms/sks_762
name = "SKS Clip (10x 7.62x39 standard)"
path = /obj/item/ammo_magazine/clip/sks
hidden = 1

140
code/modules/projectiles/ammunition/zz_magazines_ch.dm Normal file
View File

@@ -0,0 +1,140 @@
//Overrides
/obj/item/ammo_magazine/m9mmp90 //congratulations you are now being converted 5.7x28mm, a.k.a the round the p90 actually uses.
name = "large capacity top mounted magazine (5.7x28mm armor-piercing)" //Ugh, we'll leave it AP I guess
ammo_type = /obj/item/ammo_casing/a57/ap
caliber = "5.7x28mm"
/obj/item/ammo_magazine/m762svd //You are now being converted to 7.62x54mmR :3
name = "\improper SVD magazine (7.62x54mmR)"
caliber = "7.62x54mmR"
ammo_type = /obj/item/ammo_casing/a762x54
/obj/item/ammo_magazine/m762svd/ap
name = "\improper SVD magazine (7.62x54mmR armor-piercing)"
ammo_type = /obj/item/ammo_casing/a762x54/ap
//New stuff
/obj/item/ammo_magazine/a57
name = "five-seven magazine(5.7x28mm standard)"
icon_state = "fiveseven"
max_ammo = 20
mag_type = MAGAZINE
caliber= "5.7x28mm"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 0
ammo_type = /obj/item/ammo_casing/a57
/obj/item/ammo_magazine/a57/ap
name = "five-seven magazine(5.7x28mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 900)
ammo_type = /obj/item/ammo_casing/a57/ap
/obj/item/ammo_magazine/a57/hp
name = "five-seven magazine(5.7x28mm hollow-point)"
matter = list(DEFAULT_WALL_MATERIAL = 900)
ammo_type = /obj/item/ammo_casing/a57/hp
/obj/item/ammo_magazine/a57/rubber
name = "five-seven magazine(5.7x28mm rubber)"
ammo_type = /obj/item/ammo_casing/a57/rubber
/obj/item/ammo_magazine/mp5mag
name = "mp5 magazine(9x19mm standard)"
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "smg"
max_ammo = 30
mag_type = MAGAZINE
caliber = "9mm"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a9mm
/obj/item/ammo_magazine/mp5mag/ap
name = "mp5 magazine(9x19mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(DEFAULT_WALL_MATERIAL = 900)
/obj/item/ammo_magazine/mp5mag/hp
name = "mp5 magazine(9x19mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/mp5mag/rubber
name = "mp5 magazine(9x19mm rubber)"
ammo_type = /obj/item/ammo_casing/a9mm/rubber
/obj/item/ammo_magazine/asval
name = "AS-Val magazine(9x39mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "sts35"
max_ammo = 20
mag_type = MAGAZINE
caliber = "9x39mm"
matter = list(DEFAULT_WALL_MATERIAL = 1000)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a9x39
/obj/item/ammo_magazine/asval/ap
name = "AS-Val magazine(9x39mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a9x39/ap
/obj/item/ammo_magazine/akm
name = "AKM magazine (7.62x39mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "762mag"
max_ammo = 30
mag_type = MAGAZINE
caliber = "7.62x39mm"
matter = list(DEFAULT_WALL_MATERIAL = 1600)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a762x39
/obj/item/ammo_magazine/akm/ap
name = "AKM magazine (7.62x39mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 2000)
ammo_type = /obj/item/ammo_casing/a762x39/ap
/obj/item/ammo_magazine/akm/hp
name = "AKM magazine (7.62x39mm hollow-point)"
matter = list(DEFAULT_WALL_MATERIAL = 2000)
ammo_type = /obj/item/ammo_casing/a762x39/hp
/obj/item/ammo_magazine/m16
name = "M16 magazine (5.56x45mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "556mag"
max_ammo = 30
mag_type = MAGAZINE
caliber = "5.56x45mm"
matter = list(DEFAULT_WALL_MATERIAL = 1400)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a556
/obj/item/ammo_magazine/m16/ap
name = "M16 magazine (5.56x45mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 1700)
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/m16/hp
name = "M16 magazine (5.56x45mm hollow-point)"
matter = list(DEFAULT_WALL_MATERIAL = 1700)
ammo_type = /obj/item/ammo_casing/a556/hp
/obj/item/ammo_magazine/m41
name = "M41A magazine (10x24mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "m41mag"
max_ammo = 40
mag_type = MAGAZINE
caliber = "5.56x45mm"
matter = list(DEFAULT_WALL_MATERIAL = 10000)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a10x24
/obj/item/ammo_magazine/clip/sks
name = "Ammo clip(7.62x39mm)"
icon_state = "gclip"
max_ammo = 10
caliber = "7.62x39mm"
matter = list(DEFAULT_WALL_MATERIAL = 400)

86
code/modules/projectiles/ammunition/zz_rounds_ch.dm Normal file
View File

@@ -0,0 +1,86 @@
//Overrides
/obj/item/ammo_casing/a10mm
projectile_type = /obj/item/projectile/bullet/a10mm
/obj/item/ammo_casing/a38
projectile_type = /obj/item/projectile/bullet/a38
/obj/item/ammo_casing/a380
projectile_type = /obj/item/projectile/bullet/a380
/obj/item/ammo_casing/a357
projectile_type = /obj/item/projectile/bullet/a357
/obj/item/ammo_casing/a12g/pellet
name = "shotgun buckshot shell"
desc = "A 12 gauge buckshot shell."
icon_state = "gshell"
projectile_type = /obj/item/projectile/bullet/shotgun/buckshot/shell
//New stuff
/obj/item/ammo_casing/a57
desc = "A standard 5.7x28mm round"
caliber = "5.7x28mm"
projectile_type = /obj/item/projectile/bullet/a57
matter = list(DEFAULT_WALL_MATERIAL = 60)
/obj/item/ammo_casing/a57/ap
desc = "An armor piercing 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/a57/ap
/obj/item/ammo_casing/a57/hp
desc = "A hollow point 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/a57/ap
/obj/item/ammo_casing/a57/rubber
desc = "A rubber 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/obj/item/ammo_casing/a762x54
desc = "A standard 7.62x54mmR round"
caliber = "7.62x54mmR"
projectile_type = /obj/item/projectile/bullet/rifle/a762x54
matter = list(DEFAULT_WALL_MATERIAL = 160)
/obj/item/ammo_casing/a762x54/ap
desc = "An armor piercing 7.62x54mmR round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x54/ap
/obj/item/ammo_casing/a9x39
desc = "A standard 9x39mm round"
caliber = "9x39mm"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39
/obj/item/ammo_casing/a9x39/ap
desc = "An armor piercing 9x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39/ap
/obj/item/ammo_casing/a762x39
desc = "A standard 7.62x39mm round"
caliber = "7.62x39mm"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
/obj/item/ammo_casing/a762x39/ap
desc = "An armor piercing 7.62x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39/ap
/obj/item/ammo_casing/a762x39/hp
desc = "A hollow point 7.62x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39/hp
/obj/item/ammo_casing/a556
desc = "A standard 5.56x45mm round"
caliber = "5.56x45mm"
projectile_type = /obj/item/projectile/bullet/rifle/a556
/obj/item/ammo_casing/a556/ap
desc = "An armor piercing 5.56x45mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a556/ap
/obj/item/ammo_casing/a556/hp
desc = "A hollow point 5.56x45mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a556/hp
/obj/item/ammo_casing/a10x24
desc = "A standard 10x24mm caseless round"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24

181
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -17,6 +17,9 @@
/obj/item/weapon/gun/projectile/fiveseven/update_icon()
icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e"
//Was originally expecting to be able to have 64x64 guns and just shrink them but that's just like not a thing because code doesn't allow it
//And Kasssc kinda explained to me that even if the code did allow it, it wouldn't look right.
//So, we have the mp5 as the only one that does have this, and it just uses filters to convert the 64x64 sprite into 32x32 for now.
/obj/item/weapon/gun/projectile/automatic/cballistic
name = "I AM NOT SUPPOSED TO EXIST"
desc = "Yes hello I'm not supposed to exist, I'm just a weird code artefact thing please contact a developer."
@@ -55,6 +58,184 @@
load_method = MAGAZINE
muzzle_velocity = 400
//Following guns are thanks to Serdy/Przyjaciel for the sprites and lore for WKHM. Naming the classes after him in honor <3
/obj/item/weapon/gun/projectile/automatic/serdy
name = "I AM NOT SUPPOSED TO EXIST"
desc = "Yes hello I'm not supposed to exist, I'm just a weird code artefact thing please contact a developer."
icon = 'icons/obj/64x32guns_ch.dmi'
icon_state = "asval"
icon_expected_height = 32
icon_expected_width = 64
/obj/item/weapon/gun/projectile/automatic/serdy/Initialize()
. = ..()
update_transform()
/obj/item/weapon/gun/projectile/automatic/serdy/update_transform()
. = ..()
transform = transform.Translate(-16,0)
//AK Variants
/obj/item/weapon/gun/projectile/automatic/serdy/asval
name = "AS-VAL"
desc = "A somewhat competent remake of an ancient russian assault rifle. Commonly found in the hands of criminals, and on pan-slavic rimworlds. Integrally suppressed, chambered in 7.62x39mm."
caliber = "9x39mm"
magazine_type = /obj/item/ammo_magazine/asval
allowed_magazines = list(/obj/item/ammo_magazine/asval)
icon_state = "asval"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
muzzle_velocity = 295
/obj/item/weapon/gun/projectile/automatic/serdy/krinkov
name = "Krinkov"
desc = "A professionally cut down AKM made to be easily concealable. With a 12 inch barrel, this is a very loud short barrel rifle. Illegal pretty much everywhere, and easy to get a hold of, these classic russian firearms are a mainstay amidst the various criminal organizations across the galaxy."
caliber = "7.62x39mm"
magazine_type = /obj/item/ammo_magazine/akm
allowed_magazines = list(/obj/item/ammo_magazine/akm)
icon_state = "krinkov"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
muzzle_velocity = 680
/obj/item/weapon/gun/projectile/automatic/serdy/akm
name = "AKM"
desc = "The tried and true, old fashioned chatterbox. Ivan's favorite. Best used while at least somewhat inebriated. Chambered in 7.62x39mm."
caliber = "7.62x39mm"
magazine_type = /obj/item/ammo_magazine/akm
allowed_magazines = list(/obj/item/ammo_magazine/akm)
icon_state = "akm"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
muzzle_velocity = 715
/obj/item/weapon/gun/projectile/automatic/serdy/scrapak
name = "AKM"
desc = "The 'Stalingrad Special'. This rickety old AKM has seen better days. Better bring some vodka, because every shot this gun manages to squeeze off without blowing up in your face is worthy of celebration. Chambered in 7.62x39mm"
caliber = "7.62x39mm"
magazine_type = /obj/item/ammo_magazine/akm
allowed_magazines = list(/obj/item/ammo_magazine/akm)
icon_state = "scrapak"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
muzzle_velocity = 700
// AR Variants
/obj/item/weapon/gun/projectile/automatic/serdy/m16a2
name = "M16A2"
desc = "A favorite service rifle everywhere, even today. It might be a reproduction, but Eugene Stoner smiles upon every man or woman who wields this beautiful democracy dispensing machine, even if it's never seen the soil of Terra, and never will. Chambered in 5.56x45mm."
caliber = "5.56x45mm"
magazine_type = /obj/item/ammo_magazine/m16
allowed_magazines = list(/obj/item/ammo_magazine/m16)
icon_state="m16"
projectile_type = /obj/item/projectile/bullet/rifle/a556
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
muzzle_velocity = 960
/obj/item/weapon/gun/projectile/automatic/serdy/m4a1
name = "M4A1"
desc = "The M16's shorter, more lightweight little brother. An old terran flag is stamped into the receiver. These guns can be found just about everywhere. A favorite on the rimworlds due to its simplicity to produce, and reliability. Chambered in 5.56x45mm."
caliber = "5.56x45mm"
magazine_type = /obj/item/ammo_magazine/m16
allowed_magazines = list(/obj/item/ammo_magazine/m16)
icon_state="m4"
projectile_type = /obj/item/projectile/bullet/rifle/a556
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
load_method = MAGAZINE
muzzle_velocity = 910
/obj/item/weapon/gun/projectile/automatic/serby/patriot
name = "Patriot"
desc = "I raised you, and loved you, I've given you weapons, taught you techniques, endowed you with knowledge. There's nothing more for me to give you. All that's left for you to take is my life. 'Still in a dream' is stamped into the receiver, and it has no serial number. Chambered in 5.56x45mm."
caliber = "5.56x45mm"
magazine_type = /obj/item/ammo_magazine/m16
allowed_magazines = list(/obj/item/ammo_magazine/m16)
icon_state="patriot"
projectile_type = /obj/item/projectile/bullet/rifle/a556
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
load_method = MAGAZINE
muzzle_velocity = 960
//Other rifles
/obj/item/weapon/gun/projectile/automatic/serby/m41ab //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore.
name = "M41A/2"
desc = "The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. This one is a rare, and fairly competent replica of the original by Scarborough Arms, with some minor design improvements over the original. The aluminium chassis is painted steel blue, and it has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock."
caliber = "10x24mm caseless"
magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41ab"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 840
/obj/item/weapon/gun/projectile/automatic/serby/m41a //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore.
name = "M41A"
desc = "A tried and true original. The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. 'PEACE THROUGH SUPERIOR FIREPOWER' is stamped into the side of the aluminium chassis."
caliber = "10x24mm caseless"
magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41a"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 840
/obj/item/weapon/gun/projectile/automatic/serby/sks //Reminder to myself to make sure this works and also to make sure that people are able to empty the internal mag
name = "SKS"
desc = "Just looking at it makes you want to buy a tacticool turtleneck, go into the woods, and -operate-. Chambered in 7.62x39mm."
caliber = "7.62x39mm"
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY
load_method = SINGLE_CASING|SPEEDLOADER
icon_state = "sks"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
muzzle_velocity = 735
max_shells = 10
ammo_type = /obj/item/ammo_casing/a762x39
//Time to give all these existing guns some new properties.
//automatic.dm
/obj/item/weapon/gun/projectile/automatic

215
code/modules/projectiles/projectile/bullets_ch.dm
View File

@@ -176,19 +176,13 @@
submunition_spread_max = 67.5
submunitions = list(/obj/item/projectile/bullet/shotgun/buckshot = 8)
/obj/item/ammo_casing/a12g/pellet
name = "shotgun buckshot shell"
desc = "A 12 gauge buckshot shell."
icon_state = "gshell"
projectile_type = /obj/item/projectile/bullet/shotgun/buckshot/shell
//Rifle projectiles
/obj/item/projectile/bullet/rifle
armor_penetration = 0 //No. Rifle rounds don't get extra AP by default, their nature already makes them more armor penetrating.
/obj/item/projectile/bullet/rifle/a762 //7.62x51 NATO
fire_sound = 'sound/weapons/ballistics/a762.ogg'
diam = 7.62
diam = 7.82
grains = 147
velocity = 850
@@ -204,9 +198,25 @@
armor_penetration = -50
hollow_point = TRUE
/obj/item/projectile/bullet/rifle/a762x39 //7.62x39 Soviet
fire_sound = 'sound/weapons/ballistics/a762.ogg'
diam = 7.85
grains = 122
velocity = 730
/obj/item/projectile/bullet/rifle/a762x39/ap
grains = 123
velocity = 740
energy_add = 117.16
armor_penetration = 50
/obj/item/projectile/bullet/rifle/a762x39/hp
hollow_point = TRUE
armor_penetration = -50
/obj/item/projectile/bullet/rifle/a545
fire_sound = 'sound/weapons/ballistics/a545.ogg'
diam = 5.45
diam = 5.6
grains = 53
velocity = 880
@@ -219,8 +229,24 @@
hollow_point = TRUE
armor_penetration = -50
/obj/item/projectile/bullet/rifle/a556 //5.56x45mm NATO
diam = 5.7
grains = 62
velocity = 961
/obj/item/projectile/bullet/rifle/a556/ap
grains = 52
velocity = 1030
energy_add = 462.92
armor_penetration = 50
/obj/item/projectile/bullet/rifle/a556/hp
hollow_point = TRUE
armor_penetration = -50
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm
fire_sound = 'sound/weapons/ballistics/a145.ogg'
diam = 14.88
grains = 921
velocity = 1000
@@ -240,6 +266,22 @@
grains = 310
velocity = 365
/obj/item/projectile/bullet/rifle/a9x39 //We also have actual 9x39mm
fire_sound = 'sound/weapons/ballistics/a545.ogg'
diam = 9.25
grains = 259
velocity = 280
/obj/item/projectile/bullet/rifle/a9x39/ap
grains = 267
armor_penetration = 25
/obj/item/projectile/bullet/rifle/a10x24
fire_sound = 'sound/weapons/ballistics/a762.ogg'
grains = 210
diam = 10.2
velocity = 840
/obj/item/projectile/bullet/rifle/a762/lmg //This is actually 7.92x57 ffs
diam = 7.92
grains = 181
@@ -247,7 +289,7 @@
/obj/item/projectile/bullet/rifle/a762x54
fire_sound = 'sound/weapons/ballistics/a762x54.ogg'
diam = 7.62
diam = 7.92
grains = 151
velocity = 830
hitscan = 1
@@ -255,160 +297,7 @@
/obj/item/projectile/bullet/rifle/a762x54/ap
armor_penetration = 50
//Time to replace projectiles with their proper counterparts now that we have added them.
/obj/item/ammo_casing/a10mm
projectile_type = /obj/item/projectile/bullet/a10mm
/obj/item/ammo_casing/a38
projectile_type = /obj/item/projectile/bullet/a38
/obj/item/ammo_casing/a380
projectile_type = /obj/item/projectile/bullet/a380
/obj/item/ammo_casing/a357
projectile_type = /obj/item/projectile/bullet/a357
/obj/item/ammo_casing/a57
desc = "A standard 5.7x28mm round"
caliber = "5.7x28mm"
projectile_type = /obj/item/projectile/bullet/a57
matter = list(DEFAULT_WALL_MATERIAL = 60)
/obj/item/ammo_casing/a57/ap
desc = "An armor piercing 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/a57/ap
/obj/item/ammo_casing/a57/hp
desc = "A hollow point 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/a57/ap
/obj/item/ammo_casing/a57/rubber
desc = "A rubber 5.7x28mm round"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/obj/item/ammo_magazine/m9mmp90 //congratulations you are now being converted 5.7x28mm, a.k.a the round the p90 actually uses.
name = "large capacity top mounted magazine (5.7x28mm armor-piercing)" //Ugh, we'll leave it AP I guess
ammo_type = /obj/item/ammo_casing/a57/ap
caliber = "5.7x28mm"
/obj/item/ammo_casing/a762x54
desc = "A standard 7.62x54mmR round"
caliber = "7.62x54mmR"
projectile_type = /obj/item/projectile/bullet/rifle/a762x54
matter = list(DEFAULT_WALL_MATERIAL = 160)
/obj/item/ammo_casing/a762x54/ap
desc = "An armor piercing 7.62x54mmR round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x54/ap
/obj/item/ammo_magazine/m762svd //You are now being converted to 7.62x54mmR :3
name = "\improper SVD magazine (7.62x54mmR)"
caliber = "7.62x54mmR"
ammo_type = /obj/item/ammo_casing/a762x54
/obj/item/ammo_magazine/m762svd/ap
name = "\improper SVD magazine (7.62x54mmR armor-piercing)"
ammo_type = /obj/item/ammo_casing/a762x54/ap
//New magazines
/obj/item/ammo_magazine/a57
name = "five-seven magazine(5.7x28mm standard)"
icon_state = "fiveseven"
max_ammo = 20
mag_type = MAGAZINE
caliber= "5.7x28mm"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 0
ammo_type = /obj/item/ammo_casing/a57
/obj/item/ammo_magazine/a57/ap
name = "five-seven magazine(5.7x28mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a57/ap
/obj/item/ammo_magazine/a57/hp
name = "five-seven magazine(5.7x28mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a57/hp
/obj/item/ammo_magazine/a57/rubber
name = "five-seven magazine(5.7x28mm rubber)"
ammo_type = /obj/item/ammo_casing/a57/rubber
/obj/item/ammo_magazine/mp5mag
name = "mp5 magazine(9x19mm standard)"
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "smg"
max_ammo = 30
mag_type = MAGAZINE
caliber = "9mm"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a9mm
/obj/item/ammo_magazine/mp5mag/ap
name = "mp5 magazine(9x19mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/mp5mag/hp
name = "mp5 magazine(9x19mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/mp5mag/rubber
name = "mp5 magazine(9x19mm rubber)"
ammo_type = /obj/item/ammo_casing/a9mm/rubber
//Add some autolathe entries for the new converted mags
/datum/category_item/autolathe/arms/smg_mp5
name = "mp5 magazine(9x19mm standard)"
path = /obj/item/ammo_magazine/mp5mag
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_ap
name = "mp5 magazine(9x19mm armor-piercing)"
path = /obj/item/ammo_magazine/mp5mag/ap
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_hp
name = "mp5 magazine(9x19mm hollow-point)"
path = /obj/item/ammo_magazine/mp5mag/hp
hidden = 1
/datum/category_item/autolathe/arms/smg_mp5_rubber
name = "mp5 magazine(9x19mm rubber)"
path = /obj/item/ammo_magazine/mp5mag/rubber
/datum/category_item/autolathe/arms/pistol_fiveseven
name = "five-seven magazine(5.7x28mm standard)"
path = /obj/item/ammo_magazine/a57
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_ap
name = "five-seven magazine(5.7x28mm armor-piercing)"
path = /obj/item/ammo_magazine/a57/ap
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_hp
name = "five-seven magazine(5.7x28mm hollow-point)"
path = /obj/item/ammo_magazine/a57/hp
hidden = 1
/datum/category_item/autolathe/arms/pistol_fiveseven_rubber
name = "five-seven magazine(5.7x28mm rubber)"
path = /obj/item/ammo_magazine/a57/rubber
/datum/category_item/autolathe/arms/smg_p90
name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
path = /obj/item/ammo_magazine/m9mmp90
hidden = 1
/datum/category_item/autolathe/arms/svd_762
name = "SVD magazine (7.62x54mmR)"
path = /obj/item/ammo_magazine/m762svd
hidden = 1
/datum/category_item/autolathe/arms/svd_762_ap
name = "SVD magazine (7.62x54mmR armor-piercing)"
path = /obj/item/ammo_magazine/m762svd/ap
hidden = 1
//NOTE: Ammo casings and magazines used to be in this part of the file. They have been moved to respective files in the projectiles/ammunition folder.
//Various "We're not dealing with this shit because of how bad it is" (Some of these may be implemented into the new system with later updates)
/obj/item/projectile/bullet/magnetic