cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

more gun tweaks

Browse Source 
added nonlethal magazines, magazines that were missing, changed a few things, and added the Colt SAA.
This commit is contained in:
Ocelot
2022-04-08 07:08:39 -04:00
parent fd8d5ee712
commit 114dbb73a3
15 changed files with 375 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/zz_autolathe_ch.dm
+62
View File
@@ -62,6 +62,10 @@
path = /obj/item/ammo_magazine/asval/ap
hidden = 1
/datum/category_item/autolathe/arms/asval_9x39_rubber
name = "AS-Val magazine(9x39mm less-lethal)"
path = /obj/item/ammo_magazine/asval/rubber
/datum/category_item/autolathe/arms/akm_762x39
name = "AKM magazine (7.62x39mm standard)"
path = /obj/item/ammo_magazine/akm
@@ -77,6 +81,35 @@
path = /obj/item/ammo_magazine/akm/hp
hidden = 1
/datum/category_item/autolathe/arms/akm_762x39_rubber
name = "AKM magazine (7.62x39mm less-lethal)"
path = /obj/item/ammo_magazine/akm/rubber
/datum/category_item/autolathe/arms/ak74
name = "AK74 magazine (5.45mm standard)
path = /obj/item/ammo_magazine/ak74
hidden = 1
/datum/category_item/autolathe/arms/ak74/plum
name = "AK74 'plum' magazine (5.45mm standard)
path = /obj/item/ammo_magazine/ak74/plum
hidden = 1
/datum/category_item/autolathe/arms/ak74/plum/rubber
name = "AK74 'plum' magazine (5.45mm less-lethal)
path = /obj/item/ammo_magazine/ak74/plum/rubber
hidden = 1
/datum/category_item/autolathe/arms/ak74_ap
name = "AK74 magazine (5.45mm armor-piercing)"
path = /obj/item/ammo_magazine/ak74/ap
hidden = 1
/datum/category_item/autolathe/arms/ak74_rubber
name = "AK74 magazine (5.45mm less-lethal)
path = /obj/item/ammo_magazine/ak74/rubber
/datum/category_item/autolathe/arms/m16_556
name = "M16 magazine (5.56x45mm standard)"
path = /obj/item/ammo_magazine/m16
@@ -92,6 +125,10 @@
path = /obj/item/ammo_magazine/m16/hp
hidden = 1
/datum/category_item/autolathe/arms/m16_556_rubber
name = "M16 magazine (5.56x45mm less-lethal)"
path = /obj/item/ammo_magazine/m16/rubber
/datum/category_item/autolathe/arms/sks_762
name = "SKS Clip (10x 7.62x39 standard)"
path = /obj/item/ammo_magazine/clip/sks
@@ -157,6 +194,10 @@
path = /obj/item/ammo_magazine/plamya/ap
hidden = 1
/datum/category_item/autolathe/arms/plamya_9x39_rubber
name = "Plamya drum magazine(9x39mm less-lethal)"
path = /obj/item/ammo_magazine/plamya/rubber
/datum/category_item/autolathe/arms/strela_12g
name = "Strela magazine (12 gauge buckshot)"
path = /obj/item/ammo_magazine/strela
@@ -182,11 +223,19 @@
path = /obj/item/ammo_magazine/ssp4
hidden = 1
/datum/category_item/autolathe/arms/ssp4_10mm/rubber
name = "SSP4 magazine (10mm rubber)"
path = /obj/item/ammo_magazine/ssp4/rubber
/datum/category_item/autolathe/arms/makarov_9x18
name = "Makarov magazine (9x18mm Makarov standard)"
path = /obj/item/ammo_magazine/makarov
hidden = 1
/datum/category_item/autolathe/arms/makarov_9x18/rubber
name = "Makarov magazine (9x18mm Makarov rubber)"
path = /obj/item/ammo_magazine/makarov/rubber
/datum/category_item/autolathe/arms/vp70_9mm
name = "VP70 magazine (18x 9x19mm standard)"
path = /obj/item/ammo_magazine/m9mm/vp70
@@ -202,6 +251,15 @@
path = /obj/item/ammo_magazine/m9mm/vp70/hp
hidden = 1
/datum/category_item/autolathe/arms/vp70_9mm_rubber
name = "VP70 magazine (18x 9x19mm rubber)"
path = /obj/item/ammo_magazine/m9mm/vp70/rubber
/datum/category_item/autolathe/arms/vp70_9mm_flash
name = "VP70 magazine (18x 9x19mm flash)"
path = /obj/item/ammo_magazine/m9mm/vp70/flash
/datum/category_item/autolathe/arms/tp23_44
name = "TP-23 TS magazine (.44 magnum standard)"
path = /obj/item/ammo_magazine/tp23s
@@ -254,6 +312,10 @@
path = /obj/item/ammo_magazine/pitchmag
hidden = 1
/datum/category_item/autolathe/arms/smg_pitch/rubber
name = "pitchgun magazine(.44 magnum less-lethal)"
path = /obj/item/ammo_magazine/pitchmag/rubber
/datum/category_item/autolathe/arms/rpdm_762x39
name = "RPDM Drum magazine(7.62x39mm standard)"
path = /obj/item/ammo_magazine/rpd
code/modules/projectiles/ammunition/zz_magazines_ch.dm
+104 -7
View File
@@ -75,6 +75,12 @@
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a44
/obj/item/ammo_magazine/pitchmag/rubber
name = "pitchgun magazine(.44 magnum less-lethal)"
icon_state = "pitchrubbermag"
matter = list(DEFAULT_WALL_MATERIAL = 700)
ammo_type = /obj/item/ammo_casing/a44/rubber
/obj/item/ammo_magazine/asval
name = "AS-Val magazine(9x39mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -91,6 +97,11 @@
matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a9x39/ap
/obj/item/ammo_magazine/asval/rubber
name = "AS-Val magazine(9x39mm less-lethal)"
matter = list(DEFAULT_WALL_MATERIAL = 1000)
ammo_type = /obj/item/ammo_casing/a9x39/rubber
/obj/item/ammo_magazine/akm
name = "AKM magazine (7.62x39mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -112,6 +123,17 @@
matter = list(DEFAULT_WALL_MATERIAL = 2000)
ammo_type = /obj/item/ammo_casing/a762x39/hp
/obj/item/ammo_magazine/akm/rubber
name = "AKM magazine (7.62x39mm less-lethal)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "762rubbermag"
max_ammo = 30
mag_type = MAGAZINE
caliber = "7.62x39mm"
matter = list(DEFAULT_WALL_MATERIAL = 1200)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a762x39/rubber
/obj/item/ammo_magazine/ak74
name = "AK74 magazine (5.45mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -133,9 +155,19 @@
matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a545/hp
/obj/item/ammo_magazine/ak74/rubber
name = "AK74 magazine (5.45mm less-lethal)"
matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a545/rubber
/obj/item/ammo_magazine/ak74/plum
icon_state = "545plum"
/obj/item/ammo_magazine/ak74/plum/rubber
name = "AK74 magazine (5.45mm less-lethal)"
matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a545/rubber
/obj/item/ammo_magazine/m16
name = "M16 magazine (5.56x45mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -152,6 +184,13 @@
matter = list(DEFAULT_WALL_MATERIAL = 1700)
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/m16/rubber
name = "M16 magazine (5.56x45mm less-lethal)"
icon_state = "556rubbermag"
matter = list(DEFAULT_WALL_MATERIAL = 1700)
ammo_type = /obj/item/ammo_casing/a556/rubber
/obj/item/ammo_magazine/m16/hp
name = "M16 magazine (5.56x45mm hollow-point)"
matter = list(DEFAULT_WALL_MATERIAL = 1700)
@@ -174,6 +213,14 @@
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/a10x24
/obj/item/ammo_magazine/m41/rubber
name = "M41A magazine (10x24mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "m41rubbermag"
max_ammo = 40
matter = list(DEFAULT_WALL_MATERIAL = 7000)
ammo_type = /obj/item/ammo_casing/a10x24/rubber
/obj/item/ammo_magazine/t12
name = "T-12 magazine (10x24mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -320,6 +367,12 @@
matter = list(DEFAULT_WALL_MATERIAL = 3000)
ammo_type = /obj/item/ammo_casing/a9x39/ap
/obj/item/ammo_magazine/plamya/rubber
name = "Plamya drum magazine(9x39mm less-lethal)"
matter = list(DEFAULT_WALL_MATERIAL = 2000)
ammo_type = /obj/item/ammo_casing/a9x39/rubber
icon_state = "plamyarubbermag"
/obj/item/ammo_magazine/strela
name = "Strela magazine(12 gauge buckshot)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -390,7 +443,7 @@
ammo_type = /obj/item/ammo_casing/a762x39
/obj/item/ammo_magazine/rpd/ap
name = "PKM magazine box(7.62x39mm armor-piercing)"
name = "PPD Drum magazine(7.62x39mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 10000)
ammo_type = /obj/item/ammo_casing/a762x39/ap
@@ -406,7 +459,7 @@
ammo_type = /obj/item/ammo_casing/a762x39
/obj/item/ammo_magazine/akm/drum/ap
name = "PKM magazine box(7.62x39mm armor-piercing)"
name = "RPK magazine box(7.62x39mm armor-piercing)"
matter = list(DEFAULT_WALL_MATERIAL = 7500)
ammo_type = /obj/item/ammo_casing/a762x39/ap
@@ -421,6 +474,12 @@
matter = list(DEFAULT_WALL_MATERIAL = 400)
ammo_type = /obj/item/ammo_casing/a10mm
/obj/item/ammo_magazine/ssp4/rubber
name = "SSP4 magazine(10mm standard)"
ammo_type = /obj/item/ammo_casing/a10mm/rubber
icon_state = "10mmrubbermag"
matter = list(DEFAULT_WALL_MATERIAL = 300)
/obj/item/ammo_magazine/makarov
name = "Makarov magazine(9x18mm Makarov standard)"
icon = 'icons/obj/ammo_ch.dmi'
@@ -432,26 +491,41 @@
matter = list(DEFAULT_WALL_MATERIAL = 400)
ammo_type = /obj/item/ammo_casing/a9x18
/obj/item/ammo_magazine/makarov/rubber
name = "Makarov magazine(9x18mm Makarov rubber)"
ammo_type = /obj/item/ammo_casing/a9x18/rubber
icon_state = "9mmrubbermag"
/obj/item/ammo_magazine/m9mm/vp70
name = "VP70 magazine (18x 9x19mm standard)"
name = "VP70 magazine (9x19mm standard)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "9mmmag"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 18
/obj/item/ammo_magazine/m9mm/vp70/ap
name = "VP70 magazine (18x 9x19mm armor-piercing)"
name = "VP70 magazine (9x19mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/m9mm/vp70/hp
name = "VP70 magazine (18x 9x19mm hollow-point)"
name = "VP70 magazine (9x19mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/m9mm/vp70/rubber
name = "VP70 magazine (9x19mm rubber)"
ammo_type = /obj/item/ammo_casing/a9mm/rubber
icon_state = "9mmrubbermag"
/obj/item/ammo_magazine/m9mm/vp70/flash
name = "VP70 magazine (9x19mm flash)"
ammo_type = /obj/item/ammo_casing/a9mm/flash
icon_state = "9mmrubbermag"
/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
max_ammo = 10
mag_type = MAGAZINE
caliber = ".44"
matter = list(DEFAULT_WALL_MATERIAL = 800)
@@ -471,7 +545,7 @@
name = "TP-23 magazine (.45 ACP)"
icon = 'icons/obj/ammo_ch.dmi'
icon_state = "45mag"
max_ammo = 12
max_ammo = 14
mag_type = MAGAZINE
caliber = ".45"
matter = list(DEFAULT_WALL_MATERIAL = 800)
@@ -497,3 +571,26 @@
/obj/item/ammo_magazine/tp23/emp
name = "TP-23 magazine (.45 ACP low-yield EMP)"
ammo_type = /obj/item/ammo_casing/a45/emp
/obj/item/ammo_magazine/s45lc
name = "speedloader (.45 LC)"
icon = 'icons/obj/ammo.dmi'
icon_state = "44"
ammo_type = /obj/item/ammo_casing/a45lc
matter = list(MAT_STEEL = 1260) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45 LC"
max_ammo = 6
multiple_sprites = 1
/obj/item/ammo_magazine/s45lc/empty
initial_ammo = 0
/obj/item/ammo_magazine/s45lc/rubber
name = "speedloader (.45 LC rubber)"
icon_state = "R44"
ammo_type = /obj/item/ammo_casing/a45lc/rubber
/obj/item/ammo_magazine/s45lc/rifle
name = "speedloader (.45 LC +P)"
icon_state = "RI44"
ammo_type = /obj/item/ammo_casing/a45lc/rifle
code/modules/projectiles/ammunition/zz_rounds_ch.dm
+45 -3
View File
@@ -46,16 +46,21 @@
caliber = "9x18mm"
projectile_type = /obj/item/projectile/bullet/a9x18
/obj/item/ammo_casing/a9x18/rubber
desc = "A rubber 9x18mm Makarov round"
caliber = "9x18mm"
projectile_type = /obj/item/projectile/bullet/a9x18/rubber
/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
projectile_type = /obj/item/projectile/bullet/rifle/a762
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
projectile_type = /obj/item/projectile/bullet/rifle/a762/ap
/obj/item/ammo_casing/a338
desc = "A standard .338 Lapua round"
@@ -99,6 +104,10 @@
desc = "An armor piercing 9x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39/ap
/obj/item/ammo_casing/a9x39/rubber
desc = "A less-lethal 9x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39/rubber
/obj/item/ammo_casing/a762x39
desc = "A standard 7.62x39mm round"
caliber = "7.62x39mm"
@@ -113,6 +122,14 @@
desc = "A hollow point 7.62x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39/hp
/obj/item/ammo_casing/a762x39/rubber
desc = "A less-lethal 7.62x39mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39/rubber
/obj/item/ammo_casing/a545/rubber
desc = "A 5.45mm less-lethal bullet casing."
projectile_type = /obj/item/projectile/bullet/rifle/a545/rubber
/obj/item/ammo_casing/a556
desc = "A standard 5.56x45mm round"
caliber = "5.56x45mm"
@@ -127,8 +144,33 @@
desc = "A hollow point 5.56x45mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a556/hp
/obj/item/ammo_casing/a556/rubber
desc = "A less-lethal 5.56x45mm round"
projectile_type = /obj/item/projectile/bullet/rifle/a556/rubber
/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
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
/obj/item/ammo_casing/a10x24/rubber
desc = "A less-lethal 10x24mm caseless round"
icon_state = "rifle-casing"
caseless = 1
projectile_type = /obj/item/projectile/bullet/rifle/a10x24/rubber
/obj/item/ammo_casing/a45lc
desc = "A long silver bullet... .45 LC stamped into the base."
caliber = ".45 LC"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a45lc
/obj/item/ammo_casing/a45lc/rifle
desc = "A long silver bullet... +P, and .45 LC stamped into the base."
projectile_type = /obj/item/projectile/bullet/rifle/a45lc/rifle
/obj/item/ammo_casing/a45lc/rubber
desc = "A long silver bullet... Has a rubber tip, and .45 LC stamped into the base."
projectile_type = /obj/item/projectile/bullet/rifle/a45lc/rubber