Adds Globadier, a new spitter strain

code/__DEFINES/action.dm

@@ -38,6 +38,12 @@
 #define VREF_MUTABLE_CORROSIVEGLOB_COUNTER "VREF_CORROSIVEGLOB_COUNTER"
 // extra reference for how many boiler acid globs we have
 #define VREF_MUTABLE_AMMO_COUNTER "VREF_AMMO_COUNTER"
+// extra reference for how many globadier acid mines we have
+#define VREF_MUTABLE_ACID_MINES_COUNTER "VREF_ACIDMINE_COUNTER"
+// extra reference for how many globadier grenades we have
+#define VREF_MUTABLE_GLOB_GRENADES_COUNTER "VREF_GLOBGRENADE_COUNTER"
+// extra reference for how many globadier gas mines we have
+#define VREF_MUTABLE_GAS_MINES_COUNTER "VREF_GASMINE_COUNTER"
 
 
 /// Actions that toggle on click/trigger

code/__DEFINES/dcs/signals/signals_keybindings.dm

@@ -292,6 +292,11 @@
 #define COMSIG_XENOABILITY_HIVE_SUMMON "xenoability_hive_summon"
 
 #define COMSIG_XENOABILITY_SCATTER_SPIT "xenoability_scatter_spit"
+#define COMSIG_XENOABILITY_TOSS_GRENADE "xenoability_toss_grenade"
+#define COMSIG_XENOABILITY_PICK_GRENADE "xenoability_pick_grenade"
+#define COMSIG_XENOABILITY_ACID_MINE "xenoability_acid_mine"
+#define COMSIG_XENOABILITY_GAS_MINE "xenoability_gas_mine"
+#define COMSIG_XENOABILITY_ACID_ROCKET "xenoability_acid_rocket"
 
 #define COMSIG_XENOABILITY_WEB_SPIT "xenoability_web_spit"
 #define COMSIG_XENOABILITY_BURROW "xenoability_burrow"

code/__HELPERS/ai.dm

@@ -12,7 +12,7 @@
 		. += nearby_living
 
 ///Returns a list of humans via get_dist and same z level method, very cheap compared to range()
-/proc/cheap_get_humans_near(atom/movable/source, distance)
+/proc/cheap_get_humans_near(atom/source, distance)
 	. = list()
 	var/turf/source_turf = get_turf(source)
 	if(!source_turf)

code/_globalvars/lists/mobs.dm

@@ -77,6 +77,8 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	/mob/living/carbon/xenomorph/warrior/primordial,
 	/mob/living/carbon/xenomorph/spitter,
 	/mob/living/carbon/xenomorph/spitter/primordial,
+	/mob/living/carbon/xenomorph/spitter/globadier,
+	/mob/living/carbon/xenomorph/spitter/globadier/primordial,
 	/mob/living/carbon/xenomorph/hivelord,
 	/mob/living/carbon/xenomorph/hivelord/primordial,
 	/mob/living/carbon/xenomorph/carrier,

code/datums/keybinding/xeno.dm

@@ -920,6 +920,41 @@
 	keybind_signal = COMSIG_XENOABILITY_SCATTER_SPIT
 	hotkey_keys = list("E")
 
+/datum/keybinding/xeno/toss_grenade
+	name = "toss_grenade"
+	full_name = "Spitter: Toss Grenade"
+	description = "Toss a grenade at your target."
+	keybind_signal = COMSIG_XENOABILITY_TOSS_GRENADE
+	hotkey_keys = list("R")
+
+/datum/keybinding/xeno/pick_grenade
+	name = "pick_grenade"
+	full_name = "Spitter: Pick Grenade"
+	description = "Pick which grenade to use with Toss Grenade."
+	keybind_signal = COMSIG_XENOABILITY_PICK_GRENADE
+	hotkey_keys = list("F")
+
+/datum/keybinding/xeno/acid_mine
+	name = "acid_mine"
+	full_name = "Spitter: Place Acid Mine"
+	description = "Place a Acid Mine at your location."
+	keybind_signal = COMSIG_XENOABILITY_ACID_MINE
+	hotkey_keys = list("G")
+
+/datum/keybinding/xeno/gas_mine
+	name = "gas_mine"
+	full_name = "Spitter: Gas Mine"
+	description = "Place a Gas Mine at your location."
+	keybind_signal = COMSIG_XENOABILITY_GAS_MINE
+	hotkey_keys = list("H")
+
+/datum/keybinding/xeno/acid_rocket
+	name = "acid_rocket"
+	full_name = "Spitter: Acid Rocket"
+	description = "Fire a acid rocket at your target, after a short charge up."
+	keybind_signal = COMSIG_XENOABILITY_ACID_ROCKET
+	hotkey_keys = list("Y")
+
 /datum/keybinding/xeno/psychic_shield
 	name = "Psychic Shield"
 	full_name = "Warlock: Psychic Shield"

code/game/objects/items/explosives/grenades/incendiary_grenades.dm

@@ -13,14 +13,14 @@
 	qdel(src)
 
 
-/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red") //~Art updated fire.
+/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red", fire_type = /obj/fire/flamer) //~Art updated fire.
 	if(!isturf(epicenter))
 		CRASH("flame_radius used without a valid turf parameter")
 	radius = clamp(radius, 1, 50) //Sanitize inputs
 
 	for(var/t in filled_turfs(epicenter, radius, "circle", air_pass = TRUE))
 		var/turf/turf_to_flame = t
-		turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks)
+		turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks, fire_type)
 
 /obj/item/explosive/grenade/incendiary/som
 	name = "\improper S30-I incendiary grenade"

code/game/objects/structures/xeno.dm

@@ -359,3 +359,58 @@
 		return
 	X.visible_message(span_notice("[X] is splattered with jelly!"))
 	INVOKE_ASYNC(src, PROC_REF(activate_jelly), X)
+
+/obj/structure/xeno/acid_mine
+	name = "acid mine"
+	desc = "A weird bulb, filled with acid."
+	icon = 'icons/obj/items/mines.dmi'
+	icon_state = "acid_mine"
+	density = FALSE
+	opacity = FALSE
+	anchored = TRUE
+	max_integrity = 5
+	hit_sound = SFX_ALIEN_RESIN_BREAK
+	var/acid_damage = 30
+
+/obj/structure/xeno/acid_mine/Initialize(mapload)
+	. = ..()
+	var/static/list/connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(oncrossed),
+	)
+	AddElement(/datum/element/connect_loc, connections)
+
+/obj/structure/xeno/acid_mine/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
+	detonate()
+	return ..()
+
+//Checks if the mob walking over the mine is human, and calls detonate if so
+/obj/structure/xeno/acid_mine/proc/oncrossed(datum/source, atom/movable/A, oldloc, oldlocs)
+	SIGNAL_HANDLER
+	if(!ishuman(A))
+		return
+	if(CHECK_MULTIPLE_BITFIELDS(A.allow_pass_flags, HOVERING))
+		return
+	INVOKE_ASYNC(src,PROC_REF(detonate))
+
+//Handles detonating the mine, and dealing damage to those nearby
+/obj/structure/xeno/acid_mine/proc/detonate()
+	for(var/spatter_effect in filled_turfs(get_turf(src), 1, "square", air_pass = TRUE))
+		new /obj/effect/temp_visual/acid_splatter(spatter_effect)
+	for(var/mob/living/carbon/human/human_victim AS in cheap_get_humans_near(src,1))
+		human_victim.apply_damage(acid_damage/2, BURN, BODY_ZONE_L_LEG, ACID,  penetration = 30)
+		human_victim.apply_damage(acid_damage/2, BURN, BODY_ZONE_R_LEG, ACID,  penetration = 30)
+		to_chat(human_victim, span_danger("We are spattered with acid from the mine!"))
+		playsound(src, "sound/bullets/acid_impact1.ogg", 10)
+	qdel(src)
+
+/obj/structure/xeno/acid_mine/gas_mine
+	name = "gas mine"
+	desc = "A weird bulb, overflowing with acid. Small wisps of gas escape every so often."
+	icon_state = "gas_mine"
+	acid_damage = 40
+
+/obj/structure/xeno/acid_mine/gas_mine/detonate()
+	var/datum/effect_system/smoke_spread/xeno/acid/opaque/A = new(get_turf(src))
+	A.set_up(1,src)
+	A.start()
+	..()