From acd3100a50d4c8e7dfb55526168fea0905f8d923 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Fri, 28 Jun 2024 18:20:39 +0300 Subject: [PATCH] a --- .../xenomorph/abilities/general_abilities.dm | 15 +++++++++++++++ .../abilities/hivelord/hivelord_abilities.dm | 7 ------- .../abilities/hivelord/hivelord_powers.dm | 8 -------- .../living/carbon/xenomorph/castes/Hivelord.dm | 4 ---- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 39b05b964648..c5988f12539d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -566,3 +566,18 @@ var/mob/living/carbon/xenomorph/xeno = owner xeno.xeno_tacmap() return ..() + +/datum/action/xeno_action/active_toggle/toggle_meson_vision + name = "Toggle Meson Vision" + action_icon_state = "project_xeno" + plasma_cost = 0 + action_type = XENO_ACTION_CLICK + ability_primacy = XENO_PRIMARY_ACTION_5 + +/datum/action/xeno_action/active_toggle/toggle_meson_vision/enable_toggle() + . = ..() + owner.sight |= SEE_TURFS + +/datum/action/xeno_action/active_toggle/toggle_meson_vision/disable_toggle() + . = ..() + owner.sight &= ~SEE_TURFS diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_abilities.dm index c5c607afb0b8..ea5f32694c99 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_abilities.dm @@ -32,10 +32,3 @@ if(hivelord_delegate.resin_walker == TRUE) button.icon_state = "template_active" action_active = TRUE - -/datum/action/xeno_action/active_toggle/toggle_meson_vision - name = "Toggle Meson Vision" - action_icon_state = "project_xeno" - plasma_cost = 0 - action_type = XENO_ACTION_CLICK - ability_primacy = XENO_PRIMARY_ACTION_5 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_powers.dm index 12821fb9c5cc..e4e889280793 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_powers.dm @@ -30,11 +30,3 @@ return xeno.recalculate_move_delay = TRUE - -/datum/action/xeno_action/active_toggle/toggle_meson_vision/enable_toggle() - . = ..() - owner.sight |= SEE_TURFS - -/datum/action/xeno_action/active_toggle/toggle_meson_vision/disable_toggle() - . = ..() - owner.sight &= ~SEE_TURFS diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index 44f491d655a3..8024ed366405 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -83,14 +83,10 @@ icon_xeno = 'icons/mob/xenos/hivelord.dmi' icon_xenonid = 'icons/mob/xenonids/hivelord.dmi' - weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi' weed_food_states = list("Hivelord_1","Hivelord_2","Hivelord_3") weed_food_states_flipped = list("Hivelord_1","Hivelord_2","Hivelord_3") -/mob/living/carbon/xenomorph/hivelord/Initialize(mapload, mob/living/carbon/xenomorph/oldxeno, h_number) - . = ..() - /datum/behavior_delegate/hivelord_base name = "Base Hivelord Behavior Delegate"