Desert Planet Alterations (#12069)

modular_chomp/code/modules/exploration/bossloots.dm

@@ -41,11 +41,12 @@
 	name = "tyrian energy blade"
 	slot_flags = SLOT_BELT | SLOT_BACK //should make a proper sprite some time but spriting energy is hard
 	desc = "A forgien blade made via techniques of ages old. Gains a diffrent effect base off your stance."
-	description_info = "Attacking whilst on grab intent weakens the target's healing, attacking whilst on disarm weakens the target's melee potential, and attacking whilst on harm has a 2% chance to deal guarnteed massive damage."
+	description_info = "Attacking whilst on grab intent weakens the target's healing, attacking whilst on disarm weakens the target's melee potential, and attacking whilst on harm has a 2% chance to deal guaranteed massive damage."
 	active_force = 30
 	active_armourpen = 30
 	projectile_parry_chance = 20
 	defend_chance = 20
+	colorable = FALSE
 
 	icon = 'modular_chomp/icons/mob/tribal_gear.dmi'
 	icon_state = "sabre"

modular_chomp/code/modules/exploration/tyr_tribal_gear.dm

@@ -259,42 +259,103 @@
 		slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
 		)
 
-/obj/item/clothing/suit/armor/tyr_alien
-	name = "expirmental biosuit"
-	desc = "It's a strange piece of what appears to be a suit of some sort."
-	description_info = "Organic users of the suit will be slowly healed, and given nutrition."
-	icon_state = "lingchameleon"
-	body_parts_covered = CHEST
-	armor = list(melee = 60, bullet = 50, laser = 40, energy = 40, bomb = 0, bio = 80, rad = 80)
-	siemens_coefficient = 0.4
+//E sword has 30 damage, 50 AP, and 65% projectile block
+//Axe is 60 damage, 65 AP, no guard
+//Normal attackspeed is 8
+//The katar is meant for quick strikes, the real damage from from effects
+/obj/item/melee/energy/tyr_katar
+	name = "tyrian scout katar"
+	slot_flags = SLOT_BELT | SLOT_BACK
+	desc = "A forgien blade made via techniques formly lost. Gains a diffrent effect base off your stance."
+	description_info = "Attacking whilst on grab intent will plant a heat bomb, attacking whilst on disarm will increase your speed for a brief moment, and attacking whilst on harm will phase out your foe's armor."
+	colorable = FALSE
+	attackspeed = 4
+	active_force = 5
+	active_armourpen = 70
 
-/obj/item/clothing/suit/armor/tyr_alien/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
+	projectile_parry_chance = 70
 
-/obj/item/clothing/suit/armor/tyr_alien/Destroy()
-	wearer = null
-	STOP_PROCESSING(SSobj, src)
-	return ..()
+	w_class = ITEMSIZE_SMALL
+	active_w_class = ITEMSIZE_HUGE
 
-/obj/item/clothing/suit/armor/tyr_alien/process()
-	var/mob/living/carbon/human/H = wearer?.resolve()
-	if(!ishuman(H) || H.isSynthetic() || H.stat == DEAD || H.nutrition <= 10)
-		return // Robots and dead people don't have a metabolism.
+	icon = 'modular_chomp/icons/mob/tribal_gear.dmi'
+	icon_state = "katar"
+	item_state = "katar"
 
-	if(H.getBruteLoss())
-		H.adjustBruteLoss(-0.2)
-		H.nutrition = max(H.nutrition + 5, 0)
-	if(H.getFireLoss())
-		H.adjustFireLoss(-0.2)
-		H.nutrition = max(H.nutrition + 5, 0)
-	if(H.getToxLoss())
-		H.adjustToxLoss(-0.2)
-		H.nutrition = max(H.nutrition + 5, 0)
-	if(H.getOxyLoss())
-		H.adjustOxyLoss(-0.2)
-		H.nutrition = max(H.nutrition + 5, 0)
-	if(H.getCloneLoss())
-		H.adjustCloneLoss(-0.2)
-		H.nutrition = max(H.nutrition + 5, 0)
+	item_icons = list(
+		slot_l_hand_str = 'modular_chomp/icons/obj/guns/precursor/lefthand.dmi',
+		slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
+		)
 
+/obj/item/melee/energy/tyr_katar/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+	if(active)
+		. = ..()
+		switch(user.a_intent)
+			if(I_GRAB)
+				target.add_modifier(/datum/modifier/agate_bomb, 8 SECONDS)
+			if(I_DISARM)
+				user.add_modifier(/datum/modifier/technomancer/haste, 2 SECONDS)
+			if(I_HURT)
+				target.add_modifier(/datum/modifier/phase_armor, 5 SECONDS)
+
+/datum/modifier/agate_bomb
+	name = "Agate Bomb"
+	desc = "The bomb has been planted."
+
+	on_created_text = span_notice("A strange substance is applied to your form.")
+	on_expired_text = span_warning("The substance explodes.")
+	stacks = MODIFIER_STACK_ALLOWED
+
+/datum/modifier/agate_bomb/on_expire()
+	if(holder.stat != DEAD)
+		holder.inflict_heat_damage(20)
+
+/datum/modifier/phase_armor
+	name = "Phased Armor"
+	desc = "Your defense has been phased out."
+	on_created_text = span_notice("Part of your form phases out.")
+	on_expired_text = span_warning("Your missing form phases back in.")
+	stacks = MODIFIER_STACK_EXTEND
+	incoming_damage_percent = 1.5
+
+//Trades speed for defense
+//you are the wall
+/obj/item/melee/energy/tyr_hammer
+	name = "tyrian guardian hammer"
+	slot_flags = SLOT_BELT | SLOT_BACK
+	desc = "A strange hammer made via techniques formly lost. Gains a diffrent effect base off your stance."
+	description_info = "Attacking whilst on grab intent weakens the target's healing, attacking whilst on disarm weakens the target's melee potential, and attacking whilst on harm has a 2% chance to deal guaranteed massive damage."
+	colorable = FALSE
+
+	active_force = 20
+	active_armourpen = 40
+
+	attackspeed = 20
+	defend_chance = 50
+	projectile_parry_chance = 50
+
+	active_w_class = ITEMSIZE_HUGE
+	can_cleave = TRUE
+
+	icon = 'modular_chomp/icons/mob/tribal_gear.dmi'
+	icon_state = "hammer"
+	item_state = "hammer"
+
+	item_icons = list(
+		slot_l_hand_str = 'modular_chomp/icons/obj/guns/precursor/lefthand.dmi',
+		slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
+		)
+
+/obj/item/melee/energy/tyr_hammer/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+	if(active)
+		. = ..()
+		switch(user.a_intent)
+			if(I_GRAB)
+				user.adjustFireLoss(-5)
+				user.adjustFireLoss(-5)
+			if(I_DISARM)
+				target.Weaken(30)
+			if(I_HURT)
+				var/atom/target_zone = get_edge_target_turf(user,get_dir(user, target))
+				if(!target.anchored)
+					target.throw_at(target_zone, 5, 2, user, FALSE)