cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bullet penetration update

Browse Source 
We don't need big penetration anymore because we are not using the damage system.
This commit is contained in:
Razgriz
2021-08-12 22:02:54 -07:00
parent 5d23c0d5b6
commit 82c5881e28
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,14 +42,14 @@ only use the hollow_point and armor_penetration values.*/
grains = 66 grains = 66
energy_add = 893 energy_add = 893
velocity = 595 velocity = 595
armor_penetration = 25 armor_penetration = 15
/obj/item/projectile/bullet/pistol/hp /obj/item/projectile/bullet/pistol/hp
grains = 131 grains = 131
velocity = 350 velocity = 350
energy_add = -96.18 energy_add = -96.18
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/pistol/medium //.45 /obj/item/projectile/bullet/pistol/medium //.45
fire_sound = 'sound/weapons/ballistics/a45.ogg' fire_sound = 'sound/weapons/ballistics/a45.ogg'
@@ -61,12 +61,12 @@ only use the hollow_point and armor_penetration values.*/
grains = 173 grains = 173
energy_add = 374 energy_add = 374
velocity = 347 velocity = 347
armor_penetration = 25 armor_penetration = 15
/obj/item/projectile/bullet/pistol/medium/hp /obj/item/projectile/bullet/pistol/medium/hp
grains = 230 grains = 230
velocity = 286 velocity = 286
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/pistol/strong //.357 and .44 are grouped because ftw //Time to fix that ffs, this is just .44 now. /obj/item/projectile/bullet/pistol/strong //.357 and .44 are grouped because ftw //Time to fix that ffs, this is just .44 now.
diam = 10.9 diam = 10.9
@@ -79,17 +79,17 @@ only use the hollow_point and armor_penetration values.*/
grains = 31 grains = 31
velocity = 716 velocity = 716
damage = 15 damage = 15
armor_penetration = 100 //Unfortunately my penetration code doesn't recognize the glory of 5.7x28 FN, so we must show it the wae. armor_penetration = 15 //Unfortunately my penetration code doesn't recognize the glory of 5.7x28 FN, so we must show it the wae.
/obj/item/projectile/bullet/a57/ap /obj/item/projectile/bullet/a57/ap
grains = 23 grains = 23
energy_add = 312.75 energy_add = 312.75
velocity = 850 velocity = 850
armor_penetration = 150 //Also, no, this isn't as high as it looks because of the formulas I was using. This would have around a 35% chance of piercing combat armor(50 bullet armor) armor_penetration = 25 //Also, no, this isn't as high as it looks because of the formulas I was using. This would have around a 35% chance of piercing combat armor(50 bullet armor)
/obj/item/projectile/bullet/a57/hp /obj/item/projectile/bullet/a57/hp
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/a357 /obj/item/projectile/bullet/a357
fire_sound = 'sound/weapons/gunshot4.ogg' fire_sound = 'sound/weapons/gunshot4.ogg'
@@ -101,11 +101,11 @@ only use the hollow_point and armor_penetration values.*/
/obj/item/projectile/bullet/a357/ap /obj/item/projectile/bullet/a357/ap
energy_add = 298.07 energy_add = 298.07
velocity = 480 velocity = 480
armor_penetration = 25 armor_penetration = 15
/obj/item/projectile/bullet/a357/hp /obj/item/projectile/bullet/a357/hp
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/a38 /obj/item/projectile/bullet/a38
fire_sound = 'sound/weapons/gunshot2.ogg' fire_sound = 'sound/weapons/gunshot2.ogg'
@@ -117,14 +117,14 @@ only use the hollow_point and armor_penetration values.*/
grains = 125 grains = 125
energy_add = 138 energy_add = 138
velocity = 300 velocity = 300
armor_penetration = 25 armor_penetration = 15
/obj/item/projectile/bullet/a38/hp /obj/item/projectile/bullet/a38/hp
grains = 158 grains = 158
energy_add = 175.07 energy_add = 175.07
velocity = 297 velocity = 297
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/a762x25 /obj/item/projectile/bullet/a762x25
fire_sound = 'sound/weapons/gunshot2.ogg' fire_sound = 'sound/weapons/gunshot2.ogg'
@@ -148,13 +148,13 @@ only use the hollow_point and armor_penetration values.*/
grains = 200 grains = 200
energy_add = 435 energy_add = 435
velocity = 440 velocity = 440
armor_penetration = 50 armor_penetration = 15
/obj/item/projectile/bullet/a10mm/hp /obj/item/projectile/bullet/a10mm/hp
grains = 135 grains = 135
energy_add = 700.7 energy_add = 700.7
velocity = 490 velocity = 490
armor_penetration = -50 armor_penetration = -15
hollow_point = TRUE hollow_point = TRUE
/obj/item/projectile/bullet/a380 /obj/item/projectile/bullet/a380
@@ -167,13 +167,13 @@ only use the hollow_point and armor_penetration values.*/
grains = 45 grains = 45
energy_add = 648.74 energy_add = 648.74
velocity = 559 velocity = 559
armor_penetration = 25 armor_penetration = 15
/obj/item/projectile/bullet/a380/hp /obj/item/projectile/bullet/a380/hp
grains = 95 grains = 95
energy_add = 170 energy_add = 170
velocity = 343 velocity = 343
armor_penetration = -50 armor_penetration = -15
hollow_point = TRUE hollow_point = TRUE
/obj/item/projectile/bullet/a22lr /obj/item/projectile/bullet/a22lr
@@ -191,6 +191,7 @@ only use the hollow_point and armor_penetration values.*/
grains = 38 grains = 38
velocity = 380 velocity = 380
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -15
//Shotgun projectiles //Shotgun projectiles
@@ -198,7 +199,7 @@ only use the hollow_point and armor_penetration values.*/
fire_sound = 'sound/weapons/ballistics/a12g.ogg' fire_sound = 'sound/weapons/ballistics/a12g.ogg'
grains = 657 grains = 657
velocity = 489 velocity = 489
armor_penetration = -50 //Slugs needed a nerf. Will probably fix the stats for shotguns in general in future updates. armor_penetration = -15 //Slugs needed a nerf. Will probably fix the stats for shotguns in general in future updates.
/obj/item/projectile/bullet/shotgun/buckshot //#00 Buckshot /obj/item/projectile/bullet/shotgun/buckshot //#00 Buckshot
damage = 5 damage = 5
@@ -206,7 +207,7 @@ only use the hollow_point and armor_penetration values.*/
diam = 8.38 diam = 8.38
grains = 53.8 grains = 53.8
velocity = 489 velocity = 489
armor_penetration = -30 armor_penetration = -15
/obj/item/projectile/bullet/shotgun/buckshot/shell /obj/item/projectile/bullet/shotgun/buckshot/shell
use_submunitions = TRUE use_submunitions = TRUE
@@ -226,13 +227,13 @@ only use the hollow_point and armor_penetration values.*/
/obj/item/projectile/bullet/rifle/a762/ap /obj/item/projectile/bullet/rifle/a762/ap
grains = 150.5 grains = 150.5
velocity = 854.6 velocity = 854.6
armor_penetration = 50 armor_penetration = 25
/obj/item/projectile/bullet/rifle/a762/hp /obj/item/projectile/bullet/rifle/a762/hp
grains = 175 grains = 175
energy_add = -539.978 energy_add = -539.978
velocity = 792 velocity = 792
armor_penetration = -50 armor_penetration = -15
hollow_point = TRUE hollow_point = TRUE
/obj/item/projectile/bullet/rifle/a762x39 //7.62x39 Soviet /obj/item/projectile/bullet/rifle/a762x39 //7.62x39 Soviet
@@ -245,11 +246,11 @@ only use the hollow_point and armor_penetration values.*/
grains = 123 grains = 123
velocity = 740 velocity = 740
energy_add = 117.16 energy_add = 117.16
armor_penetration = 50 armor_penetration = 25
/obj/item/projectile/bullet/rifle/a762x39/hp /obj/item/projectile/bullet/rifle/a762x39/hp
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -25
/obj/item/projectile/bullet/rifle/a545 /obj/item/projectile/bullet/rifle/a545
fire_sound = 'sound/weapons/ballistics/a545.ogg' fire_sound = 'sound/weapons/ballistics/a545.ogg'
@@ -260,11 +261,11 @@ only use the hollow_point and armor_penetration values.*/
/obj/item/projectile/bullet/rifle/a545/ap /obj/item/projectile/bullet/rifle/a545/ap
grains = 57 grains = 57
velocity = 890 velocity = 890
armor_penetration = 50 armor_penetration = 15
/obj/item/projectile/bullet/rifle/a545/hp /obj/item/projectile/bullet/rifle/a545/hp
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/rifle/a556 //5.56x45mm NATO /obj/item/projectile/bullet/rifle/a556 //5.56x45mm NATO
diam = 5.7 diam = 5.7
@@ -275,11 +276,11 @@ only use the hollow_point and armor_penetration values.*/
grains = 52 grains = 52
velocity = 1030 velocity = 1030
energy_add = 462.92 energy_add = 462.92
armor_penetration = 50 armor_penetration = 25
/obj/item/projectile/bullet/rifle/a556/hp /obj/item/projectile/bullet/rifle/a556/hp
hollow_point = TRUE hollow_point = TRUE
armor_penetration = -50 armor_penetration = -15
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm /obj/item/projectile/bullet/rifle/a145 // 14.5×114mm
fire_sound = 'sound/weapons/ballistics/a145.ogg' fire_sound = 'sound/weapons/ballistics/a145.ogg'
@@ -332,7 +333,7 @@ only use the hollow_point and armor_penetration values.*/
hitscan = 1 hitscan = 1
/obj/item/projectile/bullet/rifle/a762x54/ap /obj/item/projectile/bullet/rifle/a762x54/ap
armor_penetration = 50 armor_penetration = 35
/obj/item/projectile/bullet/rifle/a338 /obj/item/projectile/bullet/rifle/a338
fire_sound = 'sound/weapons/ballistics/a762x54.ogg' fire_sound = 'sound/weapons/ballistics/a762x54.ogg'