Merge branch 'master' into protean-rework

modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/positive.dm

@@ -3,3 +3,6 @@
 
 /datum/trait/positive/linguist
 	custom_only = FALSE
+
+/datum/trait/positive/toxin_gut
+	custom_only = FALSE

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm

@@ -0,0 +1,52 @@
+//This hivebots are meant to be high threats, and a tad more fitting of the alien places they tend to be in. Aka mini-bosses.
+
+/mob/living/simple_mob/mechanical/hivebot/precusor
+	name = "Precursor Hivebot"
+	icon = 'modular_chomp/icons/mob/hivebot.dmi'
+	icon_state = "precursorhive"
+	icon_living = "precursorhive"
+	attacktext = list("prodded")
+	maxHealth = 5 LASERS_TO_KILL // 150 health
+	health = 5 LASERS_TO_KILL
+	movement_cooldown = 4
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+
+	var/obj/item/shield_projector/shields = null
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/Initialize(mapload)
+	shields = new /obj/item/shield_projector/rectangle/automatic/hivebot_drone(src)
+	return ..()
+
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun
+	projectiletype = /obj/item/projectile/bullet/hivebot
+	base_attack_cooldown = 0 // Extremly rapid fire with rather weak bullets.
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/laser
+	projectiletype = /obj/item/projectile/beam/precursor
+	projectile_dispersion = 5
+	projectile_accuracy = -30
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/lobber
+	projectiletype = /obj/item/projectile/arc/blue_energy/precusor
+
+
+/obj/item/projectile/arc/blue_energy/precusor
+	name = "energy missile"
+	icon_state = "force_missile"
+	armor_penetration = 10
+	damage = 50 // Mimics the precusor laser damage and armor peircing with a tad more damage because of the lobbying style.
+	damage_type = BURN
+	color = "#A020F0"
+
+/obj/item/shield_projector/rectangle/automatic/hivebot_drone
+	shield_health = 100
+	max_shield_health = 100
+	shield_regen_delay = 5 SECONDS
+	shield_regen_amount = 20
+	size_x = 3
+	size_y = 3
+	color = "#A020F0"
+	high_color = "#A020F0"
+	low_color = "#A020F0"

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm

@@ -0,0 +1,5 @@
+//Giving the tank hivebot class a new look,
+/mob/living/simple_mob/mechanical/hivebot/tank
+	icon = 'modular_chomp/icons/mob/hivebot.dmi'
+	icon_state = "blue"
+	icon_living = "blue"

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm

@@ -1,8 +1,15 @@
+
+/mob/living/simple_mob/mechanical/mecha/combat/gygax
+	movement_cooldown = 1 //Because normal Gygaxes are tougher then ths boss version with 0 speed
+
+/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced
+	movement_cooldown = 0 //Because AADG needs all the help it can get.
+
 /mob/living/simple_mob/mechanical/mecha/combat/gygax/aerostat
 	desc = "A Vir System Authority automated combat mech with an aged apperance."
 	ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
 	say_list = /datum/say_list/gygax_aerostat
-	
+
 /datum/say_list/gygax_aerostat
 	speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
 	emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity")

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/desert_planet_mobs.dm

@@ -0,0 +1,47 @@
+/mob/living/simple_mob/animal/passive/dog/stray
+	name = "dog"
+	desc = "The most standard dog you have ever seen, it even smells like one."
+	tt_desc = "Canis lupus familiaris"
+	//faction = "mexico" //They are from Mexico. //Amusing but this prompts aggression from crew-aligned mobs.
+
+	icon = 'modular_chomp/icons/turf/desert_tiles.dmi'
+	icon_state = "dog"
+	item_state = "dog"
+	icon_living = "dog"
+	icon_rest = "dog"
+	icon_dead = "dog"
+
+	health = 50
+	maxHealth = 50
+
+	mob_size = MOB_SMALL
+	pass_flags = PASSTABLE
+	can_pull_size = ITEMSIZE_TINY
+	can_pull_mobs = MOB_PULL_NONE
+	layer = MOB_LAYER
+	density = 1
+	movement_cooldown = 0.75 //roughly a bit faster than a person
+
+	response_help  = "pets"
+	response_disarm = "rolls aside"
+	response_harm   = "stomps"
+
+	melee_damage_lower = 5
+	melee_damage_upper = 7
+	attacktext = list("nips", "bumps", "scratches")
+
+	vore_taste = "wet dog"
+
+	min_oxy = 16 //Require atleast 16kPA oxygen
+	minbodytemp = 223		//Below -50 Degrees Celcius
+	maxbodytemp = 523	//Above 80 Degrees Celcius
+	heat_damage_per_tick = 3
+	cold_damage_per_tick = 3
+
+	meat_amount = 7
+	holder_type = /obj/item/weapon/holder/armadillo
+	ai_holder_type = /datum/ai_holder/simple_mob/armadillo
+
+	speak_emote = list("rumbles", "chirr?", "churr")
+
+	say_list_type = /datum/say_list/armadillo

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm

@@ -20,6 +20,13 @@
 	adminbus_trash = TRUE //You know what, sure whatever. It's not like anyone's gonna be taking this bird on unga trips to be their gamer backpack, which kinda was the main reason for the trash eater restrictions in the first place anyway.
 	faction = "neutral"
 	say_list_type = /datum/say_list/swoopie
+	var/static/list/crew_creatures = list(	/mob/living/simple_mob/protean_blob,
+											/mob/living/simple_mob/slime/promethean)
+
+/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/IIsAlly(mob/living/L)
+	. = ..()
+	if(!.) // Outside the faction and not in friends, are they crew
+		return L?.type in crew_creatures
 
 /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/init_vore()
 	if(!voremob_loaded)