diff --git a/modular_chomp/code/modules/exploration/bossloots.dm b/modular_chomp/code/modules/exploration/bossloots.dm index 2c8469cb24..0341465455 100644 --- a/modular_chomp/code/modules/exploration/bossloots.dm +++ b/modular_chomp/code/modules/exploration/bossloots.dm @@ -33,27 +33,43 @@ maxcharge = 10000 charge_amount = 1000 -//Midnightfog -//funny melee weapon -/obj/item/melee/midnightblade - name = "midnight blade" - icon_state = "katana" +//Reworking an old weapon into Tyr melee loot. Old Weapon was the Midnight Blade +//E sword has 30 damage, 50 AP, and 65% projectile block +//Midnightblade has less AP, and less projectile block chance +//In exchange it has special charatisics on melee hits, and higher melee block +/obj/item/melee/energy/tyr_sabre + name = "tyrian energy blade" slot_flags = SLOT_BELT | SLOT_BACK //should make a proper sprite some time but spriting energy is hard - desc = "A sword where the blade appears to be wreathed in rippling shadows." - force = 32 //I don't think weakning melee/speed, or weaking healing is quite the same vaule as 50% block/deflect chance. - armor_penetration = 50 + 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." + active_force = 30 + active_armourpen = 30 + projectile_parry_chance = 20 + defend_chance = 20 -/obj/item/melee/midnightblade/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) - if(user.a_intent == I_HURT) //Anti-Heal mode + icon = 'modular_chomp/icons/mob/tribal_gear.dmi' + icon_state = "topshield" + item_state = "topshield" + + 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_sabre/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) + if(user.a_intent == I_GRAB) //Anti-Heal mode . = ..() - target.add_modifier(/datum/modifier/grievous_wounds, 20) + if(active) + target.add_modifier(/datum/modifier/grievous_wounds, 20) else if(user.a_intent == I_DISARM) //weaken mode . = ..() - target.add_modifier(/datum/modifier/berserk_exhaustion, 3) - else if(user.a_intent == I_GRAB) //The meme mode. 1/1000000 to apply an instant kill debuff....that takes 2 mins to kill. + if(active) + target.add_modifier(/datum/modifier/berserk_exhaustion, 3) + else if(user.a_intent == I_HURT) //Tiny Chance to crit . = ..() - if(prob(0.0001)) - target.add_modifier(/datum/modifier/doomed, 120) + if(active && prob(2)) + target.adjustBruteLoss(-50) + playsound(src, "blade1", 50, 1) //Mining tool /obj/item/personal_shield_generator/belt/magnetbelt diff --git a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm index c38166673f..41a389a4b3 100644 --- a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm +++ b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm @@ -196,7 +196,7 @@ //Rad Storm /obj/item/pickaxe/diamonddrill/alien - name = "strane mining drill" + name = "alien mining drill" icon_state = "diamonddrill" item_state = "jackhammer" digspeed = 6 @@ -220,12 +220,16 @@ defend_chance = 65 -//Five player check -/obj/item/shield_projector/rectangle/automatic/tyrvault - shield_health = 250 - max_shield_health = 250 - shield_regen_delay = 600 SECONDS - shield_regen_amount = 50 +/obj/item/shield_projector/rectangle/automatic/tyrbarrier + name = "tyrian energy barrier" + desc = "An automatic shield generator made from tyr tech. Wearable as a belt." + description_info = "The barrier has 150 health, and does not benefit from armor. It will fully regenerate every 180 seconds." + shield_health = 125 + max_shield_health = 125 + shield_regen_delay = 180 SECONDS + shield_regen_amount = 125 + w_class = ITEMSIZE_NO_CONTAINER + slot_flags = SLOT_BELT size_x = 4 size_y = 4 color = "#FF3300" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm index 1df69c9abb..669f26866f 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm @@ -580,7 +580,7 @@ vore_standing_too = TRUE unacidable = TRUE - loot_list = list(/obj/item/projectile/energy/wp_shotgun = 30, + loot_list = list(/obj/item/gun/energy/curse_tyrshotgun = 30, /obj/item/gun/energy/energyballchain = 30, /obj/item/tool/wirecutters/hybrid/alien = 30, /obj/item/tool/wrench/hybrid/alien = 30, @@ -588,7 +588,7 @@ /obj/item/tool/screwdriver/hybrid/alien = 30, /obj/item/pickaxe/diamonddrill/alien = 30, /obj/item/melee/energy/sword/dualsaber = 30, - /obj/item/shield_projector/rectangle/automatic/tyrvault = 0.01, + /obj/item/shield_projector/rectangle/automatic/tyrbarrier = 1, /obj/item/stock_parts/scanning_module/omni = 80, /obj/item/stock_parts/micro_laser/omni = 80, /obj/item/stock_parts/capacitor/omni = 80, @@ -599,7 +599,8 @@ /obj/item/stock_parts/capacitor/hyper = 80, /obj/item/stock_parts/manipulator/hyper = 80, /obj/item/stock_parts/matter_bin/hyper = 80, - /obj/item/reagent_containers/food/snacks/meat = 100 + /obj/item/reagent_containers/food/snacks/meat = 100, + /obj/item/melee/energy/tyr_sabre = 30 ) /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera //poison boss @@ -915,13 +916,8 @@ ..() /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/massswarm/do_special_attack(atom/A) - rng_cycle = rand(1,2) - if(attackcycle == 1) - addtimer(CALLBACK(src, PROC_REF(bomb_chaos), A, rng_cycle), 2.5 SECONDS, TIMER_DELETE_ME) - attackcycle = 0 - else if(attackcycle == 2) - addtimer(CALLBACK(src, PROC_REF(bomb_lines), A, rng_cycle), 2.5 SECONDS, TIMER_DELETE_ME) - attackcycle = 0 + for(var/i =1 to 3) + new /mob/living/simple_mob/mechanical/hivebot/nanoevent/bright_green/tyr(src.loc) /* /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/finale //finale diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm index 4b69a63e0e..3d2521ac27 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm @@ -51,7 +51,7 @@ /obj/item/tool/screwdriver/hybrid/alien = 10, /obj/item/pickaxe/diamonddrill/alien = 10, /obj/item/melee/energy/sword/dualsaber = 10, - /obj/item/shield_projector/rectangle/automatic/tyrvault = 0.01, + /obj/item/shield_projector/rectangle/automatic/tyrbarrier = 1, /obj/item/stock_parts/scanning_module/omni = 80, /obj/item/stock_parts/micro_laser/omni = 80, /obj/item/stock_parts/capacitor/omni = 80, diff --git a/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm index 37ee73fd05..94b7adc202 100644 --- a/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm +++ b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm @@ -2,7 +2,7 @@ name = "Tyrian Melee Weapon" id = "tyr_meleegun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) + materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) build_path = /obj/item/gun/energy/energyballchain category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -13,7 +13,7 @@ name = "Tyrian Enforcer Firearm" id = "tyr_shotgun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) + materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) build_path = /obj/item/gun/energy/curse_tyrshotgun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -24,7 +24,7 @@ name = "Tyrian Infantry Firearm" id = "tyr_rifle" build_type = PROTOLATHE - materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) + materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_METALHYDROGEN = 3000,MAT_QUARTZ = 3000,MAT_EAGATE = 3000) build_path = /obj/item/gun/energy/curse_blaster category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -36,9 +36,31 @@ name = "Magnet Belt" id = "magnet_belt" build_type = PROTOLATHE - materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 700,MT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_WEATHERED_AGATE = 8000) + materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 700,MAT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_WEATHERED_AGATE = 8000) build_path = /obj/item/personal_shield_generator/belt/magnetbelt category = list( RND_CATEGORY_EQUIPMENT ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE + +/datum/design_techweb/tyr_sabre + name = "Tyrian Energy Blade" + id = "tyr_sabre" + build_type = PROTOLATHE + materials = list(MAT_BRONZE = 10000,MAT_DIAMOND = 6000,MAT_COPPER = 8000,MAT_METALHYDROGEN = 2000,MAT_QUARTZ = 2000,MAT_WEATHERED_AGATE = 6000) + build_path = /obj/item/melee/energy/tyr_sabre + category = list( + RND_CATEGORY_EQUIPMENT + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE + +/datum/design_techweb/tyr_barrierbelt + name = "Tyrian Barrier Bubble" + id = "tyr_barrier" + build_type = PROTOLATHE + materials = list(MAT_BRONZE = 20000,MAT_DIAMOND = 15000,MAT_COPPER = 15000,MAT_METALHYDROGEN = 20000,MAT_QUARTZ = 50000,MAT_WEATHERED_AGATE = 60000) + build_path = /obj/item/shield_projector/rectangle/automatic/tyrbarrier + category = list( + RND_CATEGORY_EQUIPMENT + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm b/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm index 66aefc4201..5829cc2778 100644 --- a/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm +++ b/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm @@ -8,6 +8,8 @@ "tyr_shotgun", "tyr_meleegun", "magnet_belt", + "tyr_sabre", + "tyr_barrier", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS) required_experiments = list(/datum/experiment/scanning/points/tyr_precursor_study) diff --git a/modular_chomp/icons/mob/tribal_gear.dmi b/modular_chomp/icons/mob/tribal_gear.dmi index a91980c8a5..665e090a6d 100644 Binary files a/modular_chomp/icons/mob/tribal_gear.dmi and b/modular_chomp/icons/mob/tribal_gear.dmi differ diff --git a/modular_chomp/icons/mob/tyr.dmi b/modular_chomp/icons/mob/tyr.dmi index d28e7e1d71..8c356505d7 100644 Binary files a/modular_chomp/icons/mob/tyr.dmi and b/modular_chomp/icons/mob/tyr.dmi differ diff --git a/modular_chomp/icons/obj/guns/precursor/lefthand.dmi b/modular_chomp/icons/obj/guns/precursor/lefthand.dmi index ed8d8a7b10..b4b632a530 100644 Binary files a/modular_chomp/icons/obj/guns/precursor/lefthand.dmi and b/modular_chomp/icons/obj/guns/precursor/lefthand.dmi differ diff --git a/modular_chomp/icons/obj/guns/precursor/righthand.dmi b/modular_chomp/icons/obj/guns/precursor/righthand.dmi index ef322ec36e..6371dfe8c4 100644 Binary files a/modular_chomp/icons/obj/guns/precursor/righthand.dmi and b/modular_chomp/icons/obj/guns/precursor/righthand.dmi differ diff --git a/modular_chomp/icons/obj/weather_ruins.dmi b/modular_chomp/icons/obj/weather_ruins.dmi index 680901c43f..4771d731a6 100644 Binary files a/modular_chomp/icons/obj/weather_ruins.dmi and b/modular_chomp/icons/obj/weather_ruins.dmi differ