merge

baystation12.dme

@@ -2923,8 +2923,8 @@
 #include "code\modules\psionics\equipment\psipower.dm"
 #include "code\modules\psionics\equipment\psipower_blade.dm"
 #include "code\modules\psionics\equipment\psipower_bow.dm"
-#include "code\modules\psionics\equipment\psipower_electrokinesis.dm"
 #include "code\modules\psionics\equipment\psipower_cryokinesis.dm"
+#include "code\modules\psionics\equipment\psipower_electrokinesis.dm"
 #include "code\modules\psionics\equipment\psipower_elements.dm"
 #include "code\modules\psionics\equipment\psipower_engineering.dm"
 #include "code\modules\psionics\equipment\psipower_gun.dm"

code/modules/psionics/equipment/psipower_elements.dm

@@ -193,6 +193,8 @@
 	var/combat_mode = TRUE
 	var/turf/previousturf = null
 
+	var/attack_type = "FIRE WALL"
+
 	var/range = 2
 	var/flame_power = 25
 	var/flame_color = COLOR_RED
@@ -210,6 +212,33 @@
 
 	..()
 
+/obj/item/psychic_power/psifire/attack_self(var/mob/living/user as mob)
+	var/pyro_rank = user.psi.get_rank(PSI_METAKINESIS)
+	if(combat_mode)
+		var/list/options = list(
+			"FIRE WALL" = image('icons/screen/psi.dmi', "FIRE PUNCH"),
+			"FIRE JUMP" = image('icons/screen/psi.dmi', "FIRE JUMP")
+		)
+		var/chosen_option = show_radial_menu(user, user, options, radius = 25, require_near = TRUE)
+		if (!chosen_option)
+			return 0
+		if(user.psi.suppressed)
+			return 0
+		if(!combat_mode)
+			return 0
+		switch(chosen_option)
+			if("FIRE WALL")
+				attack_type = "FIRE WALL"
+				to_chat(user, "<span class='warning'>Теперь вы будете стрелять огнём из рук!</span>")
+				return 1
+			if("FIRE JUMP")
+				if(pyro_rank < PSI_RANK_OPERANT)
+					to_chat(user, "<span class='warning'>Вы ещё недостаточно обучены для подобного приёма!</span>")
+					return 0
+				attack_type = "FIRE JUMP"
+				to_chat(user, "<span class='warning'>Теперь вы будете использовать огонь в качестве средства передвижения!</span>")
+				return 1
+
 /obj/item/psychic_power/psifire/AltClick(mob/living/carbon/user)
 	var/list/options = list(
 		"HELP" = image('icons/screen/psi.dmi', "HELP"),
@@ -239,12 +268,25 @@
 //TURFS
 
 	if(istype(A, /turf/) && !proximity && combat_mode)
-		var/turf/target_turf = get_turf(A)
-		if(target_turf)
-			var/turflist = getline(user, target_turf)
-			flame_turf(turflist)
-			user.visible_message("<span class='danger'>[user] взмахивает рукой, создавая стену из огня!</span>")
-
+		if(attack_type == "FIRE WALL")
+			var/turf/target_turf = get_turf(A)
+			if(target_turf)
+				var/turflist = getline(user, target_turf)
+				flame_turf(turflist)
+				user.visible_message("<span class='danger'>[user] взмахивает рукой, создавая стену из огня!</span>")
+		if(attack_type == "FIRE JUMP")
+			if(get_dist(user, A) > range)
+				return 0
+			var/turf/target_turf = get_step(get_turf(A), pick(GLOB.alldirs))
+			var/list/line_list = getline(user, target_turf)
+			for(var/i = 1 to length(line_list))
+				var/turf/T = line_list[i]
+				var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(T, user.dir, user)
+				D.alpha = min(150 + i*15, 255)
+				animate(D, alpha = 0, time = 2 + i*2)
+			user.forceMove(target_turf)
+			user.visible_message("<span class='danger'>[user] делает рывок, используя свои ноги как двигатели!</span>")
+			flame_turf(line_list)
 	else if(!proximity)
 		return
 

code/modules/psionics/faculties/psychokinesis.dm

@@ -421,6 +421,7 @@
 						for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 							target.apply_damage(rand(25,40),BRUTE,def_zone=zone)
 						new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+						new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 						target.throw_at(get_edge_target_turf(target, get_dir(user, target)), 3, 2, user)
 						return TRUE
 
@@ -430,6 +431,7 @@
 						for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 							user.apply_damage(rand(25,40),BRUTE,def_zone=zone)
 						new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+						new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 						user.throw_at(get_edge_target_turf(user, get_dir(target, user)), 3, 2, target)
 						user.visible_message(SPAN_DANGER("Мощное силовое поле [target] отбрасывает [user] назад, создавая мощную обратную волну!"))
 						return TRUE
@@ -442,6 +444,7 @@
 				to_chat(user, SPAN_WARNING("Ваше неподготовленное тело не выдерживает отдачи от удара, и вашу руку выворачивает наизнанку!"))
 
 			new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+			new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 			target.visible_message(SPAN_DANGER("[target] ловит лицом кулак, улетая назад!"))
 			for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 				target.apply_damage(rand(25,40),BRUTE,def_zone=zone)
@@ -493,6 +496,7 @@
 						for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 							target.apply_damage(rand(40,60),BRUTE,def_zone=zone)
 						new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+						new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 						target.throw_at(get_edge_target_turf(target, get_dir(user, target)), 6, 2, user)
 						return TRUE
 
@@ -502,6 +506,7 @@
 						for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 							user.apply_damage(rand(40,60),BRUTE,def_zone=zone)
 						new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+						new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 						user.throw_at(get_edge_target_turf(user, get_dir(target, user)), 6, 2, target)
 						user.visible_message(SPAN_DANGER("Мощное силовое поле [target] отбрасывает [user] назад, создавая мощную обратную волну!"))
 						return TRUE
@@ -514,6 +519,7 @@
 				to_chat(user, SPAN_WARNING("Ваше неподготовленное тело не выдерживает отдачи от удара, и вашу руку выворачивает наизнанку!"))
 
 			new /obj/effect/temporary(get_turf(target),3, 'icons/effects/effects.dmi', "smash")
+			new /obj/effect/temporary(get_turf(target),6, 'icons/fd/heavyimpact.dmi', "heavyimpact")
 			target.visible_message(SPAN_DANGER("[target] ловит лицом кулак, улетая назад!"))
 			for(var/zone in list(BP_CHEST, BP_GROIN, BP_HEAD))
 				target.apply_damage(rand(40,60),BRUTE,def_zone=zone)