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

Revert ballistics overhaul

Browse Source
This commit is contained in:
Darlantan
2021-07-30 21:25:04 -04:00
parent 514afc6d17
commit 9604899135
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
View File

@@ -3,7 +3,7 @@
/mob/living/simple_mob/mechanical/hivebot/ranged_damage /mob/living/simple_mob/mechanical/hivebot/ranged_damage
maxHealth = 2 LASERS_TO_KILL // 60 health maxHealth = 2 LASERS_TO_KILL // 60 health
health = 2 LASERS_TO_KILL health = 2 LASERS_TO_KILL
projectiletype = /obj/item/projectile/bullet/a22lr //CHOMP Edit No longer uses Hivebot bullet. This is a 22 long rifle bullet now. projectiletype = /obj/item/projectile/bullet/hivebot
// The regular ranged hivebot, that fires somewhat weak projectiles. // The regular ranged hivebot, that fires somewhat weak projectiles.
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic

2
code/modules/projectiles/guns/projectile/sniper.dm
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
bolt_open = 0 //CHOMPEdit var/bolt_open = 0
/obj/item/weapon/gun/projectile/heavysniper/update_icon() /obj/item/weapon/gun/projectile/heavysniper/update_icon()
if(bolt_open) if(bolt_open)

5
code/modules/projectiles/projectile.dm
View File

@@ -585,13 +585,14 @@
if(check_penetrate(A)) if(check_penetrate(A))
passthrough = TRUE passthrough = TRUE
penetrating-- penetrating--
//CHOMPEdit Begin /* //CHOMPEdit Begin
var/obj/item/projectile/bullet/this = src var/obj/item/projectile/bullet/this = src
if(istype(this)) if(istype(this))
if(!this.velocity) if(!this.velocity)
passthrough = FALSE passthrough = FALSE
penetrating = 0 penetrating = 0
//CHOMPEdit End //CHOMPEdit End
*/
if(passthrough) if(passthrough)
trajectory_ignore_forcemove = TRUE trajectory_ignore_forcemove = TRUE

9
vorestation.dme
View File

@@ -3324,9 +3324,6 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types_ch.dm"
#include "code\modules\mob\living\voice\voice.dm" #include "code\modules\mob\living\voice\voice.dm"
#include "code\modules\mob\living\voice\voice_vr.dm" #include "code\modules\mob\living\voice\voice_vr.dm"
#include "code\modules\mob\living\zz_ballistics_ch\bullet_act_ch.dm"
#include "code\modules\mob\living\zz_ballistics_ch\z_ballistic_overrides_ch.dm"
#include "code\modules\mob\living\zz_ballistics_ch\z_ballistic_test_ch.dm"
#include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\login.dm"
#include "code\modules\mob\new_player\login_ch.dm" #include "code\modules\mob\new_player\login_ch.dm"
#include "code\modules\mob\new_player\login_vr.dm" #include "code\modules\mob\new_player\login_vr.dm"
@@ -3692,9 +3689,6 @@
#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"
@@ -3704,7 +3698,6 @@
#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"
@@ -3773,7 +3766,6 @@
#include "code\modules\projectiles\guns\projectile\shotgun_vr.dm" #include "code\modules\projectiles\guns\projectile\shotgun_vr.dm"
#include "code\modules\projectiles\guns\projectile\shotgun_yw.dm" #include "code\modules\projectiles\guns\projectile\shotgun_yw.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"
@@ -3781,7 +3773,6 @@
#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"