Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)

This reverts commit 27c40bdaf6.
This commit is contained in:
Matt Atlas
2023-07-31 01:51:40 +00:00
committed by GitHub
parent 06ca379a91
commit 87f637564f
145 changed files with 1617 additions and 3162 deletions
+17 -15
View File
@@ -1,28 +1,35 @@
/datum/psi_complexus
var/announced = FALSE // Whether or not we have been announced to our holder yet.
var/suppressed = FALSE // Whether or not we are suppressing our psi powers.
var/suppressed = TRUE // Whether or not we are suppressing our psi powers.
var/use_psi_armor = TRUE // Whether or not we should automatically deflect/block incoming damage.
var/rebuild_power_cache = TRUE // Whether or not we need to rebuild our cache of psi powers.
var/rating = 0 // Overall psi rating.
var/cost_modifier = 1 // Multiplier for power use stamina costs.
var/stun = 0 // Number of process ticks we are stunned for.
var/next_power_use = 0 // world.time minimum before next power use.
var/stamina = 100 // Current psi pool.
var/max_stamina = 100 // Max psi pool.
var/psi_points = 0 // Points spendable in the psi pointshop.
var/spent_psi_points = 0 // Need to keep track of if someone has spent psi-points before for things like updating psi-rank.
var/stamina = 50 // Current psi pool.
var/max_stamina = 50 // Max psi pool.
var/psionic_rank
var/last_psionic_rank
var/list/latencies // List of all currently latent faculties.
var/list/ranks // Assoc list of psi faculties to current rank.
var/list/base_ranks // Assoc list of psi faculties to base rank, in case reset is needed
var/list/manifested_items // List of atoms manifested/maintained by psychic power.
var/list/psionic_powers = list() // List of singleton abilities.
var/next_latency_trigger = 0 // world.time minimum before a trigger can be attempted again.
var/last_armor_check // world.time of last armor check.
var/last_aura_size
var/last_aura_alpha
var/last_aura_color
var/aura_color = "#ff0022"
var/datum/component/armor/psionic/armor_component
// Cached powers.
var/list/melee_powers // Powers used in melee range.
var/list/grab_powers // Powers use by using a grab.
var/list/ranged_powers // Powers used at range.
var/list/manifestation_powers // Powers that create an item.
var/list/powers_by_faculty // All powers within a given faculty.
var/obj/screen/psi/hub/ui // Reference to the master psi UI object.
var/mob/living/owner // Reference to our owner.
var/image/_aura_image // Client image
@@ -63,17 +70,13 @@
/datum/psi_complexus/New(var/mob/_owner)
owner = _owner
SSpsi.all_psi_complexes |= src
START_PROCESSING(SSpsi, src)
/datum/psi_complexus/Destroy()
destroy_aura_image(_aura_image)
SSpsi.all_psi_complexes -= src
QDEL_NULL(armor_component)
STOP_PROCESSING(SSpsi, src)
if(owner)
if(owner.ability_master)
owner.ability_master.remove_all_psionic_abilities()
cancel()
if(owner.client)
owner.client.screen -= ui
for(var/thing in SSpsi.all_aura_images)
@@ -86,5 +89,4 @@
for(var/thing in manifested_items)
qdel(thing)
manifested_items.Cut()
. = ..()