Desert Planet Alterations (#12069)

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

@@ -30,6 +30,7 @@
 	icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
 	icon_state = "blaster_blast"
 	damage = 35
+	armor_penetration = 15
 	range = 6
 	penetrating = 2
 	check_armour = "laser"
@@ -37,8 +38,8 @@
 /obj/item/projectile/beam/precursor_tyr
 	name = "laser"
 	icon_state = "laser"
-	damage = 8
-	armor_penetration = 30
+	damage = 9
+	armor_penetration = 40
 	penetrating = 2
 	damage_type = BURN
 	check_armour = "laser"
@@ -59,14 +60,14 @@
 
 /obj/item/gun/energy/tyr_rifle
 	name = "tyrian longarm"
-	desc = "A strange alien weapon from tyr."
+	desc = "A strange alien weapon from tyr. Has a button to swap fire modes."
 	icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
 	icon_state = "shotgun"
 	item_state = "shotgun"
 	wielded_item_state = "placeholder"
 	origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
 
-	charge_cost = 625 //Four shots
+	charge_cost = 160 //15 shots sort of
 	battery_lock = 1 //No changing
 
 	accept_cell_type = /obj/item/cell/device
@@ -79,8 +80,8 @@
 	charge_meter = 1
 
 	firemodes = list(
-		list(mode_name="single", projectile_type=/obj/item/projectile/energy/tyr_rifle, charge_cost = 250),
-		list(mode_name="area", projectile_type=/obj/item/projectile/bullet/tyrshotburst, charge_cost = 500),
+		list(mode_name="single", projectile_type=/obj/item/projectile/energy/tyr_rifle, charge_cost = 160),
+		list(mode_name="area", projectile_type=/obj/item/projectile/bullet/tyrshotburst, charge_cost = 312),
 		)
 
 	move_delay = 0
@@ -103,8 +104,8 @@
 	icon_state = "javelin"
 	damage_type = SEARING
 	check_armour = "melee"
-	damage = 23
-	armor_penetration = 30
+	damage = 20 //16 with intended armor
+	armor_penetration = 20
 	speed = 10
 	color = "#FF6600"
 	modifier_type_to_apply = /datum/modifier/deep_wounds //reduced healing
@@ -121,8 +122,7 @@
 	name = "bluespace slash"
 	icon_state = "astral_sea_blade"
 	icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
-	damage = 30 //21 with intended armor
-	armor_penetration = 10
+	damage = 25 //15
 	damage_type = BRUTE
 	check_armour = "melee"
 	embed_chance = 0
@@ -130,37 +130,36 @@
 	penetrating = 5
 	crawl_destroy = TRUE
 
+/obj/item/projectile/bullet/astral_blade/artillery
+	range = 3
+
+/obj/item/projectile/bullet/astral_blade/artillery/secondary
+	damage = 15
+	speed = 0.5
+
 /obj/item/projectile/bullet/astral_blade/short
 	damage = 20
 	speed = 0.3
 	range = 2
 
-/obj/item/projectile/bullet/tyr_bladeburst
-	use_submunitions = 1
-	range = 0
-	embed_chance = 0
-	spread_submunition_damage = FALSE
-	submunition_spread_max = 200
-	submunition_spread_min = 120
-	submunitions = list(/obj/item/projectile/bullet/astral_blade = 3)
-
 /obj/item/projectile/energy/neurotoxin/toxic/tyr_flora
 	damage = 20 //deals 10 damage with the armor I am balancing for
 	agony = 0
 	speed = 12
 	armor_penetration = 50
+	penetrating = 5
 
 /obj/item/projectile/arc/fragmentation/tyr_mortar
 	icon_state = "mortar"
 	fragment_amount = 10
 	spread_range = 3
 	fragment_types = list(
-		/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/bullet/astral_blade/artillery, /obj/item/projectile/bullet/astral_blade/artillery, \
+		/obj/item/projectile/bullet/astral_blade/artillery, /obj/item/projectile/bullet/astral_blade/artillery/secondary
 		)
 
 /obj/item/projectile/energy/agate_lighting
-	damage = 18
+	damage = 15
 	damage_type = ELECTROCUTE
 	icon_state = "tesla_projectile"
 	armor_penetration = 30
@@ -169,5 +168,5 @@
 	crawl_destroy = TRUE
 
 /obj/item/projectile/energy/agate_lighting/fast
-	damage = 30
-	speed = 2
+	damage = 20
+	speed = 3