From 1d6939dbb059b3b306dd7178bcd04658c11dd1b9 Mon Sep 17 00:00:00 2001
From: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Date: Sat, 3 May 2025 10:50:14 -0400
Subject: [PATCH] MinourTyrChanges (#10827)
---
.../objects/structures/tyr_project_props.dm | 22 ++++++++++++++++++
.../subtypes/humanoid/eclipse/eclipse.dm | 7 ++++--
.../subtypes/humanoid/eclipse/heads.dm | 3 ++-
modular_chomp/icons/obj/weather_ruins.dmi | Bin 2744 -> 2798 bytes
4 files changed, 29 insertions(+), 3 deletions(-)
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 a702fc34783df7f824dc477c9ab3b6071a8ac986..5b8af16c7c9e0b1ba6d46e7bebdf901f34c5e961 100644
GIT binary patch
delta 2648
zcmZ8j2T+sQ7XE*dkf1{
z76e!VQXKB+s8rgw86W}DW5;6NN~Od55j2E^Ldl+%N+*&LR}hlS%saDE>0C2d2bwl#
zDgpoiMtiy)0tgd>r)9ZDf|pOUb70g-N=RgMNJKaQP>V})c%hHrUGpP~1Kx<>EJLg7S`1#gXikuo+d-#pbqv>ZIZgG|zY5gXYQjR&(ej0{iG|%6;(ZSp%
zvaDkd40(Du?6f-4h4Cxm1dEe7(+Vm=ZGP)hFKDx?|FPN!6@wC(aDXF6t?hX%#O{Bk
z+2v}nw^bl#OuE~V>F$?oj59!n{)zfjnwc3!&
zgOuP=i%hmLp=WX=H6?z3&e=|4quTV{?BMn-DZ3N9vdpBk&8mpK5mLm)HOQa
z^O@!>&HkM0R(~5xKfyc*ixTICl4tCw*up0COX6Mm*e@SoPE4Z*(U?1L8<)_}Rc`cxy-y##Jw74hX-UknxU+dapBDSKX;F%!
z_N2hG+ZWba{9OgpZWw)%e)Y`l_yFix-UY$P(e}c|-?O)o9IfTgpSKm%y*#0GZ?Yte
zeC)5K+>zzVjM{hBudOrdVs$MB={h5q}qxm7xDAK2OD%$ayJN&QQ*M
zFj5&NRrM%G+LL{1j0sqvQ&Mdjj|CD-(lA$L9_?Bp^r-7k(YKEUkjO`#eervF)E3$C
zqtZr~b>SX9DT
zE+{BRu_qOcuDQ6bJR;G5$BeIfvQK<&sk1#ZHZ2wHqr%je!^G-L0_%cq8r
z;8z|J`U-5nWLVF0q9w*9Ed8r+znY!Lm
z!0?(DUkL28+s0iXjtwS}xdT8)0+ZfSh$XZq%8vj(;YsA3p^WSnD=rkT%U?j`z)VDk
z8G*wHF;2nb6C5S}obeDQD@D34xzWr61lE3rJq3H_7xStV1aa&*M67LZJ4{irA`I&j-r|jTF7dw!
zm|L*J0jU07(GnB(@u`7wg(mkj=nhySd!w|Y?lMr3RcE4&t>tM*Ak|gMj
zzkJz^ZlMF~m13X@JQA>iNyJy@rHH%fMv-
z7BTP+ZEnt9zP&9AyoEMDNB9h$RyM(NvtSQFHyxHDi=hv7$Gs!0PAsII)A(;XyX=33
zCnR|)2$yfFO^Nmz_GC(P_A%)z*SxgFD@xZ!e=@SZJmFf}N
z)yZTCrjJmNr;=C_X%b%TIyRWI9>>CLl
zk3hVQjZMEN?)9wmbJCr@U0W75UZ)Wl#>Q>Lv@~LyvGGUXJS`?6L9h}UBORR%S%N)n
zS1`vhylrE^=y5TaTa4a8voqi#uiDKrmDslaC3Yi12lQF=dc!m@cC^crp(pX74}mjZ
zvvm1GLqj4+)F=VFV?bi{+J?E`7?$?d^A4a5xR+6n=F9&?n8lE<8C~k<4g%eNa}Hoa
z1=CSoy{Mw+@vW_nZQH=`K*ZFGKG>N+I(NN@WtMev;ZITj8jojvjs*Hyj$v-p7R7YH
zK~>-6Uo78-fEQt(j?6
zxUG6MkT^v0^-Y-sRO_BBC~!{~HB%|^GMMf6K}9OZjYsZtJBnsSR)d>%0zdEaujf#k
zrcai>*3b5VL3gJTW}q;3Hx*kSj1lsndqNSJOr#4(n^|It18i~=xQK55Vrm+
zt)xi5qNcN6C+bg?gZ@_|&hB(MsPX@!J-e&Lbr(tO+o6`;R$pFfmedkF1fiaCT6?3O
z2uNEn4%5rStEu((^l?JSMrBI+>PP*9D|B?124xZ^tk
z8?=g>PNXs8CA!dpj00{fHmDOOMfDdab>&sZR^L3Q?WB-x^fK4rgembNCBn$#A8^q3
zte2cn71+%S9-6QBTU;*b|0ux4JV>euH2gY|lAp&P&h$H+EU*j7$mhTR(h@d=;)p(_
zb*!f#mAXUAJpR(ULYp*MyR5V;6
e{8!Zyp}i9k9@BbayhQd91opbPIafQ9lm7$E=-S@^
delta 2594
zcmZ8jdpOkD8~@HFV<;xFh>Wb6vAHJKWM){bdsNmnGqoZsv@XA93iGA#V{MXFZMjS~
zV&#%+?n5rgC2|dO$!!pkVRD}xwa@;Z=l4A4yw7{ybIyA{pU?aLaX!ktkh!A@d7gqv
zp$W9Ly;uUlpoZZ5`S3}BV9ahOB;@X#Krj=tlbl@eQ6N~U)4jIf(M9ow0o
zo1HhxmXsJXnrF@O+_MuGh@Sqwd6q*YyG+)V$fi`JT0wmZz9l@boN!L`XWGQOqEQ8(
zaNNTFBwSi*=mCqL;U$xYCF|qdm`{zX=`QQd7wK(;s)|4KpJWE5OR*enclUZ+lJbBJV
z7MsshJwiI^eVJtina^YaWqJWn;(uGvz`s
z6DEePy1qfre7b(`%`m(0zK2#@80H3Bq;e0txvt_dhJ=7`uWbCr@BXv!e0*0p`tpL6
z+h)26wS<{ELd{|-d`-LQsIOBs-mfWy${c=Meki7_EXk&ma3&HT_
zzHggxhnc;>qgLUf*Rvd6jL442tkkFJ4fiyySl_gEjvW((?@rj)upo8NGCpbR@pr=iHG
zgAl9Y3)RDWg4!VY(YlPIw8?xb8b}>I(orgDpKqn=2AlS`cj()C0^cH1RRZPr{aWAX
zm)WYuLeeK?IS&vLRaE8aqudlcP%4rQoZr{>QOMF8$Q@EW`>4$tC}TNWnFc7&3j0M^
z^JLf)MZm;MLx!UK>Lm^4qxl?3SkHfq$ZZVWd2_%rIQwy=G}&E7O<`XhOi`ZW4tszs
zNdk0EFiw=U{h?oKNbE@7zx)_^zZ-hvuU&{O{sdzVaxdZ{xRc!ce1`!BL(dRnkQkS&y?9-}yyanO9O)pm?vDBTs0>oB)dS*Ot0L(j6SAiy`Jd8YvNP^M1
zi|U@z_yyvU_`N5!FIBMDAZB)9ARa!Ay?DLXg<
zj0_MJ>pIc94D=!9w-_+NDVidu7nG_c$&-UXC$<7-0C>zYVIQ`qxU9$R}UNd4;$J)bgoC8L9T8;k(%AG!SwP{ZRuzM?sw?cHX&bc
zbw>eT?{Du5_QTXRS^%!FfH0U6n%Hqe)m>pCWLbn9zaWG0mL_{_%$Ge=FaIbjy!&%KWmB$f8
z(9aLoUNHEnUaK@rNSe`y1d(?)T7$y2VMQ
zF`$OGwvif$UTxun&LMJS?xM!N*}3Au`$y=vvqmA_US3|_-lOQ{GqP8wYC!d3F(aPc
z3G^X4P5KU;@)-ys!loJ^eE;Ul2a*mfXJdpr@rTv)jz3NibMTs12~(8jIQ|Isc$qRB
zhY(3AlGRei&ZM#6LLk;l6FxA^_cS*iZl;T(4nbm6h)(|_ipfltz8!^9mXy6P@yQ@D
zTkXrpOOn})VEUF(b8~3kQxD#7d0dZqOHZY3%E-+8{JWXfU%Sf+3it@?Q&}VuL3@Tb
zv9YEPVd0iUbT}I)BX7Ex{9;OMt`^Cg0_6A+%$fP=%4Dkl4X~WIu~ra>UVkl7vbg@E
zX|PGgz$;G)_CWCR+9O*&g2MB76%KLrmbp6f7idD`jY=%f&;l_C#;;nyk~jqpu;WB#
zpEadIMtHY!|L}aXym%QV)Z#Sy;T(k%6i=V)K$i9J5
zZ<=53`fYMK3GWs9?UW0|uSo0#ugcI|>pWVm7-%T=uDb?=DJiELaU6jhw9X}lH{d9L
z6$ke4f~DV>>{n^tOFE$!C#CA}zu40O*>L^F
zVB2qE9w;@_S_{s=U>Xg9orL=}5SRKd2L>(|XdI0gNs;akn%GEa}^8KqdY
m<|rNu!a99b>>Tc!9m%xRDZEnXSdH+92iRCTS`?X+WBvvS^wI_Z