Bring back ballistics

Now with ez "use old damages" change.
This commit is contained in:
Razgriz
2021-08-12 21:45:10 -07:00
parent df0eafe8de
commit 5d23c0d5b6
3 changed files with 17 additions and 11 deletions

View File

@@ -22,7 +22,7 @@
scoped_accuracy = 75 scoped_accuracy = 75
ignore_visor_zoom_restriction = TRUE // Ignore the restriction on vision modifiers when using this gun's scope. ignore_visor_zoom_restriction = TRUE // Ignore the restriction on vision modifiers when using this gun's scope.
one_handed_penalty = 90 one_handed_penalty = 90
var/bolt_open = 0 bolt_open = 0 //CHOMP Edit
/obj/item/weapon/gun/projectile/heavysniper/update_icon() /obj/item/weapon/gun/projectile/heavysniper/update_icon()
if(bolt_open) if(bolt_open)

View File

@@ -7,7 +7,7 @@
var/hollow_point = FALSE //Determines if the round leaves additional shrapnel in the wound var/hollow_point = FALSE //Determines if the round leaves additional shrapnel in the wound
var/grains = 115 //I hope the unit is obvious var/grains = 115 //I hope the unit is obvious
var/energy //Joules var/energy //Joules
var/old_bullet_act = FALSE //This makes it so that the game ignores the new ballistic stuff and uses old damage system for the bullet. var/old_bullet_act = TRUE //This makes it so that the game ignores the new ballistic stuff and uses old damage system for the bullet.
/*energy_add /*energy_add
Pretty much, when a bullet is a fired from a gun, it replaces the default muzzle velocity of the round with it's own muzzle velocity, Pretty much, when a bullet is a fired from a gun, it replaces the default muzzle velocity of the round with it's own muzzle velocity,

View File

@@ -3691,6 +3691,9 @@
#include "code\modules\projectiles\ammunition\rounds.dm" #include "code\modules\projectiles\ammunition\rounds.dm"
#include "code\modules\projectiles\ammunition\rounds_yw.dm" #include "code\modules\projectiles\ammunition\rounds_yw.dm"
#include "code\modules\projectiles\ammunition\smartmag.dm" #include "code\modules\projectiles\ammunition\smartmag.dm"
#include "code\modules\projectiles\ammunition\zz_autolathe_ch.dm"
#include "code\modules\projectiles\ammunition\zz_magazines_ch.dm"
#include "code\modules\projectiles\ammunition\zz_rounds_ch.dm"
#include "code\modules\projectiles\brokenguns\energy.dm" #include "code\modules\projectiles\brokenguns\energy.dm"
#include "code\modules\projectiles\brokenguns\launcher.dm" #include "code\modules\projectiles\brokenguns\launcher.dm"
#include "code\modules\projectiles\brokenguns\magnetic.dm" #include "code\modules\projectiles\brokenguns\magnetic.dm"
@@ -3700,6 +3703,7 @@
#include "code\modules\projectiles\guns\magic.dm" #include "code\modules\projectiles\guns\magic.dm"
#include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\modular_guns.dm"
#include "code\modules\projectiles\guns\projectile.dm" #include "code\modules\projectiles\guns\projectile.dm"
#include "code\modules\projectiles\guns\projectile_ch.dm"
#include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\vox.dm"
#include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm" #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm"
#include "code\modules\projectiles\guns\energy\crestrose_vr.dm" #include "code\modules\projectiles\guns\energy\crestrose_vr.dm"
@@ -3769,6 +3773,7 @@
#include "code\modules\projectiles\guns\projectile\shotgun_yw.dm" #include "code\modules\projectiles\guns\projectile\shotgun_yw.dm"
#include "code\modules\projectiles\guns\projectile\smartgun.dm" #include "code\modules\projectiles\guns\projectile\smartgun.dm"
#include "code\modules\projectiles\guns\projectile\sniper.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm"
#include "code\modules\projectiles\guns\projectile\zz_ballistics_ch.dm"
#include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" #include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm"
#include "code\modules\projectiles\projectile\arc.dm" #include "code\modules\projectiles\projectile\arc.dm"
#include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\beams.dm"
@@ -3776,6 +3781,7 @@
#include "code\modules\projectiles\projectile\beams_vr.dm" #include "code\modules\projectiles\projectile\beams_vr.dm"
#include "code\modules\projectiles\projectile\blob.dm" #include "code\modules\projectiles\projectile\blob.dm"
#include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\bullets.dm"
#include "code\modules\projectiles\projectile\bullets_ch.dm"
#include "code\modules\projectiles\projectile\bullets_vr.dm" #include "code\modules\projectiles\projectile\bullets_vr.dm"
#include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\change.dm"
#include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\energy.dm"