Правки ошибок и легкий ребаланс

ss220club · Jan 25, 2025 · 194238f · 194238f
1 parent 1f8f8d0
commit 194238f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/modular_ss220/species/_components/carapace/carapace.dm b/modular_ss220/species/_components/carapace/carapace.dm
@@ -56,7 +56,7 @@
 		affected_limb.fracture()
 	if(length(affected_limb.internal_organs))
 		var/obj/item/organ/internal/O = pick(affected_limb.internal_organs)
-		O.receive_damage(burn * affected_limb.burn_dam)
+		O.receive_damage(burn)
 
 /datum/component/carapace/proc/heal_damage(obj/item/organ/external/affected_limb, brute, burn, internal = 0, robo_repair = 0, updating_health = TRUE)
 	SIGNAL_HANDLER

diff --git a/modular_ss220/species/serpentids/code/mob/serpentids.dm b/modular_ss220/species/serpentids/code/mob/serpentids.dm
@@ -210,16 +210,24 @@
 	. = .. ()
 
 //Ограничение на роли антагов (генокрад онли)
-/datum/antag_scenario/vampire/New()
-	restricted_species += list("Serpentid")
+/datum/antag_scenario/vampire
+	restricted_species = list("Machine","Serpentid")
 	. = .. ()
 
-/datum/antag_scenario/traitor/New()
-	restricted_species += list("Serpentid")
+/datum/antag_scenario/traitor
+	restricted_species = list("Serpentid")
+	. = .. ()
+
+/datum/antagonist/mindflayer
+	restricted_species = list("Serpentid")
+	. = .. ()
+
+/datum/antagonist/blood_brother
+	restricted_species = list("Serpentid")
 	. = .. ()
 
 /datum/antag_scenario/team/blood_brothers/New()
-	restricted_species += list("Serpentid")
+	restricted_species = list("Serpentid")
 	. = .. ()
 
 //Расширение для действий органов серпентидов

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
@@ -123,8 +123,12 @@
 			else
 				to_chat(owner, span_notice("You drop [arm_item] to activate [src]!"))
 
-	if(!owner.put_in_l_hand(holder_l))
-		return
+	holder_l.forceMove(owner)		//TODO: move to equipped?
+	l_hand = holder_l
+	holder_l.layer = ABOVE_HUD_LAYER	//TODO: move to equipped?
+	holder_l.plane = ABOVE_HUD_PLANE	//TODO: move to equipped?
+	holder_l.equipped(src, ITEM_SLOT_LEFT_HAND)
+	update_inv_l_hand()
 
 	blades_active = TRUE
 	playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)

diff --git a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm
@@ -103,6 +103,9 @@
 		if(safe_zone_timer > SERPENTID_LUNGS_SAFE_TIMER && !danger_air)
 			switch_mode_off()
 
+	else
+		if(owner.internal == serpentid_vault)
+			owner.internal = null
 	// Если Серпентид не выделяет вещества, и среда опасна и он без сознания - начать выделять вещества
 	if(danger_air && (owner.stat == UNCONSCIOUS) && !active_secretion)
 		if(!owner.internal)