From 67675370ca9850361d72127895150e4585a7aa7e Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 2 Jun 2020 15:47:43 -0400 Subject: [PATCH] Makes Mercs Smart Also reverts the health nerf on the ADG --- .../living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm | 5 ++++- .../simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm | 2 +- .../subtypes/mechanical/mecha/adv_dark_gygax_vr.dm | 2 ++ vorestation.dme | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm index 55a9172c07f..6215cf9b2a0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm @@ -22,4 +22,7 @@ max_co2 = 0 min_n2 = 0 max_n2 = 0 - minbodytemp = 0 \ No newline at end of file + minbodytemp = 0 + +/datum/ai_holder/simple_mob/merc + intelligence_level = AI_SMART // Also knows not to walk while confused if it risks death. diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm index 4d418b00015..f45c1b185df 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm @@ -81,7 +81,7 @@ icon_scale_y = 1.5 movement_shake_radius = 14 - maxHealth = 350 //VOREStation Edit + maxHealth = 450 deflect_chance = 25 has_repair_droid = TRUE armor = list( diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm new file mode 100644 index 00000000000..5d0aad8ef45 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm @@ -0,0 +1,2 @@ +/datum/ai_holder/simple_mob/intentional/adv_dark_gygax + intelligence_level = AI_SMART // Also knows not to walk while confused if it risks death. diff --git a/vorestation.dme b/vorestation.dme index 65f66cd229f..5077a3502c7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2710,6 +2710,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\support_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\tank.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\adv_dark_gygax.dm" +#include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\adv_dark_gygax_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\combat_mecha.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\durand.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm"