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

Guns 3: The un-oofening

Browse Source 
see https://github.com/CHOMPStation2/CHOMPStation2/issues/3068 for a general idea of what i fixed
This commit is contained in:
Ocelot
2022-04-06 10:10:11 -04:00
parent 6b35446f12
commit d4f24ccc2a
8 changed files with 284 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,4 +200,66 @@
/datum/category_item/autolathe/arms/vp70_9mm_hp
name = "VP70 magazine (18x 9x19mm hollow-point)"
path = /obj/item/ammo_magazine/m9mm/vp70/hp
hidden = 1
/datum/category_item/autolathe/arms/tp23_44
name = "TP-23 TS magazine (.44 magnum standard)"
path = /obj/item/ammo_magazine/tp23s
hidden = 1
/datum/category_item/autolathe/arms/tp23_44_rubber
name = "TP-23 TS magazine (.44 magnum less-lethal)"
path = /obj/item/ammo_magazine/tp23s/rubber
/datum/category_item/autolathe/arms/tp23_45
name = "TP-23 magazine (.45 ACP standard)"
path = /obj/item/ammo_magazine/tp23
hidden = 1
/datum/category_item/autolathe/arms/tp23_45_ap
name = "TP-23 magazine (.45 ACP armor-piercing)"
path = /obj/item/ammo_magazine/tp23/ap
hidden = 1
/datum/category_item/autolathe/arms/tp23_45_hp
name = "TP-23 magazine (.45 ACP hollow-point)"
path = /obj/item/ammo_magazine/tp23/hp
hidden = 1
/datum/category_item/autolathe/arms/tp23_45_emp
name = "TP-23 magazine (.45 ACP low-yield EMP)"
path = /obj/item/ammo_magazine/tp23/emp
hidden = 1
/datum/category_item/autolathe/arms/tp23_45_flash
name = "TP-23 magazine (.45 ACP flash)"
path = /obj/item/ammo_magazine/tp23/flash
/datum/category_item/autolathe/arms/tp23_45_rubber
name = "TP-23 magazine (.45 ACP rubber)"
path = /obj/item/ammo_magazine/tp23/rubber
/datum/category_item/autolathe/arms/ar10_762x51
name = "AR-10 magazine(7.62x51mm standard)"
path = /obj/item/ammo_magazine/ar10
hidden = 1
/datum/category_item/autolathe/arms/fal_762x51
name = "FAL magazine(7.62x51mm standard)"
path = /obj/item/ammo_magazine/fal
hidden = 1
/datum/category_item/autolathe/arms/smg_pitch
name = "pitchgun magazine(.44 magnum standard)"
path = /obj/item/ammo_magazine/pitchmag
hidden = 1
/datum/category_item/autolathe/arms/rpdm_762x39
name = "RPDM Drum magazine(7.62x39mm standard)"
path = /obj/item/ammo_magazine/rpd
hidden = 1
/datum/category_item/autolathe/arms/rpk_762x39
name = "RPK Drum magazine(7.62x39mm standard)"
path = /obj/item/ammo_magazine/akm/drum
hidden = 1

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

@@ -174,6 +174,17 @@
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a10x24
/obj/item/ammo_magazine/t12
name = "T-12 magazine (10x24mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "t12"
max_ammo = 40
mag_type = MAGAZINE
caliber = "10x24mm"
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 standard)"
icon_state = "gclip"
@@ -222,7 +233,7 @@
name = "AR-10 magazine(7.62x51mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
caliber = "7.62mm"
icon_state = "m41mag" //This just looks the closest IMO
icon_state = "t12"
max_ammo = 20
mag_type = MAGAZINE
multiple_sprites = 1
@@ -238,7 +249,7 @@
name = "FAL magazine(7.62x51mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
caliber = "7.62mm"
icon_state = "m41mag" //This just looks the closest IMO
icon_state = "t12"
max_ammo = 20
mag_type = MAGAZINE
multiple_sprites = 1
@@ -435,3 +446,54 @@
/obj/item/ammo_magazine/m9mm/vp70/hp
name = "VP70 magazine (18x 9x19mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/tp23s
name = "TP-23 TS magazine (.44 magnum standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "45mag"
max_ammo = 12
mag_type = MAGAZINE
caliber = ".44"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a44
/obj/item/ammo_magazine/tp23s/rubber
name = "TP-23 TS magazine (.44 magnum less-lethal)"
ammo_type = /obj/item/ammo_casing/a44/rubber
/obj/item/ammo_magazine/tp23s/highpower
name = "TP-23 TS magazine (.44 magnum +P)"
desc = "This will probably void your warranty... If you have one."
ammo_type = /obj/item/ammo_casing/a44/rifle
/obj/item/ammo_magazine/tp23
name = "TP-23 magazine (.45 ACP)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "45mag"
max_ammo = 12
mag_type = MAGAZINE
caliber = ".45"
matter = list(DEFAULT_WALL_MATERIAL = 800)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a45
/obj/item/ammo_magazine/tp23/rubber
name = "TP-23 magazine (.45 ACP rubber)"
ammo_type = /obj/item/ammo_casing/a45/rubber
/obj/item/ammo_magazine/tp23/flash
name = "TP-23 magazine (.45 ACP flash)"
ammo_type = /obj/item/ammo_casing/a45/flash
/obj/item/ammo_magazine/tp23/hp
name = "TP-23 magazine (.45 ACP hollow-point)"
ammo_type = /obj/item/ammo_casing/a45/hp
/obj/item/ammo_magazine/tp23/ap
name = "TP-23 magazine (.45 ACP armor piercing)"
ammo_type = /obj/item/ammo_casing/a45/ap
/obj/item/ammo_magazine/tp23/emp
name = "TP-23 magazine (.45 ACP low-yield EMP)"
ammo_type = /obj/item/ammo_casing/a45/emp

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

@@ -49,6 +49,7 @@
/obj/item/ammo_casing/a762x54
desc = "A standard 7.62x54mmR round"
caliber = "7.62x54mmR"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a762x54
matter = list(DEFAULT_WALL_MATERIAL = 160)
@@ -59,6 +60,7 @@
/obj/item/ammo_casing/a338
desc = "A standard .338 Lapua round"
caliber = ".338"
icon_state = "lcasing"
projectile_type = /obj/item/projectile/bullet/rifle/a338
/obj/item/ammo_casing/a338/ap
@@ -68,6 +70,7 @@
/obj/item/ammo_casing/a50bmg
desc = "A standard .50 BMG round"
caliber = ".50 BMG"
icon_state = "lcasing"
projectile_type = /obj/item/projectile/bullet/rifle/a50bmg
/obj/item/ammo_casing/a50bmg/ap
@@ -77,11 +80,13 @@
/obj/item/ammo_casing/a127x108
desc = "A standard 12.7x108mm round"
caliber = "12.7x108mm"
icon_state = "lcasing"
projectile_type = /obj/item/projectile/bullet/rifle/a127x108
/obj/item/ammo_casing/a9x39
desc = "A standard 9x39mm round"
caliber = "9x39mm"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39
/obj/item/ammo_casing/a9x39/ap
@@ -91,6 +96,7 @@
/obj/item/ammo_casing/a762x39
desc = "A standard 7.62x39mm round"
caliber = "7.62x39mm"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
/obj/item/ammo_casing/a762x39/ap
@@ -104,6 +110,7 @@
/obj/item/ammo_casing/a556
desc = "A standard 5.56x45mm round"
caliber = "5.56x45mm"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a556
/obj/item/ammo_casing/a556/ap
@@ -116,4 +123,6 @@
/obj/item/ammo_casing/a10x24
desc = "A standard 10x24mm caseless round"
icon_state = "rifle-casing"
caseless = 1
projectile_type = /obj/item/projectile/bullet/rifle/a10x24