Всякое

- Реворк манифестации(частичный). Теперь выбирать предметы гораздо удобнее - Добавил костёр и возможность делать его - Допилил абилку для коершена - амплифаер эмоций - Перенёс школу сознания с дизарма на хелп, дабы была возможность юзать её одновременно с коершеном - Пара фиксов
VoiceInYourHead · Feb 23, 2024 · c1b6ea7 · c1b6ea7
1 parent 4359302
commit c1b6ea7
Show file tree

Hide file tree

Showing 12 changed files with 528 additions and 117 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -1856,6 +1856,7 @@
 #include "code\modules\fabrication\designs\micro\designs_cutlery.dm"
 #include "code\modules\fabrication\designs\micro\designs_glasses.dm"
 #include "code\modules\fabrication\designs\replicator\designs_food.dm"
+#include "code\modules\fd\campfire.dm"
 #include "code\modules\fd\christmas.dm"
 #include "code\modules\fd\mapping.dm"
 #include "code\modules\fd\particles.dm"
@@ -2911,9 +2912,9 @@
 #include "code\modules\psionics\equipment\psipower_blade.dm"
 #include "code\modules\psionics\equipment\psipower_bow.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"
 #include "code\modules\psionics\equipment\psipower_surgery.dm"
-#include "code\modules\psionics\equipment\psipower_tinker.dm"
 #include "code\modules\psionics\equipment\psipower_tk.dm"
 #include "code\modules\psionics\events\_psi.dm"
 #include "code\modules\psionics\events\mini_spasm.dm"

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -244,11 +244,11 @@
 			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Metaplexy"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Demiurgy"]), A)
 		if(a_intent == I_DISARM)
-			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Allaxetia"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Catastellia"]), A)
 		if(a_intent == I_HELP)
 			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Ephanoferia"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Hyloforia"]), A)
+			INVOKE_PSI_POWERS(src, psi.get_melee_powers(SSpsi.faculties_by_name_new["Allaxetia"]), A)
 	return 1
 
 /*
@@ -277,11 +277,11 @@
 			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Metaplexy"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Demiurgy"]), A)
 		if(a_intent == I_DISARM)
-			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Allaxetia"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Catastellia"]), A)
 		if(a_intent == I_HELP)
 			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Hyloforia"]), A)
 			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Ephanoferia"]), A)
+			INVOKE_PSI_POWERS(src, psi.get_ranged_powers(SSpsi.faculties_by_name_new["Allaxetia"]), A)
 	..()
 
 /mob/living/proc/check_psi_grab(var/obj/item/grab/grab)
@@ -293,10 +293,10 @@
 			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Metaplexy"]), grab.affecting)
 			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Demiurgy"]), grab.affecting)
 		if(a_intent == I_DISARM)
-			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Allaxetia"]), grab.affecting)
 			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Catastellia"]), grab.affecting)
 		if(a_intent == I_HELP)
 			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Ephanoferia"]), grab.affecting)
+			INVOKE_PSI_POWERS(src, psi.get_grab_powers(SSpsi.faculties_by_name_new["Allaxetia"]), grab.affecting)
 
 /*
 	Restrained ClickOn

diff --git a/code/datums/autocells/explosion.dm b/code/datums/autocells/explosion.dm
@@ -253,12 +253,12 @@ as having entered the turf.
 
 		if(power >= 300) //Make BIG BOOMS
 			playsound(epicenter, "bigboom", 80, 1, max(round(power,1),7))
-			for(psionic in view(7, src))
+			for(psionic in view(7, epicenter))
 				if(psionic.psi)
 					psionic.psi.spend_power(rand(25,35))
 		else
 			playsound(epicenter, "explosion", 90, 1, max(round(power,1),7))
-			for(psionic in view(7, src))
+			for(psionic in view(7, epicenter))
 				if(psionic.psi && psionic.get_sound_volume_multiplier() > 0.1)
 					psionic.psi.spend_power(rand(15,35))
 

diff --git a/code/modules/fd/campfire.dm b/code/modules/fd/campfire.dm
@@ -0,0 +1,42 @@
+/obj/structure/fd/campfire
+	name = "campfire"
+	desc = "A circle of stones surrounding a burning pile of wood. The fire is roaring and you can hear its crackle. You could probably stomp the fire out."
+	icon = 'icons/fd/structures/manhattan/fires.dmi'
+	icon_state = "campfire"
+	density = FALSE
+	var/lit = FALSE
+	var/fuel = 60
+
+/obj/structure/fd/campfire/Process()
+	if(fuel > 0 && lit)
+		fuel--
+	if(fuel <= 0 && lit)
+		lit = FALSE
+		update_icon()
+		STOP_PROCESSING(SSobj, src)
+
+/obj/structure/fd/campfire/on_update_icon()
+	if(lit)
+		icon_state = "campfire_lit"
+	if(!lit)
+		icon_state = "campfire"
+	return
+
+/obj/structure/fd/campfire/attackby(var/obj/item/I, var/mob/living/user)
+	if(istype(I,/obj/item/stack/material/wood))
+		var/obj/item/stack/material/wood/sticks = I
+		if(do_after(user, 10) && sticks.amount >= 1)
+			sticks.amount -= 1
+			fuel += 5
+			if(sticks.amount <= 0)
+				qdel(sticks)
+	if(isflamesource(I) || is_hot(I))
+		if(do_after(user, 30))
+			lit = TRUE
+			update_icon()
+			START_PROCESSING(SSobj, src)
+	if(istype(I, /obj/item/reagent_containers/food/snacks/meat))
+		if(do_after(src, 50))
+			new /obj/item/reagent_containers/food/snacks/plainsteak(loc)
+			qdel(I)
+
diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm
@@ -42,13 +42,22 @@
 
 /turf/unsimulated/floor/exoplanet/attackby(obj/item/C, mob/user)
 	if(diggable && istype(C,/obj/item/shovel))
-		visible_message("<span class='notice'>\The [user] starts digging \the [src]</span>")
-		if(do_after(user, 50))
-			to_chat(user,"<span class='notice'>You dig a deep pit.</span>")
-			new /obj/structure/pit(src)
-			diggable = 0
-		else
-			to_chat(user,"<span class='notice'>You stop shoveling.</span>")
+		var/option = alert(user, "What do you want?", "Choose something!", "Grave", "Pit")
+		if (!option)
+			return
+		if(option == "Grave")
+			visible_message("<span class='notice'>\The [user] starts digging \the [src]</span>")
+			if(do_after(user, 50))
+				to_chat(user,"<span class='notice'>You dig a grave.</span>")
+				new /obj/structure/pit(src)
+				diggable = 0
+			else
+				to_chat(user,"<span class='notice'>You stop shoveling.</span>")
+		if(option == "Pit")
+			visible_message("<span class='notice'>\The [user] starts digging \the [src]</span>")
+			if(do_after(user, 50))
+				new /obj/effect/pile(src)
+				diggable = 0
 	else if(istype(C, /obj/item/stack/tile))
 		var/obj/item/stack/tile/T = C
 		if(T.use(1))