From 8c588d5eb6cba6ff2749b2d362796cd296a4d935 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 25 Sep 2020 16:02:56 +0100 Subject: [PATCH 1/5] lootgrubs --- .../simple_mob/subtypes/vore/oregrub.dm | 184 ++++++++++++++++++ icons/mob/vore.dmi | Bin 194783 -> 201943 bytes maps/expedition_vr/aerostat/_aerostat.dm | 8 +- maps/expedition_vr/beach/_beach.dm | 4 +- .../underdark_pois/underdark_things.dm | 4 +- vorestation.dme | 1 + 6 files changed, 196 insertions(+), 5 deletions(-) create mode 100644 code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm new file mode 100644 index 00000000000..e146f3235d9 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -0,0 +1,184 @@ +/datum/category_item/catalogue/fauna/oregrub + name = "Oregrub" + desc = "Some form of mutated space larva, they seem to feed on minerals. This makes them the natural enemy of miners. \ + To make matters worse, these creatures will flee when threatened. More than a few foolhardy miners have met their end chasing down oregrubs after some other hostile creature attacked them. \ + Their guts tend to contain undigested minerals, so miners who are quick (and not afraid to get their hands dirty) can reap some rewards from these leathery lithovores." + value = CATALOGUER_REWARD_EASY + +/datum/category_item/catalogue/fauna/lavagrub + name = "Lavagrub" + desc = "Some form of mutated space larva, they seem to feed on minerals. This makes them the natural enemy of miners. \ + To make matters worse, these creatures will flee when threatened. More than a few foolhardy miners have met their end chasing down oregrubs after some other hostile creature attacked them. \ + This particular variant seems to be even tougher and faster than its common brown kin, and its hide is laced with silicates that make it more durable. \ + On the plus side, it's sure to contain even more valuable minerals within its bowels, if you can catch up with it to crack it open..." + value = CATALOGUER_REWARD_MEDIUM + +/datum/ai_holder/simple_mob/oregrub + hostile = FALSE //docile, unless you hit them + retaliate = TRUE //they *may* bite you... + can_flee = TRUE //but they'd rather run away + dying_threshold = 1 //and ideally, we flee as soon as possible + flee_when_outmatched = TRUE //especially when outmatched + outmatched_threshold = 25 //and we're outmatched by... basically everything! + +/* + var/run_if_this_close = 3 //oregrubs will try to book it if you get too close + +/datum/ai_holder/simple_mob/oregrub/on_engagement(atom/A) + if(get_dist(holder, A) < run_if_this_close) + holder.IMove(get_step_away(holder, A, run_if_this_close)) +*/ + +/datum/ai_holder/simple_mob/oregrub/lava + hostile = FALSE + retaliate = TRUE + can_flee = TRUE + dying_threshold = 1 + flee_when_outmatched = TRUE //lavagrubs will flee more readily than oregrubs + outmatched_threshold = 15 +// run_if_this_close = 4 + +/mob/living/simple_mob/vore/oregrub + name = "juvenile oregrub" + desc = "A young, leathery oregrub." + catalogue_data = list(/datum/category_item/catalogue/fauna/oregrub) + icon = 'icons/mob/vore.dmi' //all of these are placeholders + icon_state = "oregrub" + icon_living = "oregrub" + icon_dead = "oregrub-dead" + + faction = "grubs" + maxHealth = 50 //oregrubs are quite hardy + health = 50 + + melee_damage_lower = 1 + melee_damage_upper = 3 //low damage, they prefer to flee + + movement_cooldown = 8 + + meat_type = /obj/item/weapon/ore/coal + + response_help = "pokes" + response_disarm = "pushes" + response_harm = "roughly pushes" + + ai_holder_type = /datum/ai_holder/simple_mob/oregrub + say_list_type = /datum/say_list/oregrub + + var/poison_per_bite = 2.5 + var/poison_type = "thermite_v" //burn baby burn + var/poison_chance = 50 + + var/min_ore = 4 + var/max_ore = 7 + + vore_bump_chance = 50 + vore_bump_emote = "applies minimal effort to try and slurp up" + vore_active = 1 + vore_capacity = 1 + vore_pounce_chance = 0 //grubs only eat incapacitated targets + vore_default_mode = DM_DIGEST + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 1000 + poison_resist = 1.0 + + //these things are resilient, on account of being infused with all the minerals they eat + armor = list( + "melee" = 25, + "bullet" = 15, + "laser" = 15, + "energy" = 0, + "bomb" = 25, + "bio" = 100, + "rad" = 100 + ) + +/mob/living/simple_mob/vore/oregrub/lava + name = "mature lavagrub" + desc = "A mature, rocky lavagrub" + catalogue_data = list(/datum/category_item/catalogue/fauna/lavagrub) + icon_state = "lavagrub" + icon_living = "lavagrub" + icon_dead = "lavagrub-dead" + + movement_cooldown = 5 + maxHealth = 75 //lavagrubs are really hardy + health = 75 + ai_holder_type = /datum/ai_holder/simple_mob/oregrub/lava + //lavagrubs have even more armor than oregrubs + armor = list( + "melee" = 50, + "bullet" = 25, + "laser" = 25, + "energy" = 0, + "bomb" = 50, + "bio" = 100, + "rad" = 100 + ) + + var/lava_min_ore = 8 + var/lava_max_ore = 12 + + poison_per_bite = 5 + poison_chance = 66 + +/datum/say_list/oregrub + emote_see = list("burbles", "chitters", "snuffles around for fresh ore") + +/mob/living/simple_mob/vore/oregrub/apply_melee_effects(var/atom/A) + if(isliving(A)) + var/mob/living/L = A + var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) + if(L.can_inject(src, null, target_zone)) + inject_poison(L, target_zone) + +/mob/living/simple_mob/vore/oregrub/death() + visible_message("\The [src] shudders and collapses, expelling the ores it had devoured!") + var/i = rand(min_ore,max_ore) + while(i>1) + var/ore = pick(/obj/item/weapon/ore/glass,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/lead,/obj/item/weapon/ore/marble,/obj/item/weapon/ore/phoron,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/gold) + new ore(src.loc) + i-- + ..() + +/mob/living/simple_mob/vore/oregrub/lava/death() + set_light(0) + var/p = rand(lava_min_ore,lava_max_ore) + while(p>1) + var/ore = pick(/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/hydrogen,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/verdantium) + new ore(src.loc) + p-- + ..() + +// Does actual poison injection, after all checks passed. +/mob/living/simple_mob/vore/oregrub/proc/inject_poison(mob/living/L, target_zone) + if(prob(poison_chance)) + to_chat(L, "You feel fire running through your veins!") + L.reagents.add_reagent(poison_type, poison_per_bite) + +/mob/living/simple_mob/vore/oregrub/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "PLACEHOLDER!" + + B.emote_lists[DM_HOLD] = list( + "PLACEHOLDER!") + + B.emote_lists[DM_DIGEST] = list( + "PLACEHOLDER!") + +/mob/living/simple_mob/vore/oregrub/lava/handle_light() + . = ..() + if(. == 0 && !is_dead()) + set_light(2.5, 1, COLOR_ORANGE) + return 1 \ No newline at end of file diff --git a/icons/mob/vore.dmi b/icons/mob/vore.dmi index 396c6ef362bf12fe68b212c13a7745cd8a619b82..9fad9d332de3e8d507017ad6b53d07bd6054acc5 100644 GIT binary patch delta 10773 zcmZvC1yodR*Y?oesl*Ij3W5kK10y&Rf}|kb(kTc-9y$a`B}7^QmF{jNB^0Tlkp^Mt z7~nrV&-=Z9tbf+5GqvWv_r3Gl*FJL?vhgqEaojiz@jTr0(x-cIIX|+S8mXxHU0;?j zaye?gi8o?;ICKmZX{lH>5$S)iCo7faSkWzV-2Wv1Wp24+wU@3i{d&6H86d}Xv#)wG zU#&lMRK^nR&}8`B7^@Ip{1?b9a_q6bl4u`|I7t^KP4G0&+a3Kh5q$EtP^-w1|MKCU z{Fu_tE!mz&)gwvd_mK(%?Qurx(X=3 z71S4un5bd}n3I2XOxmH?pYf}_BysY3Lo`C%b%;tZWP>LY;wo$P!Eb1c?Mg6fj71yW z%_%&!OW7CKOzG2{{#gZ7-~5|n?|ARAcI+yd`9p~Xm#)vejK6B*+Xo`($rOy`5_mqG z2KK4YWn|(7zUL(|ro81b_4yQ~WNA&|Cageu*Iskw)gK;i^F>4dtXK4Co$n@ee7c6o zjyyY6Bh?A0;znDfg&TNII$=O?kM@-UKEit;Ss7@OHgPp#5m4$1LCEjpwSk zM|tVW4$_pD1h`Z!4Cz$<&_c%fsmd)csQE)iKx282U${CkVZ+!~NW1<@hFtKwejyrY z5f|lH$_v~ZEn0et_Ac@#>CRC$lQ@yv%Y!wcG?&@~3>k*~g)PPG%|#L~dgk9V>M6f; zCy?H1Pe$v?`-bK5cA`+xCR0C3TSz=vF)1oiNysa8Ld>F;L_`jDw~er`pEz|jw!^t%D8p~?V<1OL zDZ;*N?Bm_lk8?8C&=p{7=d@`Hcg9mdK%j6yqD7dRxYen~!qT#{Jl&?Cq=ae&FW&#a zNSJA?$RNBM3c%^@cfyIUpH2Dx3&FJ ze7h`STQaw(h=M(qNLyQ*Ur^9o^dw(3-MnI`rmD(pp?&>ZBt5X+Ety0$@3uPFwuG^9 zK2afL3pfgH@i}%v!P!4PeEnwX?y|(_*jV{e{LDT3F-0_tTz=mDq3hr2x|A8Zc>g#H z2J?GbM{fl$Bf9VT!1Qc`w*qZ+9DBYpe<*b1^7i&F^*i@)m}^d-2}WvYXiP{en&~ca zXeMnV@vgA8bH+fVM-9v7cOt8e)4Ng`h;6jc>mlgs0`DPqAp`MX=~TbW`!eFxWaHFr z8xAbuWYyPC$rIp5BdJC8N+?M(v$HvL5Bt;`dU7Af)hel|kfZr{cnG+-xR{xlTSLj1 z@|KIDyO#pd+g8qJYd_}RTOR+N>FMjk&AQm#bDCNYm<5jF&e>WS5Y}9Z5yb{IPWl}* zf9qD+(SdkGa&>ieE)6p__V##LMptEJqOA8_Aiv%pkgLFb*SeFb+VIU0lS>Ia$__7pJk-e56iR}(9EW9OgBlU+>+ADVE%&RA}nNmBAT4%eqj*d_4?S*34q{4pw z)U0RJEw==EKW!Ua$i}!we`}L5ve%bTmPqdl{@Wf(cCy<+_4=5=SxPfu)6((RYih@| zGM5E81JIPZwaF(yx0bGM&)<&xOn-f8z&ynJG6Vt0%wjEk-A~0D-Bw_Sa~ax0(7&hq zHR)F|EUN=;<&tw5KlfLg&UHd5jhdr}9I&F0Ljap9e17*3OF|aNl})QetjBXRHa2== z!wx;(a(PIdMUpWHwU^{%rEFc68|-_p={%Gn?UUDJPR3)TYCVxmerCNoC!w-h_mc|R zWVT=tyUyXx^KEIjdfG|SKDK+wjB06}T%o7G{}<1Low*i7rPYs{?(Xg?;SUI#Eh?fi8Ak{=PzC`_5JwK1$wz2^G$}_`6x~5&!0c9ZEVOH8?%4-@WEUMe`&hTEqig% zyt1aIW8HltA^qj(=;(ZFAYKpn$B|rx+~UqBi0_hfzHTZjvJqCp7q+ECJ1pP4yb5KA zt^0~;$e4sHe~*raK(;;oXIde5?qo>=4uHg#lbyMU9167E?|nY`g4I~|BdpiHBii|L zA!9gv4$C<9XZg!2)iL(8V-UzpIN?ZoYhrPTt$THJ>X(21z|`Ks!IJFd%aTF=SnHNz3I89w`6EC1$Dnv67O~RuL32Ts7&yf9n>~*B1`zBd>_! zxu31OJN+MqEGTa`ir`~L20J+gMOWiomq*0v{d6AZ$fTsC;fV?6hf-4Usi|K!uV!bB z|NQv_6BZWEGlOyeEj+OI^8@?}YHFAu=EgYoSCUoh>DAo|jAL+D4^r>%K#zs~{pOD=S0RB!}1CZ>okBWFX3(NCOAk>O+|> zqx%YvrGY{O;Eqc?jQ_o-hgefnlN#!*%hg7ko0|*aUAagt4#Iyy3!EuXJ3Hha{+bLk zaBgCNxSSo>8VaBf4-YvYStO2TUz|>mX7^XueK&cl{waf+}k+K%|P4@^}f^vB`?lcRZD?z@^7gOw3PL=wnEOa z8{bNd86=D4Ft*)m-G_EQiiWp`1ES1_isU$MYOzuO_~chEedAoqvD7Hv+~%fBWeHKm8kfg3Im+(lT~;6G!04;&)7H`8Rcb`b@^+>ba}b zYUe688iF{vY<2$PXHTC#wW=opm&#T*bX^&6$D{w}JwN!e_*Aq?km!w`@^aYkFyY=e zOn~I=1-`pxTA1}ujg8a0#uHWc^rTO=G&o#H`*(3I{jJ1E%R9cgji!(C z0$<)#!8p)DOrb-#TieYc6-~hodXd@objAUeR#xRdE8u*pA0gB}vU1f-BF3yoMqr?R zdwP$pI-iaKHy>R0&13}aBMtS#9=s&lvN6QfR3&+U)lYv=sO;0!UPwUDmiV8^L>K87 zynd+0KVCkjihPQBg7S(dar1o@_WQu|$m(8U$j5EAkBl_pzb;z5_N|nUGX0Jw?Faq6 zyu2cw{&>hrIkD|AGi@n;r3<4TCQ116hK5##yLQV%3KBBO+Yq3W~09~1YD~} zltlx#2UmRe_TZ4|=3a&7YxIft+2ks3W~N`phG`1aUBMoqgXe0DEv&t#3<&yCX8eu+ zE5#t%j%Ltv{iefZ>_Aq#d0%#c_^%3L5Quj1-GL=)6}mjkyQ&by3^K|-W_ zg{g_qE}qHAk{KaISiT?<=nSm6za|j`=PaX^9W_+M*t*L~>SlVO!(1Y(y#n%!#H6!ldO$%={!cH-*cq9x-%a&|7i z;-DrjmFNkfiln_k1>b%2+!3{1HBP>RNPV`E_V=$7s8bX?0}zPH5*oRB3K0NRXD&he z9`aO8jjGO2I4h6PrOxF(b*&YF`fo0(5X<)9&d}(X0LG)=?97%qFUx~XHL&8R*q#de z**L?7X(3L^pQnK*mV^uMS#-krSLGWC172hBAP9u}SUK~T>C%S>!40cvP8PgD0g-Mc zQeOU=oHlvq0I{z&^!kV zLC!}O%uUEx7ZpTYTwIrtYk7G&d$~XPe^y1fE_QxG4!_^{uP2n<3eeZrm)j&HgoNXT zv&Go!oIvP;O-9gdRK5aCPeR~;h}V&&1a*uD^*|I9qif~SRgE!@w|PSCz0q7 zU5xu$Onf&u!TN8daiL$r%AhP=*a8Ja)`TR4<4&K#w6V`(d z6cM)IUVM*MPUA^36{~HfcNn}*XDX727XDl;#I~(Y>=KX!kYKo~?{UbedKx;9^V|{! zl%~Sy8kzy9pv#(2KY>EG`|6YNcqUn29DEst$TQ)aB5{RR$?Wjnq_h{eeopdq%IKy~ zL=8$dXf%jJ0}e0e8ok^ipzrpav0btylL0A&?IYenmKo60-AK!{v3=wC@89M7IU^bo zSkV(!mSz~v9S;A_YGcot*Y!*O2O|o)E&ffF6xx8cb~cN1qeji&L^YX_bS5JOV|)w& z^$9D_MuSb`qw>p=0(5VZ&g??7ljt5;R;zFzero+M@UUsXWl_rjT`ONb9k>2Tn@gfd);>O}=P2DI% zwFoc`=9Niq4olvk!WF#83pGwc$YtY3b-{V&QHi2b&FIztyKm{x>Mt+cLSoqLeqv@O zFw~rjQxor)x*Bd`{hO|H^#VzYaH?VX^5x6g&dzw1EFeI@lM zk_OKmc^w_bu|hqrnf&T%fDtlrTvb)|;w|ys^9vZ#Jp7d+5@W%*LZA|2k1-EGQk#hr zuLw0`7Q>+~ER$S{)VrJ!2r3gbgyAOOGy#>*c5Xc32!y?X7WpZKJrIMG!h{Gw?VMzl zBt~X|4hF4%=|m}?D7>ID6tK{YEqg+P#8m^871kbk(ULa_gdvbN_WQbN#W6UQelP9)g$F%D1{)bez$7nZX8cSBai`hHwV7>O z;ouY|KP-`RqPL5ViuAmub5Pu zwF9?LyKx{bji)Wc*l#=Ysh`trsK`ZG+|$K0>D1jm;muwA^c|CMKIUPC&j1}r>Y`OX zWd@q_D>DVee9!mH?!2)p-7;cjstn{aCC+`q-ucIwHl_V!5dV35o`EPTqyC{Gs(vET zplX_~p&$Y>7#S5^O|C}*f6w5cyr-vRP#er(7R(Mk17w{(s6ualNYf)%37w^0ihhg; zF!Ba9?N@ly9%>l#tjS{nkg*7+Q+=+j9SUiEFdi8{6g{6f&xcwjTP^c6!J}lb%eE-- zU4U0NO$3Z3h~eYnSOphr+1Uw#{RN1PbkQIpoX4P2h;t6HmR~r{uUZmb6W2O#T$t3o z;u75OSd6_|;##4&uEL?_)pxtM`b#dFXICzcYD%pq*$TdV0c8K}+bC*|QSgZ-A4y2- zx_eGl6@zlptvbO*1pe~dh{bTYka@}rA5&s$Z^DT=)`=8#+r85|-;b8O{+4uhKOZ(v zvFw}*xO_6Bba-fBX(HuMOUDUThny9~aMhkFqOgf_8sAwpZczR1U~2PI#5x$H#-w)` zl)0e*p%vkh*6R1`DBcSSTd6Pw1&qoW%S5#pn_KdW(u?XMmF}O;m$(KW+&)!bgM;YN zp5?&(EhXK$HA0E9uQa1q>CPTYR2DHQ2Z&5b{1ml@K-jRD^u+(3wd zL=cz+k#=@piy^ozRFP1JiOA#z%BAJv4&C$Ey4JAtiTKmNO13srYAG=UL}IIR3K)2K zZq}g+uQPk_@$GL-1L0({FJI#Of1$TMZW%YGJS()rKLl3OW(rcY7!xm7_roBY0Nq!? zYtZIeWG)ym+u*ESV0wiEKbVDT=$u^_E?1%1ijlH*NjFi;_|+s zFjEY>^cyhGe_Ju@XM!`cv;C&TFcDG!cNN$lmYI$s z@;{KatWUCd(Iq(#_>pB4Hbf*kYb%x*fgZs(_q8?gHPZt4y@$3hUTX0&YF=UP@wto0 zqUMT{qY)Gu%TQyruWLeJzgpnEFf5)$p3hZ~oj)%5iAYf~z#vgjwYvLW}&1iS!RTH5Q5P=Z5n z=vgmB=E!UZC^vAK*~2wFwv(>@?G6!f>YVkX_-W5Xj9&`I-|nKk!?*R;*Ck_1^~(ek z4O@)!7MUI@B;doP&d>(zd}rCiJIuU=<<;AQUzAg3zgm`mZd{yn)Pmj)LvK@Vl9h}{ zfk1#&#y5p6@vNus;<{x30kQ1EAfAQ&ME~1><=Xavcwv3PvJR`XH@!&XF7Ai4G|W$B zk@X`Xkg=iyS%l!}X+w}S$SNrjaj*J=bMF+p<=En|tIVN`CS*sJZqk$e#;v?lg5S-A zDZjW{I6Fc4wqf)d$GzkIGW+3Dd+LR7pH~yC2oo1yu-avPU^4T)pU%wwy{74)7%&9! z^mS77GCUM#@4Hwadz9kp=iBHcFVHE&^ggcAbzzWbuznq7m`Khm{=x#b-%h< z8wYY?>_~_c zE%mPT#POd8)cYP0(b3U&c9d0PR=jd$?}@aZxI7evM?3pyXwYnVGz=zk$kicyaft7N zc6LW&`ol^41IE9NNDw>tl;NoPH_}4fvmM1K8Io|$ze`J_U)bf40Ijp*Qts!N_9(gY z!npMGx5dT6?~;?lqhAHS`rH3KZ^XIuW%JePrXyn*xeEOdwHq9i{JJ-#uSmT^rEX$k zvc`82T+d0w?N7;iKLDg>#3dyye&szgBXX-V1f2w=9os>|D=s;i=utnJ*w>rKwog<% zh9;CR*9*(zpTf1s9YMe>NXf7c`jNFleuiQcewT4tv`9 zdB9@4pSX{1@pz#HPaJdCn*V(${~Nhmv?fNrTr1YREI?Sh#_ysJTx@H;6)fNAsv0Sp zu^!wQJe!L<@P~b8neFqJKkhM_sZoedvZYYpQLAcsb9xShRZ$6d&vbvq^j!&zyfUQx z+lIYBbhNO~{pf53E8?f_a&w?9hyYS4>n|%CsEUOU8?2z2*9}pM*l7>6V-mWXEOu+l zf&20{5Py5l&w-0NvkEZA>IEO#%H;H6Nf9V7_QdNhDpIPMS;+SYX8$;Y+z<)0v{idBVxJW6Qv*9Mwr z&z?+@`-B?6*SVk>36-{LFQ)h!lQk$N(`NX?hPD z;c&}GFD3c?^vy|$a*HQ|d5;{&Ug>a#&*HSQ@X3%GDCC5F{f2SmTo8pneABO_pG`n3 zT5{11h>cXN%|3-(m$j{m=xfk|?sGp%?Hsnh!epwzG1WcQD8GUtv7xvvfHm?nky<$? z0oaC(3jeUi(}dI~ptl1#7)h-Ux@+v$+Y;+7o^Wz;1(T4Ax^JiNbF~V!T<0iV9~UZ! zqf3it*W-VLly_thfIz5>l#sH||4)I1`T0xfy@?<@Em!^%4{7f`H+t(#M-pp#Cj!J8 zFlK;UjHcqKi7I7H?|lB1V?KoxpNz8Zc~+7nGE<4X$ZrRaHv?s0Y0xM$s*`H1=n;c_ zGNY>V3C6{R7dxYo*I<2;fDU{V5ZZp@0<-(n zYAWBoThI5UEov=o;QX;8{ZMu=SzSWp7m)3-<`SW%ii`&N6;y-B`kTksSHbr9`^+r0 z0Y?kQaJ_uC-0@$nV_KBMh*do3!D}%o@WLtV6qAI9f7?Cg2rqzdQy9qct7WplW72Iv zl`x77u3^Ehmt6X>{Bo&%@=9*`WVqFzMFq$79@m$-qxmE`i&*k?xQf**%+4Z1`o<5> zW%JkOBL0gbg5P@uG5D$dnD_f3LnfV8UbZI zXfgfP~9T3IbQ$^6nV&tmrGqY(la|2?i`Tcc;Df_6(fc{ ziv3-Hq&dQRvc0+#X7P+B%Lxj?1^(wa^74d&Q4;0~*pjl1p(w}+m(HTrHELYcmzUIU zc3Hq(`H{$%rbalc?7q+*n!@JEyGBgTiBKln&vB{A&+rNK3P8mUkGaygKllP&`*oBL zr>(%o9<{<=;q}%(b-9&w73i`l2{h>VMeT9Vibxk_`?Ma<1M#WMBWkR2}j@1a> zk#I5dog>lE_kJNv#{(kIrvy|ckcGE&(9}VK%Dl;Lnbqm!q9#!_B?ZuGY=N@ttZG)n zRkl>*Ilx5^Y-<1RFnfyOB>}}H9WAYHEqc-!F#vzG?-e^-OMLTmfVkm`KeqGMRmaY8 zhf~d_U|Z2lqr|P)kUb3~4RW#Dft{U85x?o`@_frP_^Hx9ey}V^Vu0f$7)U^|-pHx? zM2@!m>Z(C0%?E8RdT=|6wo zIapOtpeTqs!6gPGw|U+05#nMAiDGZK`ssuOZG{^c;2y(wcWvtA!XJEMmD^@^&wogJ z{zH!r5UxNz9Ou{8GCy(%?E~3>3Fw0R!;-J+_k#p0C}Lwc+b~b6GumgtUJ1xHQ0wfn z)d=%d{7^=5;aOSYa0#1qRfMP;AF+H*~g4K@-3$D(S%1 z?)!IPJP2cQi)C)FdiQtX+}>5mndIa9I3H@d(S9T#ZQ!I=h|8A|MN_4`uMwXhoZdL9 zh#fxF(*3w*M&}kba5hH{d>vpUC&VnX&`x@j`k)(1WNR`aqJF_uL3wBv|9|2f93O8c zDdA6UdsHU93uTbH{~Qd31Tj>Tar9eTFWt@YlA00A0t*X^UGJv6^F4OHM|9psMn>0c z!tE&S`GNLOFZPC9^5guOYk7eG2*fYb^^v3E^2NW666|*H4>Bf=R%CmhjI{JvAFV>i z{Dn!nga*j{ArnPf@xRBF;HXI-<7S`^!XdoKVY=8$>g&(w9T6koHyfYkYz+Csuu1N( z*t3NZ4e?XlybNA0L1S$Cw!;o=|1Wh;O|ak(8gnljAXh?D&l#+B2W)Vjd*zKee%7!I2pg@d8M{@QHgjU(ematVi#04!6unQ-T2={E`9K= zTQ2Ub>|EUlAfXWlu7+HW&{P!{52X%gs};SZ#MYRt5)1Y=gWF)fGIO5<-)>J;^^c*^ z{f&TB$l7++Q@0RZ_Njum&&ODXJE{B>GQT*~j(F{LGi|4ZiV))BfV0rYJF%!M?c(YC z>|gUpm{U&{x?*h5isaAot{AR;u9h*9NL=>SCDselN+CH7o4Lc7!BK9;KzpyZ#joQ# zATc#)W8&Jh#SEXC*CtcQC6Q0_^{0;|0$Q(q$>0OaZfCCCjV)IWZlS|zcIMG#T+AtS zGZXmneHABOx{O;wB*+psq~^)yiCYsf=KPS^g+PhmeQ?Hg)k|{>HQop z!=8-P01k}XuDb{$*&G{uCJO97%v0~O?Nk|y!wG@nKNkW$89jKM&arD0Vq}0HUA8@M zdla<2ko7E4;9S@1)rQnV5z(vg@b+|&VNWw11slhqr(j(AkLbQltM!F$|G9T9vmBzt?ZtJM9$~WJlwp$Zjxm8!bqVt=xgHdCg~01EL|E|Zo2_w0)t}6 zZm^fXD$GAYGdEJ*3k=xY%_XySQ+-xQRCVvAm^JW_Ec9+L;VMX!qJLz@4pfutY2cFv zFJ!o+4E7dYm!(3Dw_?8xZ~6?`KotTdT$J*=9s0f@Y7`SR|+fmq_K^ z+SV+J=dPl+jKtA9{<5 zi(B#|`}+H@Cxc0`1Q3ubq(R&8`k$Qd_!rOPI0w&vYsH~k9v<1X-?~_bmLAQsZy8~z z`^luvx5F{W+3^m!V@MIzM+85~GH{j^@-M;67Is&059IaD`SoLCRZbeE#WHlURL7-~ zqhKGHhFR8*oPwN4P9J~6kELc?vTrGo^qWZJ3lq8X$az;!?mS+0J>;{P4ej%a-Fq}; zwQW8{Ot(pcB1JoC zM;h@Sj|t3_gKs#*-;#04gon4}wH0eU1m_6KP~W7;ED$8YfJOF2*UK#Kt*M0nY=0W! zG5LRO4t7kpNN{Dgp0O7Ea$RRFstkt9##bvpd-enXTK@Ou;NAe|b#C0=rjT;_v=0fG zGd`pHtJaXt@E9iB+46C*WL;`i;Z7zU0#bTZR&s~t0PN9V&Y%GCGr+&4hA{;q_6=gK zO|C}+*Ll1S-iUy^x*ZRryHj}yzRa?dm}{Hk>hSQE`XSr)?J2mx*tFFqbA8Mm0WjbR-#vNW$!frIWT(^|mq-1;4 z7&#>G0VfGG^_ej-rUw~2AzZetgX+w03Qd+B*P<6i@5fqfHvg#otYSi$o+NN9<|wzB z&AvHe?7O_dCs`YL`7qTub>g)5*bgx=l)x?HLV}xnc-|%BLJS<-&6Z|P;K1*ZQ}OAa z65j|mlj6w@)<M_x(D=$w?Ozfzd%Z$pa`#E!k_pf%S(&{uzpt-gN?o_~IS$7jSCKqdj1H0G2$Hso zvLHk3$Rna%ISUoi#ZW#GlC$b#gobr$HHc?M_89uS(xs#Z6+mjvifVxZ57gV*7ryS; znRS1A@H4P4FbZYaIOXAG0pwQxFu#AZsVzUSlmUl3Od~ZCI#R8IuZMxfPh?mBZ1s7# zr&@>#&tc%W`?7!S(g#G6yqp3=q$$)$-v{o35rH)(ZL_OX6)v@j-z3VH>Smm4>i2gZemlN>{^S&u^9AzVSy}G;E%KO}MEmg}E^)R+ zqKNd`Q}GEwXNStj_qBqWKXHnoJ#;-$W@W5rT0`0kB1C_dhrKd}#%E7<1O-TXk#V=^ zV`PYMangtHJZ1!ftO)!KWFlwZu(`5luRpDieSf`L!VCZc1WK2S)?);T3b@i#uutjn zX~)l3YjErZQ2{ILdL%s{qrcIqnlA$;YWjFrQ1AoBn%}*aQ-|+_}q6QKK zJ^vD_*Q1zG!dW_QRbe}B|C4Q`TD&$*JMba|FN@5g!aTV;O&H@=#OXt)7E05p-frk4 zRxQ2?6967uV~j%jhmaKpQjc_VcG%t}Bw`JR6QvfXm->?3Uus0lQafaqVF9w%K2bRF zdHZ=+*;?ET@Q#Q(jCN|<<37tbO!^R?`Q>G1ndTZK<;5DH66M5lc(q=(~omHC2Wee*V1?tJFE64<#Q~5`a2{*gD60c=rZRKC`XV-QozYU> zGLyoBLewjD8Ke_=G&zFT>E+(oljX|tX8~N!&p-E*`_K3K`1V+d<0`s3iX|Rr(mwk4 be^{WV;j-t`>$>|8@S*fX6BU5b?>Ls|-aXWzOgL@}PW zrL9xYlQobi4Yw}Ka1hcU9YCw0^*Q3zL(reEf^Om6(wxXSNftwfu6S>1&ExCeAh_-0 zSVPsf@OsPq?6auIFO4%{&82O7_cE%;0PqN(K6>O8i{ht19Kcc=J?4ujlUgpyUv@}) zycHwxXG+Bzf?Z5{w0EJr@ab7O7O{v|oP6QdtleoE1@dCWU7Na~;oIoDf|*gz5^gjN zi=9oFhDd5|H)=?*@=MYl_nd3r=7qUUhIQD$2l zT8x&gQ$tb!xr66tx4^ug_!ECqq?$EC6hIu=C2vDjK2VCuW)>oT!Xp`HNm?!`p2dpAn_B;yeLGJ>gX zu~KHLRQ4>yRZS=to7}zgZ6XiX(PmUi=9iI6zaFQ8-6o5Mm%o@9_w+O~be69-Rwj2| zwWw)Qz?%}h3gOa}$A1ZH+MyD@D0@jL3A~2myG)I{!R(3&!xf7mA+hy!Kpbg4DpF00HPkiZfafFMxuD7!?zo0wtvF7Z z9NR0}_C_KV%GDeyQOLUV$%W)i$h_cK9s7CwP@eBuNrt$xZO9Ax`lFVx5Jz}b`hRlr zb=iX}XTqlA6fw2Qw5|~b&y}Zy>cW5B6)=ilatoZ^l&}X1HZ{B+o!QM-oEb`+T0Vv* z@{b%IyUD%M`w;PdjQeZ1RDY{YO9xTNoGipcn&;3=zZeB27}Gl3 z2<&!n@rtdas1v?UPG)Ze*=Lv*i`ejCE#~WP^e*{1bVST>hiw)d*pT|F2)-_nI&fnPU@Y#vxo7W531I7 zx()^>pndNZJ2zSiz#gn0}8CdtCw ze1fEp%i)jv{A8KB-=!@8A*H{1=Zr(q{;J%wX`gdDHDD>ecA>|u9JCM8Z-uvJIMvs1SeLtf+S+I}@o2sfs=2r{#K1!e%bZ9uu+~42dbIN4&ThfoG zK^+8{TZ>Ypae~8LZdGjEoEi%tmm0+xRUW{exc(w=nPXyjybg09)BCbYtWHD9xLV z?c*j@t#EuB4-T#_kZ@Pew(2noL4I%;OuUd{I5)buy{)=)O=2SdJDoZYjVc15KouYg zDRDa9@tqL2Jlvlb%3oFQPhFkc5TwBXpC~0VV~^1swG*EvbszYSi$bnhV!^isU_oc} zq8e0w*o@-JZ2^7psJ)MpS?r^8X@lZ-K|H3}#WutdoG593t-ShshjY@M)w;a#jx}Xq zolpoOF&wa|qasfzBU-l%oUPAPb|5Vq#Ud2SS5_CK0*0U+MHP z$UA>TVSdSG$ULy|G)ChGx~Xa990;`f#!}l4`4Q0zTyIOVzWC@8h@Z_QE~a}7b?a4>J9v&Vj08Xl|sJLC-dDIdeovrm!j`ja+44A@yYupQ)v`?Q>~75G6m{8lz01oBltOiO0{sTJhKYcSA~Tn4 zR@hOV<}mlx_iSI8?cIPkJ=mcyAQiFSd7Ssh=h}F2bu$%DY0-<%n-+WdP|*KA9l>a? z=r&1o8^c426Clf$4&%A_=+UD!GWmbDwx89`M}*S1QAI*ihaOWg90vo8%P^qkuetdV z?KbKNB(n&IdqA?qqhNzThE#pwozShKkvxcyCvl{|l)x>|%-641g!y?zljv%l;B?r= z!*-`Sdl_)6hpjcf^YJO^(xb4>b=vkedV4mWcZle^?wY``Xz(q$vffAvi?nleq^U`( zyvJ(9>FJI=Q%w&l780sj@3F?}79Lpv8gcX`-W}rRME*M#7a-Te9Y>tsYiMp>Jvx5x z+i?dh{&=Cl3+=DvZSbQ;$*F00*1vNYoYEe3dCldZgfxfloQhhf?N<2&tHaq#)9Ce` zrBGK=85G2x{v^h#{InK}qaY!#R$LcY)%GTF;nFM`&a!azKEWRcw?uXxPAjvtuaEqz zg&bRnkwfA{8ga6oW{R#1T^2T`eD1>ck||h3gyo%9(bd(X4yjdR z4{A19I7*qS+8bt*Yh@LDGh9q<*W!JGbRh?)PP{}@ zFT7;dQqm-W>|?;mB@EC{96i5Ix_F`%Nb8@&C*18$xO?SeN(u-`SPBmh*Uxl`^6_D3 z!gP>oAf2m>8{0d^nSIApE9*P6=1i7|v`|3=NDVMF5#}1P5=uI%&A`I+Sj8L4)H&P61qd9aZbAeC-CXK64sR;yQr^N-o8BXe5md2M1N+{ zGu7{#lt#GRn}O?MX>uYwaydgDE-tZS;(sFOjl0(PGDlpS76dsz&xmJ^S>}{{a6{15 zE<1Ce$Qz#x$CH|Mi;?kAM8H9{3oVwpwUb7O<;dqF-^+kY@`-> zA8KZ1M&BAz4E#MQA9=VlbzwBA*EzA*nMo*h@JIUk`u0vvQ+<7$MAnm>tu(#kFJLB# zXxXWm8Jxi`5cTWVFI5eVvPT#n4^PiBx2M^z156TkR*pQ{Ctea0%Z6zymX4MAokXv3 zl4Y~1$IT@J0UDJkl#E?AZc{nim1$?X8t}b6jgNx~Dj3&O_nA%qsmMSNeh_!*wno9M zHS)BrrZ_diY2L`z6GwmN!#=RXWU~UcehzfqB8y7PW|>CAg-(uwmU3ZYhs-gW1@^X* z$ucEFB}I5{Uf^LK=@?BooT_p>y#)bOeqPhLkks3ym`Y#i4kh+9{N{4=6lG#wzCxPG za%G0^l1(xR5mamo?>T3eFX+Xo!m~tC6AeF7*q4K2!!)n$*|h_1Q>H=J7_9yrtv!6# zo<|l!X~h}|jX(%WPh%3*(GzDOziJ7@{H7o+nBodw)QS7Tax(Zf3V4Ao87uv2VGpt< zJa>*6?w)+JCAyK;{2%dCkuSzKO&qwlHJe>TDNA>0^rIYr7f*ip?e1BY3GY+4JD+^9 zT%bU*Mv_-@U)I;`^njFp9mQ2%v!4$8L|Ll#VC;F3{ma-#4V>gpIw@qPd5U$=t$yT$ zI2<_fLmc@HK!cjWm5kSt$^;o7@``1aq2wLhBGMW53}TE(cQJh5#KXt5d>$}i9(_|+ zx>N!^{!bdW1h}-yp8$u;DWcN#UEBzJ*3~5AakfMnZ_?A z2Siyj9h2E`0zE3zkd&j4P<@N`3=x5_Vc2cpGvwY#xW!ms-)jM$_^hGj2|WHcVf6I> zM}=`nphRMrKlsyFX;@eo4NZyX6*rYtte5xb-yHW|_1rkbN$TK|uH{nW+D0GQ+4)JW zk~$ePbL0fCDg8g=WMQS0TgOl~>xC4PSIC~9hlYm8$NhbM5h?VERzpkO@+qoEP Date: Fri, 25 Sep 2020 16:18:45 +0100 Subject: [PATCH 2/5] Update oregrub.dm --- .../simple_mob/subtypes/vore/oregrub.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index e146f3235d9..5634c6fa98b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -72,9 +72,9 @@ var/min_ore = 4 var/max_ore = 7 - vore_bump_chance = 50 + vore_bump_chance = 0 //disabled for now vore_bump_emote = "applies minimal effort to try and slurp up" - vore_active = 1 + vore_active = 0 //disabled for now vore_capacity = 1 vore_pounce_chance = 0 //grubs only eat incapacitated targets vore_default_mode = DM_DIGEST @@ -150,6 +150,12 @@ i-- ..() +/mob/living/simple_mob/vore/oregrub/lava/handle_light() + . = ..() + if(. == 0 && !is_dead()) + set_light(2.5, 1, COLOR_ORANGE) + return 1 + /mob/living/simple_mob/vore/oregrub/lava/death() set_light(0) var/p = rand(lava_min_ore,lava_max_ore) @@ -165,6 +171,7 @@ to_chat(L, "You feel fire running through your veins!") L.reagents.add_reagent(poison_type, poison_per_bite) +//I'm no good at writing this stuff, so I've just left it as placeholders and disabled the chances of them eating you. /mob/living/simple_mob/vore/oregrub/init_vore() ..() var/obj/belly/B = vore_selected @@ -175,10 +182,4 @@ "PLACEHOLDER!") B.emote_lists[DM_DIGEST] = list( - "PLACEHOLDER!") - -/mob/living/simple_mob/vore/oregrub/lava/handle_light() - . = ..() - if(. == 0 && !is_dead()) - set_light(2.5, 1, COLOR_ORANGE) - return 1 \ No newline at end of file + "PLACEHOLDER!") \ No newline at end of file From 696e3e1d5e57eb8b421f01f9519dddc41b6bd757 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 25 Sep 2020 16:19:32 +0100 Subject: [PATCH 3/5] Update oregrub.dm --- .../mob/living/simple_mob/subtypes/vore/oregrub.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index 5634c6fa98b..9e55dfcd0cc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -21,14 +21,6 @@ flee_when_outmatched = TRUE //especially when outmatched outmatched_threshold = 25 //and we're outmatched by... basically everything! -/* - var/run_if_this_close = 3 //oregrubs will try to book it if you get too close - -/datum/ai_holder/simple_mob/oregrub/on_engagement(atom/A) - if(get_dist(holder, A) < run_if_this_close) - holder.IMove(get_step_away(holder, A, run_if_this_close)) -*/ - /datum/ai_holder/simple_mob/oregrub/lava hostile = FALSE retaliate = TRUE @@ -36,7 +28,6 @@ dying_threshold = 1 flee_when_outmatched = TRUE //lavagrubs will flee more readily than oregrubs outmatched_threshold = 15 -// run_if_this_close = 4 /mob/living/simple_mob/vore/oregrub name = "juvenile oregrub" From f87c5475c324039b7ec0b7857118d2ebf47074b9 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 25 Sep 2020 17:55:04 +0100 Subject: [PATCH 4/5] Update oregrub.dm --- .../mob/living/simple_mob/subtypes/vore/oregrub.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index 9e55dfcd0cc..c4163733bda 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -22,11 +22,6 @@ outmatched_threshold = 25 //and we're outmatched by... basically everything! /datum/ai_holder/simple_mob/oregrub/lava - hostile = FALSE - retaliate = TRUE - can_flee = TRUE - dying_threshold = 1 - flee_when_outmatched = TRUE //lavagrubs will flee more readily than oregrubs outmatched_threshold = 15 /mob/living/simple_mob/vore/oregrub @@ -116,8 +111,8 @@ "rad" = 100 ) - var/lava_min_ore = 8 - var/lava_max_ore = 12 + var/lava_min_ore = 6 + var/lava_max_ore = 10 poison_per_bite = 5 poison_chance = 66 @@ -163,6 +158,7 @@ L.reagents.add_reagent(poison_type, poison_per_bite) //I'm no good at writing this stuff, so I've just left it as placeholders and disabled the chances of them eating you. +/* /mob/living/simple_mob/vore/oregrub/init_vore() ..() var/obj/belly/B = vore_selected @@ -173,4 +169,5 @@ "PLACEHOLDER!") B.emote_lists[DM_DIGEST] = list( - "PLACEHOLDER!") \ No newline at end of file + "PLACEHOLDER!") +*/ \ No newline at end of file From 6eb808c1274cfb2047f46accb6fde1caec815d95 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun, 27 Sep 2020 22:41:04 +0100 Subject: [PATCH 5/5] adjust spawn weights --- maps/expedition_vr/aerostat/_aerostat.dm | 6 +++--- maps/expedition_vr/beach/_beach.dm | 13 ++++++------- .../submaps/underdark_pois/underdark_things.dm | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index 031cc07f495..cca08c6930b 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -58,9 +58,9 @@ prob_fall = 30 //guard = 20 mobs_to_pick_from = list( - /mob/living/simple_mob/animal/space/jelly = 2, - /mob/living/simple_mob/mechanical/viscerator = 2, - /mob/living/simple_mob/vore/aggressive/corrupthound = 1, + /mob/living/simple_mob/animal/space/jelly = 6, + /mob/living/simple_mob/mechanical/viscerator = 6, + /mob/living/simple_mob/vore/aggressive/corrupthound = 3, /mob/living/simple_mob/vore/oregrub = 2, /mob/living/simple_mob/vore/oregrub/lava = 1 ) diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index 57a2b176587..c82f8d2c298 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -100,13 +100,12 @@ prob_fall = 40 //guard = 20 mobs_to_pick_from = list( - /mob/living/simple_mob/vore/aggressive/frog = 3, //Frogs are 3x more likely to spawn than, - /mob/living/simple_mob/vore/aggressive/deathclaw = 1, //these deathclaws are, with these values, - /mob/living/simple_mob/animal/giant_spider = 2, - /mob/living/simple_mob/vore/aggressive/giant_snake = 1, - /mob/living/simple_mob/animal/giant_spider/webslinger = 1, - /mob/living/simple_mob/vore/oregrub = 2, - /mob/living/simple_mob/vore/oregrub/lava = 1 + /mob/living/simple_mob/vore/aggressive/frog = 6, //Frogs are 3x more likely to spawn than, + /mob/living/simple_mob/vore/aggressive/deathclaw = 2, //these deathclaws are, with these values, + /mob/living/simple_mob/animal/giant_spider = 4, + /mob/living/simple_mob/vore/aggressive/giant_snake = 2, + /mob/living/simple_mob/animal/giant_spider/webslinger = 2, + /mob/living/simple_mob/vore/oregrub = 1 ) // These are step-teleporters, for map edge transitions diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index 35da3c549c3..b080985940c 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -51,9 +51,9 @@ prob_fall = 50 //guard = 20 mobs_to_pick_from = list( - /mob/living/simple_mob/animal/giant_spider/hunter = 1, - /mob/living/simple_mob/animal/giant_spider/phorogenic/weak = 1, - /mob/living/simple_mob/animal/giant_spider/tunneler = 1, + /mob/living/simple_mob/animal/giant_spider/hunter = 3, + /mob/living/simple_mob/animal/giant_spider/phorogenic/weak = 3, + /mob/living/simple_mob/animal/giant_spider/tunneler = 3, /mob/living/simple_mob/vore/oregrub = 1, ) @@ -65,8 +65,8 @@ prob_fall = 50 //guard = 20 mobs_to_pick_from = list( - /mob/living/simple_mob/vore/aggressive/corrupthound = 1, - /mob/living/simple_mob/vore/aggressive/rat/phoron = 2, + /mob/living/simple_mob/vore/aggressive/corrupthound = 3, + /mob/living/simple_mob/vore/aggressive/rat/phoron = 6, /mob/living/simple_mob/vore/oregrub/lava = 1, )