TGS Test Merge (#16154)

code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm

@@ -205,12 +205,14 @@
 	keybinding_signals = list(
 		KEYBINDING_NORMAL = COMSIG_XENOABILITY_TOXIC_GRENADE,
 	)
+	///Type of nade to be thrown
+	var/nade_type = /obj/item/explosive/grenade/smokebomb/xeno
 
 /datum/action/ability/activable/xeno/toxic_grenade/use_ability(atom/A)
 	. = ..()
 	succeed_activate()
 	add_cooldown()
-	var/obj/item/explosive/grenade/smokebomb/xeno/nade = new(get_turf(owner))
+	var/obj/item/explosive/grenade/smokebomb/xeno/nade = new nade_type(get_turf(owner))
 	nade.throw_at(A, 5, 1, owner, TRUE)
 	nade.activate(owner)
 	owner.visible_message(span_warning("[owner] vomits up a bulbous lump and throws it at [A]!"), span_warning("We vomit up a bulbous lump and throw it at [A]!"))
@@ -231,3 +233,28 @@
 	. = ..()
 	if(active)
 		. += image('icons/obj/items/grenade.dmi', "xenonade_active")
+
+//Neuro variant
+/datum/action/ability/activable/xeno/toxic_grenade/neuro
+	name = "Neuro grenade"
+	action_icon_state = "gas mine"
+	action_icon = 'icons/Xeno/actions/sentinel.dmi'
+	desc = "Throws a lump of compressed neurotoxin, which explodes into a small gas cloud."
+	ability_cost = 200
+	cooldown_duration = 50 SECONDS
+	keybinding_signals = list(
+		KEYBINDING_NORMAL = COMSIG_XENOABILITY_TOXIC_GRENADE,
+	)
+	nade_type = /obj/item/explosive/grenade/smokebomb/xeno/neuro
+
+/obj/item/explosive/grenade/smokebomb/xeno/neuro
+	name = "Neuro grenade"
+	desc = "A fleshy mass that bounces along the ground. It seems to be heating up."
+	greyscale_colors = "#bfc208"
+	greyscale_config = /datum/greyscale_config/xenogrenade
+	det_time = 15
+	smoke_duration = 4
+	dangerous = TRUE
+	smoketype = /datum/effect_system/smoke_spread/xeno/neuro/light
+	arm_sound = 'sound/voice/alien/yell_alt.ogg'
+	smokeradius = 3

code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm

@@ -75,3 +75,40 @@
 		/datum/action/ability/activable/xeno/drain_sting,
 		/datum/action/ability/activable/xeno/toxic_grenade,
 	)
+
+/datum/xeno_caste/sentinel/retrograde
+	caste_type_path = /mob/living/carbon/xenomorph/sentinel/retrograde
+	upgrade_name = ""
+	caste_name = "Retrograde Sentinel"
+	display_name = "Retrograde Sentinel"
+	upgrade = XENO_UPGRADE_BASETYPE
+	caste_desc = "A weak ranged combat alien. This one seems to have a different kind of spit."
+		// *** Ranged Attack *** //
+	spit_delay = 1 SECONDS
+	spit_types = list(/datum/ammo/xeno/toxin, /datum/ammo/xeno/acid/passthrough)
+
+	actions = list(
+		/datum/action/ability/xeno_action/xeno_resting,
+		/datum/action/ability/xeno_action/watch_xeno,
+		/datum/action/ability/activable/xeno/psydrain,
+		/datum/action/ability/activable/xeno/corrosive_acid/drone,
+		/datum/action/ability/activable/xeno/neurotox_sting,
+		/datum/action/ability/activable/xeno/xeno_spit,
+	)
+
+/datum/xeno_caste/sentinel/retrograde/primordial
+	upgrade_name = "Primordial"
+	caste_name = "Retrograde Sentinel"
+	display_name = "Retrograde Sentinel"
+	upgrade = XENO_UPGRADE_PRIMO
+	caste_desc = "A neurotoxic nightmare. It's stingers drip with poison."
+
+	actions = list(
+		/datum/action/ability/xeno_action/xeno_resting,
+		/datum/action/ability/xeno_action/watch_xeno,
+		/datum/action/ability/activable/xeno/psydrain,
+		/datum/action/ability/activable/xeno/corrosive_acid/drone,
+		/datum/action/ability/activable/xeno/neurotox_sting,
+		/datum/action/ability/activable/xeno/xeno_spit,
+		/datum/action/ability/activable/xeno/toxic_grenade/neuro
+	)

code/modules/mob/living/carbon/xenomorph/castes/sentinel/sentinel.dm

@@ -15,3 +15,7 @@
 	inherent_verbs = list(
 		/mob/living/carbon/xenomorph/proc/vent_crawl,
 	)
+
+/mob/living/carbon/xenomorph/sentinel/retrograde
+	caste_base_type = /datum/xeno_caste/sentinel/retrograde
+	upgrade = XENO_UPGRADE_BASETYPE

code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm

@@ -190,6 +190,10 @@
 	upgrade = XENO_UPGRADE_PRIMO
 	upgrade_stored = TIER_ONE_THRESHOLD
 
+/mob/living/carbon/xenomorph/sentinel/retrograde/primordial
+	upgrade = XENO_UPGRADE_PRIMO
+	upgrade_stored = TIER_ONE_THRESHOLD
+
 //----SENTINEL END----//
 //================//
 //-----SPITTER START-----//