sdfsdfs

ss220-space · Oct 14, 2024 · 12a470e · 12a470e
1 parent 88e3c8f
commit 12a470e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/code/modules/antagonists/traitor/affiliates/items/cybersun/marionette.dm b/code/modules/antagonists/traitor/affiliates/items/cybersun/marionette.dm
@@ -1,7 +1,8 @@
 
 /datum/action/innate/detach
 	var/mob/living/carbon/human/master_body = null
-	button_icon = 'icons/obj/affiliates.dmi'
+	name = "Вернуться в свое тело"
+	icon_icon = 'icons/obj/affiliates.dmi'
 	button_icon_state = "brain1"
 
 /datum/action/innate/cult/comm/Activate()
@@ -181,17 +182,22 @@
 	implant_state = "implant-syndicate"
 	origin_tech = "materials=2;biotech=4;syndicate=2"
 	activated = BIOCHIP_ACTIVATED_ACTIVE
+	trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY
 	implant_data = /datum/implant_fluff/mar_master
 	var/list/obj/item/implant/marionette/connected_imps = list()
 	var/obj/item/implant/marionette/cur_connection = null
 
 /obj/item/implant/mar_master/removed(mob/living/carbon/human/source)
+	cur_connection?.detach()
 	. = ..()
+
+/obj/item/implant/mar_master/death_trigger(mob/source, gibbed)
 	cur_connection?.detach()
+	. = ..()
 
 /obj/item/implant/mar_master/Destroy()
-	. = ..()
 	cur_connection?.detach()
+	. = ..()
 
 /obj/item/implant/mar_master/activate()
 	var/op = tgui_alert(imp_in, "Выберите операцию.", "Выбор операции", list("Подключение импланта", "Контроль"))

diff --git a/paradise.dme b/paradise.dme
@@ -51,7 +51,6 @@
 #include "code\__DEFINES\combat.dm"
 #include "code\__DEFINES\configuration.dm"
 #include "code\__DEFINES\construction.dm"
-#include "code\__DEFINES\spells.dm"
 #include "code\__DEFINES\contractors.dm"
 #include "code\__DEFINES\contracts.dm"
 #include "code\__DEFINES\cooldowns.dm"
@@ -118,8 +117,8 @@
 #include "code\__DEFINES\role_preferences.dm"
 #include "code\__DEFINES\rolebans.dm"
 #include "code\__DEFINES\rust_g.dm"
-#include "code\__DEFINES\secret_documents.dm"
 #include "code\__DEFINES\rust_g_overrides.dm"
+#include "code\__DEFINES\secret_documents.dm"
 #include "code\__DEFINES\sensor_devices.dm"
 #include "code\__DEFINES\shuttle.dm"
 #include "code\__DEFINES\sibyl.dm"
@@ -129,6 +128,7 @@
 #include "code\__DEFINES\span.dm"
 #include "code\__DEFINES\speech_channels.dm"
 #include "code\__DEFINES\speech_controller.dm"
+#include "code\__DEFINES\spells.dm"
 #include "code\__DEFINES\stat.dm"
 #include "code\__DEFINES\stat_tracking.dm"
 #include "code\__DEFINES\station_goals.dm"
@@ -427,8 +427,8 @@
 #include "code\datums\cinematics\nuke_cinematics.dm"
 #include "code\datums\components\_component.dm"
 #include "code\datums\components\after_attacks_hub.dm"
-#include "code\datums\components\aura_healing.dm"
 #include "code\datums\components\animal_temperature.dm"
+#include "code\datums\components\aura_healing.dm"
 #include "code\datums\components\boomerang.dm"
 #include "code\datums\components\boss_music.dm"
 #include "code\datums\components\caltrop.dm"