Tyr Update (#12001)

modular_chomp/code/game/objects/structures/tyr_project_props.dm

@@ -1,7 +1,8 @@
 //oooh, shiny
 /obj/structure/prop/tyr_elevator //This won't function for a while, if ever
 	name = "odd elevator"
-	desc = "A strange metal cylandir, a partially functioning elevator it seems."
+	desc = "A strange metal cylandir, a partially functioning elevator it seems. However the doors need to be pried open."
+	description_info = "Utlize a weapon or tool to get warped somewhere else."
 	icon = 'modular_chomp/icons/obj/tribal_gear.dmi'
 	icon_state = "elevator"
 	anchored = TRUE

modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm

@@ -93,10 +93,13 @@
 	meat_amount = 3
 	meat_type = /obj/item/reagent_containers/food/snacks/copperant
 
-/mob/living/simple_mob/animal/tyr/mineral_ants/copper/apply_melee_effects(var/atom/A)
+	special_attack_min_range = 0
-	if(isliving(A))
+	special_attack_max_range = 2
-		A.emp_act(4) //The weakest strength of EMP
+	special_attack_cooldown = 10 SECONDS
-		playsound(src, 'sound/weapons/Egloves.ogg', 75, 1)
+
+/mob/living/simple_mob/animal/tyr/mineral_ants/copper/do_special_attack(atom/A)
+	empulse(src.loc, 1, 2, 3, 4)
+	playsound(src, 'sound/weapons/Egloves.ogg', 75, 1)
 
 /mob/living/simple_mob/animal/tyr/mineral_ants/agate //rushes at you and explodes
 	name = "agate metal ant"
@@ -109,7 +112,7 @@
 	meat_amount = 3
 	meat_type = /obj/item/reagent_containers/food/snacks/agateant
 
-	special_attack_min_range = 1
+	special_attack_min_range = 0
 	special_attack_max_range = 2
 	special_attack_cooldown = 10 SECONDS
 

modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm

@@ -52,7 +52,8 @@
 	icon_state = "poison_boss"
 	icon_living = "poison_boss"
 	wreckage = /obj/item/prop/tyrlore/basicflora
-	projectiletype = /obj/item/projectile/energy/neurotoxin/toxic/tyr_flora
+	projectiletype = /obj/item/projectile/bullet/astral_blade
+	specialattackprojectile = /obj/item/projectile/energy/neurotoxin/toxic/tyr_flora
 	var/regeneration_strength = -30
 
 /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/acid_boss/load_default_bellies()
@@ -265,8 +266,8 @@
 	icon_living = "yellow"
 	size_multiplier = 3
 	wreckage = /obj/item/prop/tyrlore/basicpower
-	specialattackprojectile = /obj/item/projectile/energy/lightingspark/nanoweave
+	specialattackprojectile = /obj/item/projectile/energy/agate_lighting
-	projectiletype = /obj/item/projectile/energy/lightingspark/nanoweave
+	projectiletype = /obj/item/projectile/energy/agate_lighting
 
 /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/engi_ai/do_special_attack(atom/A)
 	switch(attackcycle)

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

@@ -36,7 +36,10 @@
 	icon_living = "bright_green"
 
 /mob/living/simple_mob/mechanical/hivebot/tyr/meteor
-	projectiletype = /obj/item/projectile/arc/blue_energy/precusor
+	maxHealth = 2 LASERS_TO_KILL // 80 hp
+	health = 2 LASERS_TO_KILL
+	ai_holder_type = /datum/ai_holder/hostile/ranged/robust
+	projectiletype = /obj/item/projectile/energy/agate_lighting/fast
 
 /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr
 	name = "ai control center"

modular_chomp/code/modules/planet/tyr.dm

@@ -397,6 +397,14 @@ var/datum/planet/tyr/planet_tyr = null
 		if(acidlevel > 0)
 			L.adjustFireLoss(acidlevel)
 
+/turf/simulated/tyracid/quantum
+	acidlevel = 20
+	color = "#0059c6"
+
+
+/turf/simulated/tyracid/supernova
+	acidlevel = 10
+	color = "#b10101"
 
 /*
 WEATHER_BLIZZARD	= new (),

modular_chomp/code/modules/projectiles/precursor/tyr.dm

@@ -217,3 +217,16 @@
 		/obj/item/projectile/energy/eclipse/tyrjavelin, /obj/item/projectile/energy/eclipse/tyrjavelin, \
 		/obj/item/projectile/energy/eclipse/tyrjavelin, /obj/item/projectile/energy/eclipse/tyrjavelin/super_slow
 		)
+
+/obj/item/projectile/energy/agate_lighting
+	damage = 18
+	damage_type = ELECTROCUTE
+	icon_state = "tesla_projectile"
+	armor_penetration = 30
+	speed = 15
+	penetrating = 5
+	crawl_destroy = TRUE
+
+/obj/item/projectile/energy/agate_lighting/fast
+	damage = 30
+	speed = 2

modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm

@@ -195,10 +195,25 @@
 	requires_power = FALSE
 	outdoors = OUTDOORS_NO
 
-/area/surface/tyr/precursorruins/finale
+/area/surface/tyr/precursorruins
-	name = "Facility Final Ark"
+	name = "Ark Facility - General Area"
 	flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_SECRET_NAME | AREA_FORBID_EVENTS | PHASE_SHIELDED
 
+/area/surface/tyr/precursorruins/weather_office
+	 name = "Ark Facility - Weather Report"
+
+/area/surface/tyr/precursorruins/swarm_storage
+	 name = "Ark Facility - Replicator Storage"
+
+/area/surface/tyr/precursorruins/engine
+	 name = "Ark Facility - Engine Monitoring"
+
+/area/surface/tyr/precursorruins/lookout
+	 name = "Ark Facility - Observation Center"
+
+/area/surface/tyr/precursorruins/expirment_zone
+	 name = "Ark Facility - Expirment Containment"
+
 /area/surface/tyr/precursorruins/southeast
 	name = "Relax Training Chamber"