[TM] GAS fixes

code/__DEFINES/dcs/mob_signals.dm

@@ -150,6 +150,11 @@
 #define COMSIG_LIVING_FIRE_TICK "living_fire_tick"
 //sent from living mobs when they are ahealed
 #define COMSIG_LIVING_AHEAL "living_aheal"
+//sent from base of /obj/item/healthanalyzer/get_carapace_damage_level: ()
+#define COMSIG_SHELL_GET_CARAPACE_LEVEL "surgery_get_carapace_level"
+//sent from base of /datum/surgery_step/set_bone/end_step: ()
+#define COMSIG_SHELL_GET_CARAPACE_STATE "surgery_get_carapace_state"
+	#define CARAPACE_SHELL_BROKEN (1<<0)
 //sent from mobs when they exit their body as a ghost
 #define COMSIG_LIVING_GHOSTIZED "ghostized"
 //sent from mobs when they re-enter their body as a ghost

code/datums/datacore.dm

@@ -259,6 +259,12 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 	temp = new /icon(icobase, "[head]_[g]")
 	preview_icon.Blend(temp, ICON_OVERLAY)
 
+	// SS220 EDIT START - SERPENTIDS
+	if(is_species(H, /datum/species/serpentid))
+		temp = new/icon("icon" = 'modular_ss220/species/serpentids/icons/mob/r_serpentid.dmi', "icon_state" = "preview")
+		preview_icon.Blend(temp, ICON_OVERLAY)
+	// SS220 EDIT END - SERPENTIDS
+
 	//Tail
 	if(H.body_accessory && (istype(H.body_accessory, /datum/body_accessory/tail) || istype(H.body_accessory, /datum/body_accessory/wing)))
 		temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
@@ -395,6 +401,10 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 		job_clothes = custom_job
 	else if(H.mind)
 		job_clothes = H.mind.assigned_role
+	//SS220 EDIT START - SERPENTIDS
+	if(is_species(H, /datum/species/serpentid))
+		job_clothes = "Naked"
+	//SS220 EDIT END - SERPENTIDS
 	switch(job_clothes)
 		if("Head of Personnel")
 			clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "hop_s")

code/game/gamemodes/cult/cult_mode.dm

@@ -25,7 +25,7 @@
 	if(GLOB.configuration.gamemode.prevent_mindshield_antags)
 		restricted_jobs += protected_jobs
 
-	var/list/cultists_possible = get_players_for_role(ROLE_CULTIST)
+	var/list/cultists_possible = get_players_for_role(ROLE_CULTIST, species_exclude = list("Serpentids")) // SS220 EDIT - SERPENTIDS
 	for(var/cultists_number = 1 to max_cultists_to_start)
 		if(!length(cultists_possible))
 			break

code/game/gamemodes/cult/runes.dm

@@ -273,6 +273,14 @@ structure_check() searches for nearby cultist structures required for the invoca
 		if(!IS_CULTIST(M) || (M.mind && IS_SACRIFICE_TARGET(M.mind)))
 			if(isconstruct(M)) // No offering constructs please
 				continue
+			// SS220 EDIT START - SERPENTIDS
+			if(is_species(M, /datum/species/serpentid))
+				M.Paralyse(15 SECONDS)
+				M.AdjustSleeping(60 SECONDS, bound_lower = 60 SECONDS, bound_upper = 100 SECONDS)
+				for(var/I in invokers)
+					to_chat(I, "<span class='warning'>Предложенная кровь недостаточно хороша для подношения, найдите другую жертву!</span>")
+				continue
+			// SS220 EDIT END - SERPENTIDS
 			offer_targets += M
 
 	// Offering a head/brain

code/game/gamemodes/game_mode.dm

@@ -276,7 +276,7 @@
 	if(rev_team)
 		rev_team.check_all_victory()
 
-/datum/game_mode/proc/get_players_for_role(role, override_jobbans = FALSE, species_exclusive = null)
+/datum/game_mode/proc/get_players_for_role(role, override_jobbans = FALSE, species_exclusive = null, list/species_exclude = null)
 	var/list/players = list()
 	var/list/candidates = list()
 
@@ -302,6 +302,10 @@
 		if(!eligible_player.client.skip_antag)
 			if(species_exclusive && (eligible_player.client.prefs.active_character.species != species_exclusive))
 				continue
+			// SS220 ADDITION START - SERPENTIDS
+			if(species_exclude && (eligible_player.client.prefs.active_character.species in species_exclude))
+				continue
+			// SS220 ADDITION END - SERPENTIDS
 			if(role in eligible_player.client.prefs.be_special)
 				player_draft_log += "[eligible_player.key] had [roletext] enabled, so we are drafting them."
 				candidates += eligible_player.mind

code/game/gamemodes/objective.dm

@@ -502,6 +502,10 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 /datum/objective/escape/escape_with_identity/is_invalid_target(datum/mind/possible_target)
 	if(..() || !possible_target.current.client)
 		return TRUE
+	// SS220 EDIT START - GAS FIXES AND REBALANCE
+	if(is_species(possible_target, /datum/species/serpentid))
+		return TRUE
+	// SS220 EDIT END - GAS FIXES AND REBALANCE
 	// If the target is geneless, then it's an invalid target.
 	return HAS_TRAIT(possible_target.current, TRAIT_GENELESS)
 

code/game/objects/items/devices/scanners.dm

@@ -397,6 +397,11 @@ SLIME SCANNER
 	if(H.radiation > RAD_MOB_SAFE)
 		msgs += "<span class='danger'>Subject is irradiated.</span>"
 
+	//SS220 ADDITION START - SERPENTIDS
+	if(SEND_SIGNAL(H, COMSIG_SHELL_GET_CARAPACE_STATE) & CARAPACE_SHELL_BROKEN)
+		msgs = get_carapace_damage_level(H, msgs)
+	//SS220 ADDITION END - SERPENTIDS
+
 	to_chat(user, chat_box_healthscan(msgs.Join("<br>")))
 
 /obj/item/healthanalyzer/attackby__legacy__attackchain(obj/item/I, mob/user, params)

code/modules/antagonists/changeling/powers/tiny_prick.dm

@@ -61,6 +61,11 @@
 	if(ismachineperson(target))
 		to_chat(user, "<span class='warning'>This won't work on synthetics.</span>")
 		return FALSE
+	// SS220 EDIT START - GAS FIXES AND REBALANCE
+	if(is_species(target, /datum/species/serpentid))
+		to_chat(user, "<span class='warning'>This won't work on serpentids armor.</span>")
+		return FALSE
+	// SS220 EDIT START - GAS FIXES AND REBALANCE
 	if(IS_CHANGELING(target))
 		sting_feedback(user, target)
 		take_chemical_cost()

code/modules/ruins/lavalandruin_code/sin_ruins.dm

@@ -200,7 +200,7 @@
 		return
 	if(!istype(user))
 		return
-	if(ishuman(AM))
+	if(ishuman(AM) && !is_species(AM, /datum/species/serpentid)) // SS220 EDIT - SERPENTIDS
 		var/mob/living/carbon/human/H = AM
 		if(user.real_name != H.dna.real_name)
 			user.real_name = H.dna.real_name

config/names/serpentids_names.txt

@@ -0,0 +1,16 @@
+Бламг
+Брэцк
+Вшиси
+Вхус
+Клатси
+Клух
+Звин
+Зцохи
+Рари
+Ристи
+Скрик
+Скрум
+Щерс
+Шухса
+Цвальк
+Цвун

modular_ss220/_defines220/code/signals_mob/signals_mob_carbon.dm

@@ -1,7 +1,8 @@
 // Signals for /mob/living/carbon
 /// called by /mob/equip_to_slot() : (/datum/component/mob_overlay_shift)
 #define COMSIG_MOB_ON_EQUIP "mob_on_equip"
-
+/// called by /datum/action/changeling/transform/sting_action() : (/datum/component/mob_overlay_shift)
+#define COMSIG_CHANGELING_FINISHED_TRANSFORM "changeling_finished_transform"
 /// called by /mob/ClickOn() : (/datum/component/mob_overlay_shift)
 #define COMSIG_MOB_ON_CLICK "mob_on_click"
 

modular_ss220/_defines220/code/signals_obj.dm

@@ -8,6 +8,8 @@
 #define COMSIG_LIMB_RECEIVE_DAMAGE "limb_receive_damage"
 /// called by /obj/item/organ/external/heal_damage() : (/datum/component/carapace)
 #define COMSIG_LIMB_HEAL_DAMAGE "limb_heal_damage"
+/// called by /datum/surgery_step/set_bone/end_step(), /datum/surgery_step/retract_carapace/end_step : (/datum/component/carapace)
+#define COMSIG_LIMB_SHELL_OPERATION "limb_shell_operation"
 /// called by /obj/item/organ/internal/cyberimp/arm/Extend() /obj/item/organ/internal/cyberimp/arm/Retract() : (/datum/element/paired_implants)
 #define COMSIG_DOUBLEIMP_SYNCHONIZE "doubleimp_synchonize"
 /// called by /obj/item/organ/internal/remove() /obj/item/organ/internal/insert() : (/datum/element/paired_implants)

modular_ss220/_defines220/code/species.dm

@@ -19,3 +19,7 @@
 /mob/living/carbon/human
 	var/atom/movable/loaded = null
 	var/mob/living/passenger = null
+
+/mob/living/proc/isCarrying()
+	var/mob/living/carbon/human/check_one = src
+	return check_one?.loaded || check_one?.passenger

modular_ss220/pixel_shift/code/pixel_shift_component.dm

@@ -63,7 +63,7 @@
 
 /datum/component/pixel_shift/proc/pixel_shift(mob/target, direction)
 	var/mob/living/owner = parent
-	if(HAS_TRAIT(owner, TRAIT_RESTRAINED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED) || length(owner.grabbed_by) || owner.stat != CONSCIOUS)
+	if(HAS_TRAIT(owner, TRAIT_RESTRAINED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED) || length(owner.grabbed_by) || owner.stat != CONSCIOUS || owner.isCarrying())
 		return
 	passthroughable = NONE
 	switch(direction)

modular_ss220/species/_components/appearance/mob_overlay_shift.dm

@@ -35,17 +35,26 @@
 	shift_call(parent)
 
 /datum/component/mob_overlay_shift/RegisterWithParent()
-	RegisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_MOB_ON_EQUIP, COMSIG_MOB_ON_CLICK), PROC_REF(shift_call))
+	RegisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT, COMSIG_MOVABLE_MOVED, COMSIG_MOB_ON_EQUIP, COMSIG_MOB_ON_CLICK, COMSIG_CHANGELING_FINISHED_TRANSFORM), PROC_REF(shift_call))
+	RegisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE), PROC_REF(update_dir))
 	RegisterSignal(parent, list(COMSIG_MOB_GET_OVERLAY_SHIFTS_LIST), PROC_REF(get_list))
 
 /datum/component/mob_overlay_shift/UnregisterFromParent()
-	UnregisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_MOB_ON_EQUIP, COMSIG_MOB_ON_CLICK, COMSIG_MOB_GET_OVERLAY_SHIFTS_LIST))
+	UnregisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_MOVED, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_MOB_ON_EQUIP, COMSIG_MOB_ON_CLICK, COMSIG_MOB_GET_OVERLAY_SHIFTS_LIST, COMSIG_CHANGELING_FINISHED_TRANSFORM))
+
+/datum/component/mob_overlay_shift/proc/update_dir(mob/living/carbon/human/mob, olddir, newdir)
+	SIGNAL_HANDLER
+	if(newdir)
+		dir = newdir
+	update_apperance(mob)
 
 /datum/component/mob_overlay_shift/proc/shift_call(mob/living/carbon/human/mob)
 	SIGNAL_HANDLER
 	if(mob.dir)
 		dir = mob.dir
+	update_apperance(mob)
 
+/datum/component/mob_overlay_shift/proc/update_apperance(mob/living/carbon/human/mob)
 	var/list/body_parts = list(MOB_OVERLAY_SHIFT_HAND, MOB_OVERLAY_SHIFT_BELT, MOB_OVERLAY_SHIFT_BACK, MOB_OVERLAY_SHIFT_HEAD)
 	var/position
 	switch(dir)
@@ -59,7 +68,8 @@
 			position = MOB_OVERLAY_SHIFT_FRONT
 
 	var/flip = (dir == WEST || dir == SOUTH) ? -1 : 1
-
+	if(!position)
+		position = MOB_OVERLAY_SHIFT_SIDE //ГБС лежит
 	// Update shift values based on direction
 	for(var/body_part in body_parts)
 		var/x_shift_key = "shift_x"
@@ -70,8 +80,11 @@
 		var/x_central_value = shift_data[body_part][MOB_OVERLAY_SHIFT_CENTER]["x"]
 		var/y_central_value = shift_data[body_part][MOB_OVERLAY_SHIFT_CENTER]["y"]
 
-		shift_data[body_part][x_shift_key] = flip * x_shift_value + x_central_value
-		shift_data[body_part][y_shift_key] = flip * y_shift_value + y_central_value
+		shift_data[body_part][y_shift_key] = 0
+		shift_data[body_part][x_shift_key] = 0
+		if(isserpentid(mob))
+			shift_data[body_part][x_shift_key] = flip * x_shift_value + x_central_value
+			shift_data[body_part][y_shift_key] = flip * y_shift_value + y_central_value
 
 	update_call(mob)
 
@@ -97,3 +110,7 @@
 #undef MOB_OVERLAY_SHIFT_SIDE
 #undef MOB_OVERLAY_SHIFT_FRONT
 #undef MOB_OVERLAY_SHIFT_CENTER
+
+/atom/movable/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+	. = ..()
+	l_move_time = world.time

modular_ss220/species/_components/attacking/double_attack.dm

@@ -1,8 +1,6 @@
 /*
 ===Компонент на атаку парного оружия
-Срабатывает при атаке оружием. Второе оружие через паузу в 0.2 секунды запускает атаку.
-
-Срабатывает только, если оружие одинаковое.
+Срабатывает при атаке оружием. Второе оружие через паузу в N секунд запускает атаку.
 */
 
 /datum/component/double_attack

modular_ss220/species/_components/carapace/carapace.dm

@@ -27,6 +27,7 @@
 /datum/component/carapace
 	var/self_mending = FALSE
 	var/broken_treshold = CARAPACE_BROKEN_STATE
+	var/operation_in_process = FALSE
 
 /datum/component/carapace/Initialize(allow_self_mending, break_threshold)
 	src.self_mending = allow_self_mending
@@ -37,10 +38,16 @@
 /datum/component/carapace/RegisterWithParent()
 	RegisterSignal(parent, COMSIG_LIMB_RECEIVE_DAMAGE, PROC_REF(receive_damage))
 	RegisterSignal(parent, COMSIG_LIMB_HEAL_DAMAGE, PROC_REF(heal_damage))
+	RegisterSignal(parent, COMSIG_LIMB_SHELL_OPERATION, PROC_REF(handle_operation_status))
 
 /datum/component/carapace/UnregisterFromParent()
 	UnregisterSignal(parent, COMSIG_LIMB_RECEIVE_DAMAGE)
 	UnregisterSignal(parent, COMSIG_LIMB_HEAL_DAMAGE)
+	UnregisterSignal(parent, COMSIG_LIMB_SHELL_OPERATION)
+
+/datum/component/carapace/proc/handle_operation_status(obj/item/organ/external/affected_limb, state_to_apply)
+	SIGNAL_HANDLER
+	operation_in_process = state_to_apply
 
 //Проки, срабатываемые при получении или исцелении урона
 /datum/component/carapace/proc/receive_damage(obj/item/organ/external/affected_limb, brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE)
@@ -49,20 +56,20 @@
 		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
 	if((affected_limb.status & ORGAN_BROKEN) && affected_limb.get_damage() == 0)
-		if(self_mending || prob(CARAPACE_HEAL_BROKEN_PROB))
+		if((self_mending || prob(CARAPACE_HEAL_BROKEN_PROB)) && !operation_in_process)
 			affected_limb.mend_fracture()
 
 //////////////////////////////////////////////////////////////////
 //					Хирургия для панциря						//
 //////////////////////////////////////////////////////////////////
 ///Датумы для операций
 /datum/surgery/carapace_break
-	name = "Break carapace"
+	name = "Break chitin"
 	steps = list(
 		/datum/surgery_step/saw_carapace,
 		/datum/surgery_step/cut_carapace,
@@ -83,7 +90,7 @@
 	requires_organic_bodypart = TRUE
 
 /datum/surgery/bone_repair/carapace
-	name = "Carapace Repair"
+	name = "Chitin Repair"
 	steps = list(
 		/datum/surgery_step/glue_bone,
 		/datum/surgery_step/set_bone,
@@ -133,7 +140,7 @@
 //Блокировка простого скальпеля (базовый начальный шаг любой операции), если карапас не был сломан, но появилась какая-то операция, которая не должна быть
 /datum/surgery_step/generic/cut_open/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
-	if((affected?.encased == CARAPACE_ENCASE_WORD) && !(affected.status & ORGAN_BROKEN))
+	if((affected?.encased == CARAPACE_ENCASE_WORD) && !(affected.status & ORGAN_BROKEN) && !istype(surgery, /datum/surgery/carapace_shell_repair))
 		to_chat(user, span_notice("[capitalize(target.declent_ru(NOMINATIVE))] покрыта крепким хитином. Сломайте его, прежде чем начать операцию."))
 		return SURGERY_BEGINSTEP_ABORT
 	. = .. ()
@@ -142,12 +149,18 @@
 	var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
 	if((affected?.encased == CARAPACE_ENCASE_WORD) && !(affected.status & ORGAN_BROKEN))
 		affected.fracture()
+		REMOVE_TRAIT(target, TRAIT_PIERCEIMMUNE, "carapace_state")
+		SEND_SIGNAL(affected, COMSIG_LIMB_SHELL_OPERATION, TRUE)
 	. = .. ()
 
 /datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
-	if((affected?.encased == CARAPACE_ENCASE_WORD) && !(affected.status & ORGAN_BROKEN))
+	if((affected?.encased == CARAPACE_ENCASE_WORD) && (affected.status & ORGAN_BROKEN))
 		affected.mend_fracture()
+		if(isserpentid(target))
+			if(!(SEND_SIGNAL(target, COMSIG_SHELL_GET_CARAPACE_STATE) & CARAPACE_SHELL_BROKEN))
+				ADD_TRAIT(target, TRAIT_PIERCEIMMUNE, "carapace_state")
+		SEND_SIGNAL(affected, COMSIG_LIMB_SHELL_OPERATION, FALSE)
 	. = .. ()
 
 #undef CARAPACE_BROKEN_STATE