Чистка и фикс импланта

ss220club · Oct 31, 2024 · 9e384ee · 9e384ee
1 parent 27d0356
commit 9e384ee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 91 deletions.
diff --git a/modular_ss220/species/_components/organs/heart_defib_chemical.dm b/modular_ss220/species/_components/organs/heart_defib_chemical.dm
diff --git a/modular_ss220/species/_components/organs/heart_defib_hunger.dm b/modular_ss220/species/_components/organs/heart_defib_hunger.dm
@@ -2,6 +2,8 @@
 === Компонент запуска сердца ===
 Отслеживает смерть носителя, и в случае чего - запускает сердце с неким шансом
 */
+#define AUTO_DEFIBRILATION_THRESHOLD 100
+
 /datum/component/defib_heart_hunger
 	var/obj/item/organ/internal/organ
 
@@ -36,3 +38,5 @@
 		owner.med_hud_set_status()
 		add_attack_logs(owner, owner, "Revived by heart")
 		SSblackbox.record_feedback("tally", "players_revived", 1, "self_revived")
+
+#undef AUTO_DEFIBRILATION_THRESHOLD
diff --git a/modular_ss220/species/_components/organs/organ_chemistry.dm b/modular_ss220/species/_components/organs/organ_chemistry.dm
diff --git a/modular_ss220/species/_species.dme b/modular_ss220/species/_species.dme
@@ -14,10 +14,8 @@
 #include "_components/carrying/grab_and_drag_on_mob_mobs.dm"
 #include "_components/carrying/grab_and_drag_on_mob_crates.dm"
 #include "_components/organs/organ_decay.dm"
-//#include "_components/organs/organ_chemistry.dm"
 #include "_components/organs/organ_hunger.dm"
 #include "_components/organs/organ_toxins.dm"
-#include "_components/organs/heart_defib_chemical.dm"
 #include "_components/organs/heart_defib_hunger.dm"
 #include "_components/organs/organ_actions_component.dm"
 #include "_components/implants/paired_implants.dm"

diff --git a/modular_ss220/species/serpentids/code/organs/internal/implants/serpentid_mantis_chest.dm b/modular_ss220/species/serpentids/code/organs/internal/implants/serpentid_mantis_chest.dm
@@ -15,6 +15,7 @@
 	var/mutable_appearance/new_overlay
 	var/overlay_color
 	var/blades_active = FALSE
+	var/activation_in_progress = FALSE
 	unremovable = TRUE
 	emp_proof = TRUE
 
@@ -37,18 +38,19 @@
 	return our_MA
 
 /obj/item/organ/internal/cyberimp/chest/serpentid_blades/ui_action_click()
+	if(activation_in_progress)
+		return
 	if(crit_fail || (!holder_l && !length(contents)))
 		to_chat(owner, "<span class='warning'>The implant doesn't respond. It seems to be broken...</span>")
 		return
 	var/extended = holder_l && !(holder_l in src)
-	var/activation_in_progress = FALSE
 	if(extended)
 		if(!activation_in_progress)
 			activation_in_progress = TRUE
 			Retract()
-	else if(do_after(owner, 20*(owner.dna.species.action_mult), FALSE, owner))
-		if(!activation_in_progress)
-			activation_in_progress = TRUE
+	else if(!activation_in_progress)
+		activation_in_progress = TRUE
+		if(do_after(owner, 20*(owner.dna.species.action_mult), FALSE, owner))
 			holder_l = null
 			Extend()
 	activation_in_progress = FALSE