cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 00:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [no gbp] Goliath tentacles now damage mechs [MDB IGNORE] (#23134)

Browse Source 
* [no gbp] Goliath tentacles now damage mechs (#77643)

## About The Pull Request

Goliaths will now use said tentacles on mechs.
The tentacles aren't strong enough to grab mechs so they just damage
them a bit, you're still better off driving through them than a human
is.

## Why It's Good For The Game

Someone pointed out that these abilities were only being used on living
mobs, but miners use mechs sometimes.

## Changelog

🆑
fix: Goliaths will try to attack mechs with their tentacles.
/🆑

* [no gbp] Goliath tentacles now damage mechs

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
This commit is contained in:
SkyratBot
2023-08-17 00:29:24 +02:00
committed by GitHub
parent 32f4007f93
commit 46c8fb70cf
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/lavaland/goliath/goliath_ai.dm
+2 -2
View File
@@ -28,7 +28,7 @@
/datum/ai_behavior/basic_melee_attack/goliath/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key, health_ratio_key)
var/mob/living/target = controller.blackboard[target_key]
// Interrupt attack chain to use tentacles, unless the target is already tentacled
if (isliving(target) && !target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled))
if (ismecha(target) || (isliving(target) && !target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled)))
var/datum/action/cooldown/using_action = controller.blackboard[BB_GOLIATH_TENTACLES]
if (using_action?.IsAvailable())
finish_action(controller, succeeded = FALSE)
@@ -40,7 +40,7 @@
/datum/ai_planning_subtree/targeted_mob_ability/goliath_tentacles/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
var/mob/living/target = controller.blackboard[target_key]
if (!isliving(target) || target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled))
if (!(isliving(target) || ismecha(target)) || (isliving(target) && target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled)))
return // Target can be an item or already grabbed, we don't want to tentacle those
return ..()
code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
+2
View File
@@ -49,6 +49,8 @@
if (victim.apply_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled, grapple_time, src))
buckle_mob(victim, TRUE)
SEND_SIGNAL(victim, COMSIG_GOLIATH_TENTACLED_GRABBED)
for (var/obj/vehicle/sealed/mecha/mech in loc)
mech.take_damage(rand(min_damage, max_damage), damage_type = BRUTE, damage_flag = MELEE, sound_effect = TRUE)
if (!has_buckled_mobs())
retract()
return