cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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