From 671e01b0738a1f2f4209b642ee9255eb5d1d397e Mon Sep 17 00:00:00 2001 From: Dahlular Date: Tue, 6 Sep 2022 15:39:45 -0600 Subject: [PATCH] I HATE ACTIONS IM USING SPELLS NEXT TIME --- .../modules/jobs/job_types/lambent_aspect.dm | 34 +++++++++++++++++++ .../code/modules/jobs/job_types/security.dm | 10 +++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/hyperstation/code/modules/jobs/job_types/lambent_aspect.dm b/hyperstation/code/modules/jobs/job_types/lambent_aspect.dm index 839298633..aeb5c913b 100644 --- a/hyperstation/code/modules/jobs/job_types/lambent_aspect.dm +++ b/hyperstation/code/modules/jobs/job_types/lambent_aspect.dm @@ -20,6 +20,40 @@ /datum/action/innate/lambent/Grant(mob/user) . = ..() holder = user +/* +//FLIGHT +/datum/action/innate/lambent/flight(mob/user) + name = "Toggle free-flight" + desc = "Displace the weave locally to propell yourself in any direction." + check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUN + + icon_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "flight" + + +/datum/action/innate/lambent/flight/Trigger() + switch(active) + if(0) //Start off + Activate() + active = 1 + return + if(1) + Deactivate() + active = 0 + return //can't help but feel like I'm doing things terribly wrong. + +/datum/action/innate/lambent/flight/Activate() + holder.movement_type |= FLYING + holder.override_float = TRUE + holder.pass_flags |= PASSTABLE + holder.visible_message("Reality begins to distort around [holder], bringing them into the air!") + +/datum/action/innate/lambent/flight/Deactivate() + holder.movement_type &= ~FLYING + holder.override_float = FALSE + holder.pass_flags &= ~PASSTABLE + holder.visible_message("Flickering reality fades as [holder] settles to the ground.") +*/ /* Finish this when I understand the code a bit more /datum/action/cooldown/lambent/locate diff --git a/hyperstation/code/modules/jobs/job_types/security.dm b/hyperstation/code/modules/jobs/job_types/security.dm index a479a01bb..61d4e087f 100644 --- a/hyperstation/code/modules/jobs/job_types/security.dm +++ b/hyperstation/code/modules/jobs/job_types/security.dm @@ -57,8 +57,10 @@ Lambent implants = list(/obj/item/implant/mindshield) //innate abilities will go here -/* + /datum/job/lambent/after_spawn(mob/living/H, mob/M) - var/datum/action/innate/lambent/dash/dash = new - dash.Grant(H) -*/ + //var/datum/action/innate/lambent/dash/dash = new + //dash.Grant(H) + //var/datum/action/innate/lambent/flight/flight = new + //flight.Grant(H) +