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

Merge pull request #4036 from SilencedMP5A5/ocelot_do_a_thing

Browse Source 
More gun tweaks
This commit is contained in:
Razgriz
2022-04-09 14:06:30 -07:00
committed by GitHub
parent d7f41be5ed fc6c0038fe
commit 23930aac17
15 changed files with 380 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

@@ -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

114
code/modules/projectiles/ammunition/zz_magazines_ch.dm
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,12 @@
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)"
icon_state = "asvalrubber"
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 +124,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 +156,21 @@
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)"
icon_state = "545bakerubber"
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)"
icon_state = "545plumrubber"
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 +187,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 +216,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 +370,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 +446,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 +462,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 +477,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 +494,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 +548,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 +574,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

48
code/modules/projectiles/ammunition/zz_rounds_ch.dm
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

19
code/modules/projectiles/guns/energy/laser_ch.dm
View File

@@ -109,4 +109,21 @@
slot_flags = SLOT_BELT|SLOT_BACK
charge_cost = 1500 //You got 1 shot...
projectile_type = /obj/item/projectile/beam/heavylaser //But it hurts a lot
cell_type = /obj/item/weapon/cell/device/weapon
cell_type = /obj/item/weapon/cell/device/weapon
/obj/item/weapon/gun/energy/vepr/plasma
name = "WKHM 'Vepr-Prisma'"
desc = "The Vepr-Prisma plasma rifle, in 40 Watt range. A very robust version of the Vepr lasrifle, made to fire energized bolts of plasma. The Vepr-Prisma is very uncommon, reserved mainly for W-K's internal security forces, and organizations with lots of money to spend. Lacks a burst mode, but it probably doesn't need it. This one bears the 'WKHM Adamant' arkship's production stamp."
description_fluff = "WKHM, is a minor arms company that has been around for quite some time, established in 2408. Known for being one of the many suppliers of weapons to dangerous worlds on the rim, and a part of the FTU. They produce a large variety of firearms, strike craft, and armored vehicles to fufill various their various contracts, and are largely migrant, moving wherever the money is. Found almost entirely on mobile production ships and various escort craft. Identifiable by their logo, a red Omega symbol with a black or white W in the middle. The sheer quantity of their firearms produced ensures they can be found.. just about anywhere, and they are very sought after by pirates for their reliability."
icon_expected_width = 64
icon = 'icons/obj/64x32guns_ch.dmi'
icon_state = "vepr"
fire_delay = 0.5
projectile_type = /obj/item/projectile/energy/plasma/vepr
force = 8
w_class = ITEMSIZE_HUGE //Probably gonna make it a rifle sooner or later //CHOMP Edit, and so I did.
slot_flags = SLOT_BELT|SLOT_BACK //CHOMP Edit. Let's make it so that if it doesn't fit in a backpack, it doesn't fit in a holster either.
var/is64x32_override = TRUE
accept_cell_type = /obj/item/weapon/cell/vepr
cell_type = /obj/item/weapon/cell/vepr
origin_tech = list(TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ILLEGAL = 4)

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

@@ -334,7 +334,7 @@
/obj/item/weapon/gun/projectile/automatic/serdy/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"
caliber = "10x24mm"
magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41b"
@@ -352,7 +352,7 @@
/obj/item/weapon/gun/projectile/automatic/serdy/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"
caliber = "10x24mm"
magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41a"
@@ -775,7 +775,7 @@
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/weapon/gun/projectile/automatic/serdy/vityazb
name = "WKHM 'Vityaz' B"
name = "WKHM 'Vityaz-B'"
desc = "A swarm of angry bees. The Plamya's baby brother. With 12 total moving parts, including the trigger mechanism, this gun was built with one purpose. Longevity and reliability. Commonly found in the hands of private security, criminals, and law enforcement alike across many worlds. This one is a B model, made to fire faster, at the expense of reliability. Chambered in 10mm."
description_fluff = "WKHM, is a minor arms company that has been around for quite some time, established in 2408. Known for being one of the many suppliers of weapons to dangerous worlds on the rim, and a part of the FTU. They produce a large variety of firearms, strike craft, and armored vehicles to fufill various their various contracts, and are largely migrant, moving wherever the money is. Found almost entirely on mobile production ships and various escort craft. Identifiable by their logo, a red Omega symbol with a black or white W in the middle. The sheer quantity of their firearms produced ensures they can be found.. just about anywhere, and they are very sought after by pirates for their reliability."
caliber = "10mm"
@@ -798,7 +798,7 @@
//LMGs
/obj/item/weapon/gun/projectile/automatic/serdy/molniya
/obj/item/weapon/gun/projectile/automatic/serdy/molniya //this is essentially a space MG42
name = "WKHM 'Molniya'"
desc = "A light machinegun manufactured by WKHM for various paramilitaries, private security companies, and rimworld governments. Big, heavy, and with a fire rate similar to that of an MG42. Often used in emplacements and on top of armored vehicles, or as a squad support weapon. Nicknamed the 'Pig' or the 'Sawzall', this one has a solid oak stock, and bears the 'WKHM Adamant' arkship's production stamp. If you ever see this gun, there is no doubt shit's about to go down. Chambered in 7.62x51mm."
description_fluff = "WKHM, is a minor arms company that has been around for quite some time, established in 2408. Known for being one of the many suppliers of weapons to dangerous worlds on the rim, and a part of the FTU. They produce a large variety of firearms, strike craft, and armored vehicles to fufill various their various contracts, and are largely migrant, moving wherever the money is. Found almost entirely on mobile production ships and various escort craft. Identifiable by their logo, a red Omega symbol with a black or white W in the middle. The sheer quantity of their firearms produced ensures they can be found.. just about anywhere, and they are very sought after by pirates for their reliability."
@@ -811,8 +811,10 @@
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,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="long bursts", burst=15, move_delay=8, burst_accuracy = list(0,-15,-15,-30,-30,0,-15,-15,-30,-30,0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
auto_loading_type = OPEN_BOLT
muzzle_velocity = 860
@@ -832,6 +834,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
auto_loading_type = OPEN_BOLT
muzzle_velocity = 825
@@ -851,6 +854,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
auto_loading_type = OPEN_BOLT
muzzle_velocity = 735
@@ -870,6 +874,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
muzzle_velocity = 745
@@ -894,6 +899,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
auto_loading_type = OPEN_BOLT
muzzle_velocity = 860
@@ -1038,10 +1044,6 @@
caliber = "9mm"
magazine_type = /obj/item/ammo_magazine/m9mm/large
allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
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,-20,-40), dispersion=list(0.0, 0.9, 1.8))
)
projectile_type = /obj/item/projectile/bullet/pistol
muzzle_velocity = 375
fire_sound = "sound/weapons/serdy/9mmpistol.ogg"
@@ -1055,7 +1057,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/tp23s)
projectile_type = /obj/item/projectile/bullet/pistol/strong
muzzle_velocity = 465
fire_sound = "sound/weapons/serdy/vityaz.ogg"
fire_sound = "sound/weapons/serdy/deagle.ogg"
/obj/item/weapon/gun/projectile/serdy_pistols/tp23
name = "TP-23"
@@ -1066,7 +1068,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/tp23)
projectile_type = /obj/item/projectile/bullet/pistol/medium
muzzle_velocity = 300
fire_sound = "sound/weapons/serdy/40pistol.ogg"
fire_sound = "sound/weapons/serdy/pistol_service.ogg"
/obj/item/weapon/gun/projectile/revolver/nagant
@@ -1077,6 +1079,18 @@
max_shells = 7
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/weapon/gun/projectile/revolver/saa
name = "Colt Single Action Army"
desc = "A Colt Single Action Army. The greatest handgun ever made. Six shots. More than enough to kill anything that moves... Chambered in .45 Long-Colt." //sue me -- Ocelot
icon = 'icons/obj/gun_ch.dmi'
caliber = ".45 LC"
icon_state = "saa"
fire_delay = 0 //fastest gun in the west
ammo_type = /obj/item/ammo_casing/a45lc
max_shells = 6
move_delay = 0
fire_sound = "sound/weapons/serdy/44mag.ogg"
/obj/item/weapon/gun/projectile/revolver/nagant/skinned
name = "nagant revolver"
icon_state = "nagantb"

7
code/modules/projectiles/projectile/beams_ch.dm
View File

@@ -8,7 +8,7 @@
muzzle_type = /obj/effect/projectile/muzzle/phaser
tracer_type = /obj/effect/projectile/tracer/phaser
impact_type = /obj/effect/projectile/impact/phaser
/obj/item/projectile/beam/phaser/light
damage = 5
@@ -84,3 +84,8 @@
light_range = 1.5
light_power = 0.3
/obj/effect/projectile/muzzle/vepr
icon_state = "vepr_muzzle"
light_color = "#FF6A00"
light_range = 3
light_power = 1

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

@@ -138,6 +138,16 @@ only use the hollow_point and armor_penetration values.*/
grains = 95
velocity = 319
/obj/item/projectile/bullet/a9x18/rubber
armor_penetration = -10
grains = 102
velocity = 301
damage = 10
agony = 40
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/a10mm
fire_sound = 'sound/weapons/gunshot2.ogg'
diam = 10.17
@@ -157,6 +167,16 @@ only use the hollow_point and armor_penetration values.*/
armor_penetration = -10
hollow_point = TRUE
/obj/item/projectile/bullet/a10mm/rubber
armor_penetration = -10
grains = 142
velocity = 301
damage = 10
agony = 50
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/a380
fire_sound = 'sound/weapons/gunshot2.ogg'
diam = 9
@@ -236,6 +256,16 @@ only use the hollow_point and armor_penetration values.*/
armor_penetration = -10
hollow_point = TRUE
/obj/item/projectile/bullet/rifle/a762/rubber
armor_penetration = -10
grains = 142
velocity = 661
damage = 25 //this still hurts like a motherfucker
agony = 100
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/rifle/a762x39 //7.62x39 Soviet
fire_sound = 'sound/weapons/ballistics/a762.ogg'
diam = 7.85
@@ -252,6 +282,16 @@ only use the hollow_point and armor_penetration values.*/
hollow_point = TRUE
armor_penetration = -10
/obj/item/projectile/bullet/rifle/a762x39/rubber
armor_penetration = -10
grains = 142
velocity = 661
damage = 15 //this still hurts like a motherfucker
agony = 70
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/rifle/a545
fire_sound = 'sound/weapons/ballistics/a545.ogg'
diam = 5.6
@@ -263,6 +303,16 @@ only use the hollow_point and armor_penetration values.*/
velocity = 890
armor_penetration = 15
/obj/item/projectile/bullet/rifle/a545/rubber
armor_penetration = -10
grains = 82
velocity = 761
damage = 15
agony = 60
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/rifle/a545/hp
hollow_point = TRUE
armor_penetration = -10
@@ -282,6 +332,16 @@ only use the hollow_point and armor_penetration values.*/
hollow_point = TRUE
armor_penetration = -10
/obj/item/projectile/bullet/rifle/a556/rubber
armor_penetration = -10
grains = 82
velocity = 861
damage = 15
agony = 60
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm
fire_sound = 'sound/weapons/ballistics/a145.ogg'
diam = 14.88
@@ -302,7 +362,7 @@ only use the hollow_point and armor_penetration values.*/
/obj/item/projectile/bullet/rifle/a95 //I hate you. There is no real world analog for 9.5x40mm, I will guestimate from the 9x39mm russian round and give it some bonus for future points or whatever
diam = 9.5
grains = 310
velocity = 365
velocity = 365 //cadyn cope above, beware ^^
/obj/item/projectile/bullet/rifle/a9x39 //We also have actual 9x39mm
fire_sound = 'sound/weapons/ballistics/a545.ogg'
@@ -314,12 +374,31 @@ only use the hollow_point and armor_penetration values.*/
grains = 267
armor_penetration = 25
/obj/item/projectile/bullet/rifle/a9x39/rubber
armor_penetration = -10
grains = 282
velocity = 161
damage = 20
agony = 70
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/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/a10x24/rubber
armor_penetration = -10
grains = 280
velocity = 400
damage = 20
agony = 80
embed_chance = 0
sharp = FALSE
check_armour = "melee"
/obj/item/projectile/bullet/rifle/a762/lmg //This is actually 7.92x57 ffs
diam = 7.92
grains = 181
@@ -368,6 +447,26 @@ only use the hollow_point and armor_penetration values.*/
penetrating = 2
armor_penetration=30
/obj/item/projectile/bullet/rifle/a45lc //yee haw
diam = 11.43
grains = 250
velocity = 600
/obj/item/projectile/bullet/rifle/a45lc/rifle
grains = 267
velocity = 800
armor_penetration = 15
/obj/item/projectile/bullet/rifle/a45lc/rubber
armor_penetration = -10
grains = 282
velocity = 200
damage = 20
agony = 70
embed_chance = 0
sharp = FALSE
check_armour = "melee"
//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)

17
code/modules/projectiles/projectile/energy_ch.dm
View File

@@ -5,4 +5,19 @@
/obj/item/projectile/energy/phase/bolt/heavy
range = 4
SA_bonus_damage = 25 // 20 total on animals
SA_bonus_damage = 25 // 20 total on animals
/obj/item/projectile/energy/plasma/vepr
name = "plasma bolt"
icon = 'icons/obj/projectiles_ch.dmi'
icon_state = "vepr"
fire_sound = 'sound/weapons/serdy/vepr.ogg'
damage = 30
armor_penetration = 10
damage_type = BURN
check_armour = "energy"
muzzle_type = /obj/effect/projectile/muzzle/vepr
impact_effect_type = /obj/effect/temp_visual/impact_effect
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hitsound = 'sound/weapons/sear.ogg'