diff --git a/modular_chomp/code/game/objects/structures/tyr_project_props.dm b/modular_chomp/code/game/objects/structures/tyr_project_props.dm index a6e8c80987..0760fa0996 100644 --- a/modular_chomp/code/game/objects/structures/tyr_project_props.dm +++ b/modular_chomp/code/game/objects/structures/tyr_project_props.dm @@ -333,6 +333,12 @@ catalogue_data = list(/datum/category_item/catalogue/technology/base_neon_anomalous) icon_state = "engi_disc" +/obj/item/prop/tyrlore/neonsci + name = "data disc" + desc = "A disc for storing data." + catalogue_data = list(/datum/category_item/catalogue/technology/base_neon_planetary_report) + icon_state = "sci_disc" + /datum/category_item/catalogue/anomalous/tyr_red name = "Precursor Object - Tyr Data Disc Red" desc = "The following data has been corrupted. \ @@ -419,4 +425,20 @@ Proabaly something to do with this valley being a pockect of cool in the heat." value = CATALOGUER_REWARD_HARD +/datum/category_item/catalogue/technology/base_neon_planetary_report + name = "Anomalous Conditions" + desc = "Planteray Objects Of Importance\ +

\ + Desgination: ALRE - Tyranical\ + Resources: Precursor Tech, Potential Biofuels and Weapons\ +

\ + Desgination:CHRL - Sivian\ + Resources: Precursor tech, rifts within space, the void acess\ +

\ + Desgination:AMRL - Wasteland\ + Resources: Abnormal amounts of radiations, crystaline fuel, crystaline beasts\ +

\ + Desgination: CMRE - Citadel. \ + Resources: Recruitment" + value = CATALOGUER_REWARD_HARD diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm index 9ad66d38a4..d37f508abc 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm @@ -88,7 +88,6 @@ vision_range = 7 conserve_ammo = TRUE intelligence_level = AI_SMART - use_astar = TRUE pointblank = TRUE firing_lanes = TRUE call_distance = 2 @@ -97,6 +96,9 @@ var/multiplayer_threshold = 3 /datum/ai_holder/simple_mob/intentional/eclipse/on_engagement(atom/A) + if(prob(20)) + step_rand(holder) + holder.face_atom(A) if(get_dist(holder, A) <= closest_desired_distance) holder.IMove(get_step_away(holder, A, closest_desired_distance)) else if(get_dist(holder, A) > closest_desired_distance) @@ -677,8 +679,9 @@ addtimer(CALLBACK(src, PROC_REF(special_projectile), A), 3.5 SECONDS, TIMER_DELETE_ME) else visible_message(span_danger("The [src]'s gauntlet glows silver!")) + Beam(A, icon_state = "purple_lighting", time = 3 SECONDS, maxdistance = 7) if(isliving(A)) - addtimer(CALLBACK(src, PROC_REF(gravity_pull), A), 3 SECOND, TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(gravity_pull), A), 3 SECONDS, TIMER_DELETE_ME) //The Precursor intative big folks /mob/living/simple_mob/humanoid/eclipse/lunar/titanhunter //lunar melee unit diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm index f9b3f1f6a7..b7bf496076 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm @@ -86,7 +86,8 @@ /obj/item/prop/alien/phasecoil = 60, /obj/item/circuitboard/mecha/durand/peripherals = 60, /obj/item/bluespace_harpoon = 10, - /obj/item/bone/skull = 100 + /obj/item/bone/skull = 100, + /obj/item/prop/tyrlore/neonsci = 100 ) var/obj/item/shield_projector/shield1 = null diff --git a/modular_chomp/icons/obj/weather_ruins.dmi b/modular_chomp/icons/obj/weather_ruins.dmi index a702fc3478..5b8af16c7c 100644 Binary files a/modular_chomp/icons/obj/weather_ruins.dmi and b/modular_chomp/icons/obj/weather_ruins.dmi differ