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 #2691 from Darlantanis/ballistics_revert

Browse Source 
Revert ballistics overhaul
This commit is contained in:
Razgriz
2021-07-31 18:20:48 -07:00
committed by GitHub
parent 1aab6fcc45 80613f53db
commit 4e847ee9d8
5 changed files with 7 additions and 15 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
maxHealth = 2 LASERS_TO_KILL // 60 health
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.
/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
ignore_visor_zoom_restriction = TRUE // Ignore the restriction on vision modifiers when using this gun's scope.
one_handed_penalty = 90
bolt_open = 0 //CHOMPEdit
var/bolt_open = 0
/obj/item/weapon/gun/projectile/heavysniper/update_icon()
if(bolt_open)

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

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

4
maps/submaps/surface_submaps/wilderness/dogbase.dmm
View File

@@ -6,7 +6,7 @@
"bl" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/danger{dir = 1},/turf/simulated/floor,/area/submap/DogBase)
"bw" = (/obj/item/weapon/storage/belt/janitor,/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"bx" = (/obj/machinery/porta_turret/poi{faction = "syndicate"},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"bT" = (/obj/structure/safe,/obj/effect/floor_decal/borderfloor{dir = 5},/obj/item/weapon/gun/projectile/automatic/serdy/krinkov,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"bT" = (/obj/structure/safe,/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"cS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/plating,/area/submap/DogBase)
"ec" = (/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"eA" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
@@ -80,7 +80,7 @@
"Ge" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/random/cash/huge,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"Gf" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/filth,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/dirt,/area/submap/DogBase)
"GB" = (/obj/structure/fence{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/DogBase)
"GJ" = (/obj/structure/closet/secure_closet/guncabinet,/obj/random/projectile,/obj/random/projectile,/obj/effect/landmark/loot_spawn,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/obj/item/weapon/gun/projectile/automatic/serdy/plamya,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"GJ" = (/obj/structure/closet/secure_closet/guncabinet,/obj/random/projectile,/obj/random/projectile,/obj/effect/landmark/loot_spawn,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"Hl" = (/turf/simulated/floor,/area/submap/DogBase)
"HF" = (/obj/random/mob/merc/all,/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)
"HM" = (/obj/structure/table/woodentable,/obj/random/contraband/nofail,/turf/simulated/floor/tiled/dark,/area/submap/DogBase)

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\voice\voice.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_ch.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_yw.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\launcher.dm"
#include "code\modules\projectiles\brokenguns\magnetic.dm"
@@ -3704,7 +3698,6 @@
#include "code\modules\projectiles\guns\magic.dm"
#include "code\modules\projectiles\guns\modular_guns.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\energy\bsharpoon_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_yw.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\projectile\arc.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\blob.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\change.dm"
#include "code\modules\projectiles\projectile\energy.dm"