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

C-20R rework, new wielded gun sprites

Browse Source
This commit is contained in:
Aroliacue
2023-07-14 17:33:51 +10:00
parent 58bce63a6c
commit 690596cbf8
10 changed files with 252 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/ammunition/zz_autolathe_ch.dm
View File

@@ -57,6 +57,16 @@
path = /obj/item/ammo_magazine/a57p90/hp
hidden = 1
/datum/category_item/autolathe/arms/c20r/ap
name = "C-20R Magazine (10mm Armor-Piercing)"
path = /obj/item/ammo_magazine/m10mm/ap
hidden = 1
/datum/category_item/autolathe/arms/c20r/hp
name = "C-20R Magazine (10mm Hollow-Point)"
path = /obj/item/ammo_magazine/m10mm/hp
hidden = 1
/datum/category_item/autolathe/arms/svd_762
name = "SVD magazine (7.62x54mmR)"
path = /obj/item/ammo_magazine/m762svd

48
code/modules/projectiles/ammunition/zz_magazines_ch.dm
View File

@@ -36,6 +36,54 @@
/obj/item/ammo_magazine/a57p90/empty
initial_ammo = 0
/*
* C-20R MAGAZINES
*/
/obj/item/ammo_magazine/m10mm
name = "\improper C-20R Magazine (10mm Standard)"
desc = "A 20-round magazine for the C-20R, loaded with caseless ammunition."
icon_state = "10mm"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a10mm
matter = list(MAT_STEEL = 3000)
caliber = "10mm"
max_ammo = 20
multiple_sprites = 1
/obj/item/ammo_magazine/m10mm/ap
name = "\improper C-20R Magazine (10mm Armor-Piercing)"
desc = "A 20-round magazine for the C-20R, loaded with caseless armor-piercing ammunition."
matter = list(MAT_STEEL = 3500)
ammo_type = /obj/item/ammo_casing/a10mm/ap
/obj/item/ammo_magazine/m10mm/hp
name = "\improper C-20R Magazine (10mm Hollow-Point)"
desc = "A 20-round magazine for the C-20R, loaded with caseless hollow-point ammunition."
matter = list(MAT_STEEL = 3500)
ammo_type = /obj/item/ammo_casing/a10mm/hp
/obj/item/ammo_magazine/m10mm/practice
name = "\improper C-20R Magazine (10mm Practice)"
desc = "A 20-round magazine for the C-20R, loaded with caseless practice rounds."
matter = list(MAT_STEEL = 1500)
ammo_type = /obj/item/ammo_casing/a10mm/practice
/obj/item/ammo_magazine/m10mm/rubber
name = "\improper C-20R Magazine (10mm Rubber)"
desc = "A 20-round magazine for the C-20R, loaded with caseless rubber ammunition."
matter = list(MAT_STEEL = 2500)
ammo_type = /obj/item/ammo_casing/a10mm/rubber
/obj/item/ammo_magazine/m10mm/emp
name = "\improper C-20R Magazine (10mm Haywire EMP)"
desc = "A 20-round magazine for the C-20R, loaded with caseless electromagnetic ammunition."
matter = list(MAT_STEEL = 3000, MAT_URANIUM = 1000)
ammo_type = /obj/item/ammo_casing/a10mm/emp
/obj/item/ammo_magazine/m10mm/empty
initial_ammo = 0
/*
* PLACEHOLDER
*/

41
code/modules/projectiles/ammunition/zz_rounds_ch.dm
View File

@@ -1,7 +1,4 @@
//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
@@ -42,9 +39,45 @@
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/*
* PLACEHOLDER
* C-20R ROUNDS
*/
/obj/item/ammo_casing/a10mm
name = "\improper 10mm cartridge"
desc = "A standard caseless 10mm round."
caliber = "10mm"
projectile_type = /obj/item/projectile/bullet/a10mm
matter = list(MAT_STEEL = 60)
caseless = 1
/obj/item/ammo_casing/a10mm/ap
desc = "A caseless armor-piercing 10mm round."
projectile_type = /obj/item/projectile/bullet/a10mm/ap
/obj/item/ammo_casing/a10mm/hp
desc = "A caseless hollow-point 10mm round."
projectile_type = /obj/item/projectile/bullet/a10mm/hp
/obj/item/ammo_casing/a10mm/practice
desc = "A caseless practice 10mm round."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/practice
/obj/item/ammo_casing/a10mm/rubber
desc = "A caseless rubber 10mm round."
projectile_type = /obj/item/projectile/bullet/pistol/rubber
icon_state = "r-casing"
/obj/item/ammo_casing/a10mm/emp
name = "\improper 10mm EMP cartridge"
desc = "A caseless, technologically advanced 10mm round with an electromagnetic payload."
projectile_type = /obj/item/projectile/ion/small
icon_state = "empcasing"
matter = list(MAT_STEEL = 60, MAT_URANIUM = 50)
/*
* PLACEHOLDER
*/
/obj/item/ammo_casing/a762x25
desc = "A standard 7.62x25mm Tokarev round"
caliber = "7.62x25mm"