Ports Psionics From Baystation (2 years later edition)

code/__DEFINES/magic.dm

@@ -30,6 +30,8 @@
 #define SCHOOL_FORBIDDEN "forbidden"
 /// Blood magic, involves vampirism, draining blood, etc.
 #define SCHOOL_SANGUINE "sanguine"
+/// psionic powers, not *technically* magic
+#define SCHOOL_PSIONIC "psionic"
 
 // Invocation types - what does the wizard need to do to invoke (cast) the spell?
 /// Allows being able to cast the spell without saying or doing anything.

code/__DEFINES/psi.dm

@@ -17,8 +17,9 @@
 #define PSI_IMPLANT_DISABLED   "Disabled"
 
 #define INVOKE_PSI_POWERS(holder, powers, target, return_on_invocation) \
-	if(holder?.psi?.can_use()) { \
-		for(var/datum/psionic_power/power as anything in powers) { \
+	if(holder && holder.psi && holder.psi.can_use()) { \
+		for(var/thing in powers) { \
+			var/datum/psionic_power/power = thing; \
 			var/obj/item/result = power.invoke(holder, target); \
 			if(result) { \
 				power.handle_post_power(holder, target); \

code/_onclick/other_mobs.dm

@@ -5,8 +5,6 @@
 	Otherwise pretty standard.
 */
 /mob/living/carbon/human/UnarmedAttack(atom/A, proximity, modifiers)
-	if(psi)
-		INVOKE_PSI_POWERS(src, psi.get_melee_powers(), A, FALSE)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		if(src == A)
 			check_self_for_injuries()
@@ -52,11 +50,7 @@
 /mob/living/carbon/human/attack_empty_hand()
 	if(psi)
 		INVOKE_PSI_POWERS(src, psi.get_manifestations(), src, FALSE)
-
-/mob/living/carbon/human/RangedAttack(atom/A, params)
-	if(psi)
-		INVOKE_PSI_POWERS(src, psi.get_ranged_powers(), A, TRUE)
-
+
 //Return TRUE to cancel other attack hand effects that respect it.
 /atom/proc/attack_hand(mob/user, modifiers)
 	. = FALSE

code/controllers/subsystem/processing/psi.dm

@@ -12,7 +12,6 @@ PROCESSING_SUBSYSTEM_DEF(psi)
 	var/list/psi_dampeners =          list()
 	var/list/psi_monitors =           list()
 	var/list/armour_faculty_by_type = list()
-	var/list/faculties_by_intent  = list()
 
 /datum/controller/subsystem/processing/psi/New()
 	NEW_SS_GLOBAL(SSpsi)
@@ -28,7 +27,6 @@ PROCESSING_SUBSYSTEM_DEF(psi)
 		var/datum/psionic_faculty/faculty = new ftype
 		faculties_by_id[faculty.id] = faculty
 		faculties_by_name[faculty.name] = faculty
-		faculties_by_intent[faculty.associated_intent] = faculty.id
 
 	var/list/powers = subtypesof(/datum/psionic_power)
 	for(var/ptype in powers)

code/modules/psionics/complexus/complexus_latency.dm

@@ -1,5 +1,4 @@
 /datum/psi_complexus/proc/check_latency_trigger(trigger_strength = 0, source, redactive = FALSE)
-
 	if(!LAZYLEN(latencies) || world.time < next_latency_trigger)
 		return FALSE
 

code/modules/psionics/complexus/complexus_process.dm

@@ -51,6 +51,64 @@
 				aura_color = "#33cc33"
 			if(PSI_ENERGISTICS)
 				aura_color = "#cccc33"
+
+	// for(var/datum/psionic_power/power in subtypesof(/datum/psionic_power))
+
+	//operant level psionics
+	if(get_rank(PSI_COERCION) == 2)
+		var/datum/action/cooldown/spell/pointed/disarm/disarm = new(owner)
+		disarm.Grant(owner)
+	if(get_rank(PSI_PSYCHOKINESIS) == 2)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_REDACTION) == 2)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_ENERGISTICS) == 2)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+
+	//master level psionics
+	if(get_rank(PSI_COERCION) == 3)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_PSYCHOKINESIS) == 3)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_REDACTION) == 3)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_ENERGISTICS) == 3)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+
+	//grandmaster level psionics
+	if(get_rank(PSI_COERCION) == 4)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_PSYCHOKINESIS) == 4)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_REDACTION) == 4)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_ENERGISTICS) == 4)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+
+	//paramount psionics
+	if(get_rank(PSI_COERCION) == 5)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_PSYCHOKINESIS) == 5)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_REDACTION) == 5)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
+	if(get_rank(PSI_ENERGISTICS) == 5)
+		var/datum/action/cooldown/spell/pointed/projectile/fireball/ranged_touch = new(owner)
+		ranged_touch.Grant(owner)
 
 	if(!announced && owner?.client && !QDELETED(src))
 		announced = TRUE
@@ -59,6 +117,10 @@
 		to_chat(owner, span_notice("<b>Shift-left-click your Psi icon</b> on the bottom right to <b>view a summary of how to use them</b>, or <b>left click</b> it to <b>suppress or unsuppress</b> your psionics. Beware: overusing your gifts can have <b>deadly consequences</b>."))
 		to_chat(owner, "<hr>")
 
+
+
+
+
 /datum/psi_complexus/process()
 
 	var/update_hud

code/modules/psionics/faculties/_faculty.dm

@@ -1,7 +1,6 @@
 /datum/psionic_faculty
 	var/id
 	var/name
-	var/associated_intent
 	var/list/armour_types = list()
 	var/list/powers = list()