From 9ab86f20a44d3a5d045457567d3b6e767a91791f Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:57:34 +0200 Subject: [PATCH] rebalance melee explo borg (#8842) --- code/modules/mining/shelter_atoms_vr.dm | 2 ++ maps/offmap_vr/common_offmaps.dm | 4 ++-- .../mob/living/silicon/robot/dogborg/dog_modules.dm | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 66e24d0635..d1bfceec54 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -124,6 +124,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) desc = "A cozy cabin; crammed into a survival capsule." template_id = "shelter_cab" +//CHOMPKeep Start /obj/item/device/survivalcapsule/dropship name = "dropship surfluid shelter capsule" desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom." @@ -131,6 +132,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) unique_id = "shelter_6" is_ship = TRUE w_class = ITEMSIZE_SMALL +//CHOMPKeep End //Custom Shelter Capsules /obj/item/device/survivalcapsule/tabiranth diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index bcedb5397a..540e0eedd2 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -594,7 +594,7 @@ #include "../offmap_vr/om_ships/aro2.dm" #include "../offmap_vr/om_ships/aro3.dm" #include "../offmap_vr/om_ships/bearcat.dm" -#include "../offmap_vr/om_ships/cruiser.dm" +#include "../offmap_vr/om_ships/cruiser.dm" //CHOMPKeep #include "../offmap_vr/om_ships/vespa.dm" #include "../offmap_vr/om_ships/generic_shuttle.dm" #include "../offmap_vr/om_ships/salamander.dm" @@ -611,7 +611,7 @@ ////////////////////////////////////////////////////////////////////////////// //Capsule deployed ships #include "../offmap_vr/om_ships/shelter_5.dm" -#include "../offmap_vr/om_ships/shelter_6.dm" +#include "../offmap_vr/om_ships/shelter_6.dm" //CHOMPKeep ////////////////////////////////////////////////////////////////////////////// //Offmap Spawn Locations diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm b/modular_chomp/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm index afbd6c89f0..97e7bcba42 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm @@ -17,16 +17,16 @@ description_info = "This creates a shield in a straight line perpendicular to the direction where the user was facing when it was activated. \ The shield allows projectiles to leave from inside but blocks projectiles from outside. Everything else can pass through the shield freely, \ including other people and thrown objects. The shield also cannot block certain effects which take place over an area, such as flashbangs or explosions." - shield_health = 35 - max_shield_health = 35 - shield_regen_amount = 10 + shield_health = 90 + max_shield_health = 90 + shield_regen_amount = 25 line_length = 7 // How long the line is. Recommended to be an odd number. offset_from_center = 2 // How far from the projector will the line's center be. /obj/item/weapon/melee/combat_borgblade/explotailspear name = "energy tail" desc = "A glowing tail spear with a moderate range. It appears to be extremely sharp." - force = 25 + force = 45 armor_penetration = 25 //30 to try and make it not useless against armored mobs but not fully nullify it. reach = 3 projectile_parry_chance = 15. @@ -34,7 +34,7 @@ /obj/item/weapon/melee/dogborg/jaws/big/explojaws name = "explo jaws" desc = "Highly lethal jaws for close range combat." - force = 40 + force = 60 armor_penetration = 25 //To try and make it not useless against armored mobs but not fully nullify it projectile_parry_chance = 15