(Не)очень большой реворк ксеноморфов

code/__DEFINES/atom_hud.dm

@@ -56,6 +56,10 @@
 /// If they have the DNR trait
 #define DNR_HUD "27"
 // NOVA EDIT ADDITION END
+// FLUFFY FRONTIER ADDITION START
+#define XENO_HUD "30"
+#define XENOPLASMA_HUD "31"
+// FLUFFY FRONTIER ADDITION END
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior
@@ -74,6 +78,7 @@
 #define DATA_HUD_FAN 9
 #define DATA_HUD_MALF_APC 10
 #define DATA_HUD_PERMIT 11 //NOVA EDIT ADDITION
+#define DATA_HUD_XENO (DATA_HUD_PERMIT + 1) // FLUFFY FRONTIER ADDITION
 
 /// cooldown for being shown the images for any particular data hud
 #define ADD_HUD_TO_COOLDOWN 20

code/__DEFINES/~ff_defines/signals.dm

@@ -0,0 +1,2 @@
+// on call adjustPlasma() proc
+#define COMSIG_XENO_PLASMA_ADJUSTED "plasma_adjusted"

code/__DEFINES/~ff_defines/_globalvars/traits/declarations.dm → code/__DEFINES/~ff_defines/traits/declarations.dm

@@ -1,6 +1,10 @@
+// xeno traits
 /// Trait source for xeno innate abilities
 #define TRAIT_XENO_INNATE "xeno_innate"
 /// Trait source for something added BY a xeno ability
 #define TRAIT_XENO_ABILITY_GIVEN "xeno_ability_given"
 /// Determines if something can receive healing from a xeno
 #define TRAIT_XENO_HEAL_AURA "trait_xeno_heal_aura"
+/// Trait source for traits added by fortify ability
+#define TRAIT_XENO_FORTIFY "xeno_fortify"
+#define TRAIT_XENO_HUD "xeno_hud"

code/__HELPERS/~ff_helpers/is_helpers.dm

@@ -1 +1,12 @@
+// Nubbers
 #define isnabber(A) (is_species(A, /datum/species/nabber))
+
+// TGMC Xenomorph
+#define istgmcalien(A) (istype(A, /mob/living/carbon/alien/adult/tgmc))
+#define istgmcalienqueen(A) (istype(A, /mob/living/carbon/alien/adult/tgmc/queen))
+#define istgmcalienpraetorian(A) (istype(A, /mob/living/carbon/alien/adult/tgmc/praetorian))
+#define istgmcalienravager(A) (istype(A, /mob/living/carbon/alien/adult/tgmc/ravager))
+#define istgmcaliencrusher(A) (istype(A, /mob/living/carbon/alien/adult/tgmc/crusher))
+#define istgmcalienspitter(A) (istype(A, /mob/living/carbon/alien/adult/tgmc/spitter))
+
+#define istgmcalientier2(A) (istgmcalienpraetorian(A) || istgmcalienravager(A) || istgmcaliencrusher(A) || istgmcalienspitter(A))

code/_globalvars/traits/_traits.dm

@@ -919,6 +919,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_XENO_ABILITY_GIVEN" = TRAIT_XENO_ABILITY_GIVEN,
 		"TRAIT_XENO_HEAL_AURA" = TRAIT_XENO_HEAL_AURA,
 		"TRAIT_XENO_INNATE" = TRAIT_XENO_INNATE,
+		"TRAIT_XENO_HUD" = TRAIT_XENO_HUD,
 	),
 	// FLUFFY FRONTIER ADDITION END
 ))

code/_globalvars/traits/admin_tooling.dm

@@ -507,6 +507,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_XENO_ABILITY_GIVEN" = TRAIT_XENO_ABILITY_GIVEN,
 		"TRAIT_XENO_HEAL_AURA" = TRAIT_XENO_HEAL_AURA,
 		"TRAIT_XENO_INNATE" = TRAIT_XENO_INNATE,
+		"TRAIT_XENO_HUD" = TRAIT_XENO_HUD,
 	),
 	// FLUFFY FRONTIER ADDITION END
 ))

code/datums/hud.dm

@@ -19,6 +19,7 @@ GLOBAL_ALIST_INIT(huds, alist(
 	DATA_HUD_FAN = new /datum/atom_hud/data/human/fan_hud(),
 	DATA_HUD_MALF_APC = new /datum/atom_hud/data/malf_apc(),
 	DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit(), // NOVA EDIT ADDITION
+	DATA_HUD_XENO = new /datum/atom_hud/data/xeno(), // FLUFFY FRONTIER ADDITION
 ))
 
 /// Assoc list of traits to the huds they give.
@@ -33,6 +34,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list(
 	TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED,
 	TRAIT_SECURITY_HUD_ID_ONLY = DATA_HUD_SECURITY_BASIC,
 	TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // NOVA EDIT ADDITION
+	TRAIT_XENO_HUD = DATA_HUD_XENO, // FLUFFY FRONTIER ADDITION
 ))
 
 /// Assoc list of traits that block other traits' huds to list of hud (traits) that they block

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -123,7 +123,7 @@
 	owner.add_overlay(overlay)
 
 	var/atom/xeno_loc = get_turf(owner)
-	var/mob/living/carbon/alien/larva/new_xeno = new larva_path(xeno_loc) // FLUFFY FRONTIER EDIT - TGMC XENOS. ORIGINAL: var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
+	var/mob/living/carbon/alien/larva/new_xeno = new larva_path(xeno_loc) // FLUFFY FRONTIER EDIT - TGMC_XENOS. ORIGINAL: var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
 	new_xeno.PossessByPlayer(ghost.key)
 	SEND_SOUND(new_xeno, sound('sound/mobs/non-humanoids/hiss/hiss5.ogg',0,0,0,100)) //To get the player's attention
 	new_xeno.add_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_IMMOBILIZED, TRAIT_NO_TRANSFORM), type) //so we don't move during the bursting animation

code/modules/mob/living/carbon/human/human_defense.dm

@@ -190,7 +190,7 @@
 			apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE))
 		return TRUE
 
-// FLUFFY FRONTIER EDIT BEGIN: TGMC_XENOS - moved to: tff_modular\modules\tgmc_xenos\code\human_defense.dm
+// FLUFFY FRONTIER EDIT BEGIN: TGMC_XENOS - moved to: tff_modular\modules\tgmc_xenos\code\defense\human_defense.dm
 /*
 /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers)
 	. = ..()

code/modules/vehicles/mecha/_mecha.dm

@@ -1024,6 +1024,15 @@
 
 /obj/vehicle/sealed/mecha/proc/melee_attack_effect(mob/living/victim, heavy)
 	if(heavy)
+		// FLUFFY FRONTIER ADDITION START - TGMC_XENOS - Это нужно реворкнуть на апстриме
+		if(istgmcalien(victim))
+			var/mob/living/carbon/alien/adult/tgmc/tgmc_alien = victim
+			if(tgmc_alien.resist_heavy_hits)
+				if(health_percentage(tgmc_alien) >= 35)
+					return
+				if(!prob(50))	// 50% что при ударе по ослабленному ксеносу - он упадет в бессознательное состояние
+					return
+		// FLUFFY FRONTIER ADDITION END
 		victim.Unconscious(2 SECONDS)
 	else
 		victim.Knockdown(4 SECONDS)

tff_modular/modules/custom_huds/code/huds.dm

@@ -1,9 +1,13 @@
 GLOBAL_VAR_INIT(merged_huds, merge_huds())
 
 /proc/merge_huds()
-	var/icon/huds = new('modular_nova/master_files/icons/mob/huds/hud.dmi')
-	var/icon/ff_huds = new('tff_modular/modules/custom_huds/icons/hud.dmi')
+	var/icon/huds = icon('modular_nova/master_files/icons/mob/huds/hud.dmi')
+	var/list/icon/additional_huds = list(
+		icon('tff_modular/modules/custom_huds/icons/hud.dmi'),
+		icon('tff_modular/modules/tgmc_xenos/icons/xeno_hud.dmi'),
+	)
 
-	for(var/state in icon_states(ff_huds))
-		huds.Insert(icon(ff_huds, state), state)
+	for(var/icon/hud in additional_huds)
+		for(var/state in icon_states(hud))
+			huds.Insert(icon(hud, state), state)
 	return huds

tff_modular/modules/custom_huds/code/huds_for_ghosts.dm

@@ -0,0 +1,27 @@
+GLOBAL_LIST_INIT(additional_observer_huds, list(
+	TRAIT_XENO_HUD,
+))
+GLOBAL_LIST_INIT(additional_combo_huds, list(
+	TRAIT_XENO_HUD,
+))
+
+/client/enable_combo_hud()
+	if(combo_hud_enabled)
+		return
+	mob.add_traits(GLOB.additional_combo_huds, ADMIN_TRAIT)
+	return ..()
+
+/client/disable_combo_hud()
+	if(!combo_hud_enabled)
+		return
+	mob.remove_traits(GLOB.additional_combo_huds, ADMIN_TRAIT)
+	return ..()
+
+/mob/dead/observer/show_data_huds()
+	. = ..()
+	add_traits(GLOB.additional_observer_huds, REF(src))
+
+/mob/dead/observer/remove_data_huds()
+	. = ..()
+	remove_traits(GLOB.additional_observer_huds, REF(src))
+

tff_modular/modules/tgmc_xenos/code/base_alien.dm

@@ -0,0 +1,172 @@
+/// TGMC_XENOS (old nova sector xenos)
+
+/mob/living/carbon/alien/adult/tgmc
+	name = "rare bugged alien"
+	icon = 'tff_modular/modules/tgmc_xenos/icons/big_xenos.dmi'
+	hud_possible = list(ANTAG_HUD, XENO_HUD, XENOPLASMA_HUD)
+	rotate_on_lying = FALSE
+	base_pixel_w = -16
+	layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles
+	maptext_height = 64
+	maptext_width = 64
+	pressure_resistance = 200
+
+	armor_type = /datum/armor/tgmc_xeno
+
+	bodyparts = list(
+		/obj/item/bodypart/chest/alien/tgmc,
+		/obj/item/bodypart/head/alien/tgmc,
+		/obj/item/bodypart/arm/left/alien/tgmc,
+		/obj/item/bodypart/arm/right/alien/tgmc,
+		/obj/item/bodypart/leg/right/alien/tgmc,
+		/obj/item/bodypart/leg/left/alien/tgmc,
+	)
+
+	default_organ_types_by_slot = list(
+		ORGAN_SLOT_BRAIN = /obj/item/organ/brain/alien,
+		ORGAN_SLOT_XENO_HIVENODE = /obj/item/organ/alien/hivenode,
+		ORGAN_SLOT_TONGUE = /obj/item/organ/tongue/alien,
+		ORGAN_SLOT_EYES = /obj/item/organ/eyes/alien/tgmc,
+		ORGAN_SLOT_LIVER = /obj/item/organ/liver/alien,
+		ORGAN_SLOT_EARS = /obj/item/organ/ears,
+		ORGAN_SLOT_STOMACH = /obj/item/organ/stomach/alien,
+	)
+
+	/// What icon file update_held_items will look for when making inhands for xenos
+	var/alt_inhands_file = 'tff_modular/modules/tgmc_xenos/icons/big_xenos.dmi'
+	/// Setting this will give a xeno generic_evolve set to evolve them into this type
+	var/next_evolution
+	/// Keeps track of if a xeno has evolved recently, if so then we prevent them from evolving until that time is up
+	var/has_evolved_recently = FALSE
+	/// How long xenos should be unable to evolve after recently evolving
+	var/evolution_cooldown_time = 90 SECONDS
+	/// Determines if a xeno is unable to use abilities
+	var/unable_to_use_abilities = FALSE
+	/// Все дополнительные органы, что должны находиться в телах ксеносов
+	var/list/additional_organ_types_by_slot
+
+	// Оффсет для огня
+	var/fire_offset_x = 16
+	var/fire_offset_y = 0
+
+	// АП при атаке по мехам
+	var/mecha_armor_penetration = 10
+	// Способность выдержать тяжелые удары мехов и не потерять сознание
+	var/resist_heavy_hits = FALSE
+
+	// Включен ли в данный момент фортифай
+	var/fortify = FALSE
+
+	// Может ли переносить хагов
+	var/can_hold_facehuggers = FALSE
+
+/mob/living/carbon/alien/adult/tgmc/Initialize(mapload)
+	. = ..()
+	real_name = "alien [caste]"
+
+	update_offsets() // Необходимо, чтобы base_pixel_w применился
+	set_armor(armor_type)
+
+	var/datum/atom_hud/data/xeno/xeno_hud = GLOB.huds[DATA_HUD_XENO]
+	xeno_hud.add_atom_to_hud(src)
+
+	if(next_evolution)
+		GRANT_ACTION(/datum/action/cooldown/alien/tgmc/generic_evolve)
+
+	add_traits(list(TRAIT_XENO_HEAL_AURA, TRAIT_PIERCEIMMUNE, TRAIT_XENO_HUD), TRAIT_XENO_INNATE)
+	AddElement(/datum/element/resin_walker, /datum/movespeed_modifier/resin_speedup)
+	AddElement(/datum/element/prevent_xeno_attacking_of_types, GLOB.typecache_general_bad_hostile_attack_targets, "this tastes awful!")
+	AddComponent(/datum/component/seethrough_mob)
+
+/mob/living/carbon/alien/adult/tgmc/create_internal_organs()
+	if(additional_organ_types_by_slot)
+		for(var/slot in additional_organ_types_by_slot)
+			default_organ_types_by_slot[slot] = additional_organ_types_by_slot[slot]
+	return ..()
+
+/mob/living/carbon/alien/adult/tgmc/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
+	if(body_position == LYING_DOWN) // Лежим - значит отдыхаем. Никакой войны во время отдыха
+		to_chat(src, span_warning("You can't do that in this position!"))
+		return FALSE
+	if(fortify)
+		to_chat(src, span_warning("You can't do that in this position!"))
+		return FALSE
+	if(ishuman(attack_target))
+		var/mob/living/carbon/human/target = attack_target
+		if(target.stat == DEAD)
+			to_chat(src, span_warning("[target] is dead, why would you want to touch it?"))
+			return FALSE
+	return ..()
+
+/mob/living/carbon/alien/adult/tgmc/death(gibbed)
+	. = ..()
+	xeno_hud_set_plasma()
+
+/mob/living/carbon/alien/adult/tgmc/set_resting(new_resting, silent = TRUE, instant = FALSE)
+	if(fortify)
+		balloon_alert(src, "Cannot while fortified")
+		return FALSE
+	return ..()
+
+/mob/living/carbon/alien/adult/tgmc/on_lying_down(new_lying_angle)
+	. = ..()
+	add_movespeed_modifier(/datum/movespeed_modifier/tgmc_alien_sleeping)
+
+/mob/living/carbon/alien/adult/tgmc/on_standing_up()
+	. = ..()
+	remove_movespeed_modifier(/datum/movespeed_modifier/tgmc_alien_sleeping)
+
+/datum/movespeed_modifier/tgmc_alien_sleeping
+	multiplicative_slowdown = 8
+
+/mob/living/carbon/alien/adult/tgmc/getarmor(def_zone, type)
+	return get_armor_rating(type)
+
+/datum/armor/tgmc_xeno
+	acid = 100
+	bio = 100
+	bomb = 0
+	bullet = 0
+	consume = 0
+	energy = 0
+	laser = 0
+	fire = 0
+	melee = 0
+	wound = 100
+
+/mob/living/carbon/alien/adult/tgmc/get_fire_overlay(stacks, on_fire)
+	var/fire_icon = "generic_fire"
+
+	if(!GLOB.fire_appearances[fire_icon])
+		var/mutable_appearance/new_fire_overlay = mutable_appearance(
+			'icons/mob/effects/onfire.dmi',
+			fire_icon,
+			-HIGHEST_LAYER,
+			appearance_flags = RESET_COLOR,
+		)
+		var/matrix/M = matrix(fire_offset_x, fire_offset_y, MATRIX_TRANSLATE)
+		new_fire_overlay.transform = M
+		GLOB.fire_appearances[fire_icon] = new_fire_overlay
+
+	return GLOB.fire_appearances[fire_icon]
+
+/mob/living/carbon/alien/adult/tgmc/add_shared_particles(particle_type, custom_key, particle_flags, pool_size)
+	. = ..()
+	var/obj/particle_holder = .
+	particle_holder.pixel_x = fire_offset_x
+	particle_holder.pixel_y = fire_offset_y
+
+/mob/living/carbon/alien/adult/tgmc/prepare_data_huds()
+	. = ..()
+	xeno_hud_set_plasma()
+
+/mob/living/carbon/proc/get_max_plasma()
+	var/obj/item/organ/alien/plasmavessel/vessel = get_organ_by_type(/obj/item/organ/alien/plasmavessel)
+	if(isnull(vessel))
+		return 0
+	return vessel.max_plasma
+
+/mob/living/carbon/alien/adult/tgmc/adjustPlasma(amount)
+	. = ..()
+	if(.)
+		SEND_SIGNAL(src, COMSIG_XENO_PLASMA_ADJUSTED, amount)