From 680bc87ee85c378b000a66f5b14272ace11e8462 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:43:56 -0400 Subject: [PATCH 1/3] yes --- .../simple_animal/friendly/triceratops.dm | 40 ++++++++++++++++++ icons/mob/pets.dmi | Bin 89288 -> 90491 bytes yogstation.dme | 1 + 3 files changed, 41 insertions(+) create mode 100644 code/modules/mob/living/simple_animal/friendly/triceratops.dm diff --git a/code/modules/mob/living/simple_animal/friendly/triceratops.dm b/code/modules/mob/living/simple_animal/friendly/triceratops.dm new file mode 100644 index 000000000000..835f153b01c2 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/triceratops.dm @@ -0,0 +1,40 @@ +/mob/living/simple_animal/triceratops + name = "Bismuth" + desc = "Acient, Reliable, Good at Pathfinding." + icon = 'icons/mob/pets.dmi' + icon_state = "bismuth" + icon_living = "bismuth" + icon_dead = "bis_dead" + var/icon_hiding = "yeeslow_scared" + speak_emote = list("grumbles") + emote_hear = list("grunts.","grumbles.") + emote_see = list("wags their tail.", "sniffs at the ground.") + speak_chance = 1 + turns_per_move = 5 + butcher_results = list(/obj/item/dice/d20 = 1) + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "rams" + mob_biotypes = MOB_ORGANIC|MOB_BEAST + gold_core_spawnable = FRIENDLY_SPAWN + melee_damage_lower = 18 + melee_damage_upper = 18 + health = 350 + maxHealth = 350 + speed = 5 + glide_size = 2 + can_be_held = FALSE + footstep_type = FOOTSTEP_MOB_SHOE + +/mob/living/simple_animal/triceratops/handle_automated_movement() + if(!isturf(src.loc) || !(mobility_flags & MOBILITY_MOVE) || buckled) + return //If it can't move, dont let it move. + +//-----WANDERING - Time to mosey around + else + walk(src, 0) + + if(prob(10)) + step(src, pick(GLOB.cardinals)) + return + diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi index f076409592401e070b6d4fb66ebf8b38be5c9482..bfa99f75475cd9b1687e7de0493a0a431ad8ac4f 100644 GIT binary patch delta 10135 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 aS6EhKasJQ`sFncePf_-nOwnVLfd2=V`);@Z delta 8923 zcma)gWmpwm8}4j6L^>p-L%Kt{kq{6NB&0#QLux=ua?_xcfQm?ibZ=Uu1?iOTZaBmH zey6VU{W$xYYi7;tXJ*zD>wfNgt`Mj_b*OO+u#$4d93z{jJ=hr*%91CFAh#Fra-QlUAQ)TotBs(pF758 z`c$B>*S6X~!q}ut2<-#>a@lxcagq}?hi|MrIc+TXCaJ5F78zr*ap9!e9d29q{NZ_m{!(#Hhw@CfdVoM93&={ab5=Fa3vBxkZH`q+Xsx~hIC zFN@CAf4>ww;05naR!4!rvvI%3QN_DhMCq+r<-;>#B3s_o&zQ-hcf?d2ND79e-Jw`C zk?2xHh8qP^ZK-B|;St5~YKJy|Y?8&iMk?N%7oNG45qY-wKF@w}FY0LMVMt}g-Kn1T zk=qC{05mUVN-A2*^0lfGO#FiU;or3Y0yx@jQbS>vY=q;>lwwn5`XjfQR zjI&X#dDtLa9eaFfxEFUhnSPI6kTX)T&Z0Y`2KkIbuLB;1Su!e_WcDk>+YXjK%XMqE zoXag}!|$k~PJBvC^z?dub7xb2Y`)NxOn_2?YN_fg*Ee(>uvFnX#14IO%EPC@zU9F3 zlSgnlXr~gSz`@$lq3Wzn!%O-FTR(Vw^|)kh6;no?t73PM2>4X361?~n=lbS)zad%O z^zwWo&0B?zUs}rdtx#lShe_{uMG(H=4PsEWX6;-BCf70`d^9Xc@Q7(>wr*9W*Ec$i z2Kx!O59Bu+rpgBzmk-57_mvS(s*Zb^vllMFwQR+J0105Blhhc61}k@I$*e6|iO76= zqWq&;x*%rFoDbVThDh*|S^1)hnwq?+DXqSNfy=>?yqug|>z_ZQFUhVHoVl>lz`P=O3 z)aWsIDMAr{)}f`cKTbj6{TmIaw(ng7M-3da-eKqWp%WQL&x)SCxlbX}^CsA(h6Cu1 z-KscyGt5yifkYF9^ej(vM2RelP5>D>i<+tD@#QR%>0G0#6i5|I5+l1u?7{0`4J_0$e`cBcvB0j`vF-t}y^Z6BpPIgZ&DUojBa_7yNm z6MIl4E=gO0ypLYyyOxdr2tPEUh9NiaD}}tgJULS{@afw(rK7P`83tx%Z0X@!;nV(S zs??HHkK6)+YjdQW@$f`=DZ4;=0bWt$3q;4KW4)wqCE(-D)tTszwmi55Yvb{ViqiAv z3dY9Nn_FA>BqV6m)YNaPat~)4yh;r^6t%PxHH?g6wzusk4^K}$`T6-j{rEv--W46B zkk>X@X}!3$6_u1k^m@R8cQJ~qxpku49Q}ADoH_t+bub$jcpn`tXJiCYWh+17Jso&X`!q;FeOTd3XP{nV>ENby?>n$MF{f*HeuL*coi%xHfc+{D)n1CWaxP(Ndm+!Fgi?8gOn) z3F>IB=DIIlYUXKPg4Q~J(7P^jx@UIEqpqEHGoKuL9>e^l76f4Hb-$~2@=s)~{Ye*) z&(SUx2B|@t8h;zoza<=~AB(Q|LKnVC=|z*g!O{P)01J#8_W6-vQzasx8mrJBk?no4 z7a2?A@-t?C?9v%L5Qvjh4LQ-jbUqw9JJ&h1Xy){}<|c#xey|xlV(iJjQU#pTQ zW+fm=xwGs3nc`R(VG2Wgk9aSi?*5djzP^5Fb~Yw35IDcOLUx8@*xA|=bj4CdO-$&y zdwL$OprWGI?$&QPZ%^>3W(eauI5>!1cD{yd8ymyBx)eZ4QO{qTu#}{vka&7Uq(HTU zFWZNd(Yw2jK(5}^Zo}TEKU+o;%$06dn1LQB(f#>QIdpfI9#7z^Pkrf@ODr_Ym$AL1NPPLl!zv_+V^z+mVzqfad;=G`RTg{i}CZE9ldV(MI9;H>p+?QDFhsG z+^@y&eo~cP3w}`}LH)5}Cv8egpcvEcyXP2Mtoi;Yr^ZIL^01|yMG?I)ADye`0Q=(K zRAz3^DZNHQw?z9{^D%TypHD;)eBHhbH%PT0Lo2&KhT2eGohm2)1g~+i8`6VyQnu}e zBq(dg0`BeCiD}PDDM(O`)Tt_L>}1i+5-(B72#sesnu4*o7<+qr-+}K-RYTmALfiV6ZKkt{4M_sCw-u>17) z__*2m{-U9uho@(5VIlU($;q2HZ=}rgZZP8=9ByW%M=;2iuP=@&4m&$Luib91-`+9- zVbAkrU0iq`QcFa)hvP0EZ;XOKS44ym06a2!CMT^O$Yb8MubDECfy;!IV%_o{;wl)l z#fum=INdi~Vj(M&Tu8vvEfjBC6ox(?JMNFQLu6S*VIfcG4J&%-d~_I@9;g#^QV|+K zK(LauZZ^-BE1)-*5LohOd|H6ly?4_-XRGQ2ahQUlEmycVI``zL32ZLFfmn`Z@13ot zs*!T!CzWUTdP(dqKI|EpXbQF_N<#?zp8wdV52NP6BJoxO7LYl6d^r3cPVa4P$Qr9tgZcwM-mR#IMvosAl(yiK8rPdj z115}tQ|a}e;1~%wC}|lPA-gHB?LYD&8Pa48VJV8Llwka}oKyGZ+=nLsN*F2)BcnXV1MEO|xqP-f?!>{( zbI)GzX=YqeqF-uJC22mL3E&J73)9`1y7jFsStlnhWfc{d>vNYGw?T0X42&|?LDyQc z)76ONloTvN=I3(W-on6s{%&PSYi#U8jCX+$o&9s$zlhqrOF z6KGy)0If5Zl1CW7A?}TcwF^K7zBxFA9ppc46k28eK+R5IRf-#!rqWd}F( z8eL8%5z%fQ4Qhy9J@+dY3*EbN5`{1RabtSQ0Kh)|t#SpVM)(e96k9Jev)IofSA3sQ z2kLv~W~_xaophnW4L`pP0Ey(_K zVfWyGIKbIh?KIDLB)ds!z*Nko==Z`GC!t|3azP12?czK{2Y&k)s*1Rq)Jf3uAg4+1 zBK&S4@0?${WR3FK&e?Hfd;x8_{tum3z*kzoK-%`IH-$us{+AcvHaT7wXN@g;~&RMUToQjzQGn0VBK+}vpL$= zWqKFxa+syav*NV1KW4>)yMMZ^y*N~wN_UVbxzBq`yEO3nymaL}TgR!DtAjKX$1IlO z=ovLfWcl2#1Sb;c`}8kDc^SL8q`_#r0tbW8w>N1`Vd}P+jQD5j**T1Aj4C)&A=cED zA6VE6C5FmZ3PR8z(_ALZp^KogwOxmS8^MIZO_cuj#NnenVX~n;(myiZcNmc+LZXe5 zsVEb_3$%FbC%B>JuTNQdS#>upAvK46$r3OfU%U)2&h%#qacM;B+k=5=PD<5ZVIJu|nVfnwhO zj0%B3pq*$=?R2BGK>#<0k$k;O`5NmdaQQ}40srb-^ zNO}UDDv~o%YxpFgHXOdAsP?ipq+0Ja#{+XFw#Ka_sC3oxj)Q zl!^|7;T^R=RLY;`7&f(FlE2LsN(P*xU$x(nYnJJ8>TB1GzGhSKn_?5Spxaib-Udhf zZf=Z2HkR}09p)Sw8<{XzE)E$sH#hkKyho3oF!ZbbMWEm*$_Dr^*{QZ1yzHmKwZeLF zKuk$tkt#WRGP~}$CrM&}h@y44%Oab)Q;KiSk~lxV*mu;+#sJ3(_+`k*g@`C#I?8lq z%=g%D&s|st7=9nXMS{DkA^FgEQh=QE_4>m$t)}>^KLF&wpFfosPp6%_>)h7%|Fql^ zM?^$mU}7!~v&JYO$0!8v?>qAg2+)d&Wx(~ecXm3V^iu|Sk`k&iCH5-2Ptw;WL3LCP zrulo^@%e;3ctp4LQJYiCKvF}*pwF>(F%0IP5?NXyOIj;zGRz5xv38|^%&LzTU*a8C$gI7Lzf^ajJaljJWcw5a_lJw4be#2@ebLuV{R{&;~|6i~D0l47=i!Kr*WyjmMS}I;OAQPJIz; zv&ekD9urLvN-9UYYM>iMSD8w0;?wk4M@Q$4on1Q@c%ecm;YSu|XtI9d^P{?2ru5Iz zTPeR3JxEuTG=Zo3;h8B49U1sWcdBKYaQv_w!-)r{?Yh%luhNE0t}4AYi;M((V{c!T zg!wCN2`}o>*Djd7OOjGy%YAx6H_e4^m z$N13bj|Ll|aqweUN;G$|cF5%YOMhv%cAFFDgFE$4#WLUQPjQ@`M7&%H6eZecaN zDs8{eCU-8YiY-o!#i~+7c^LA-k0*oJlvBPH;~mZY)?IfvPos>7B8`XQk}QoB{m(^2 z9~cMF|6{Sw%kUr5#s`?(|K7tT`@ih|AG6w}wOI$jT-K$`~b;)=3^w7ge z2G@)+BlnF%2>|qp*zu2C6wV4t<8=&v=ypxTvWh~bcDzihsl#P&)*Z5`0==#KpTeu! z?16igw00ZHEhmX6x!I1Nf<8fR zw|a2rOmw3_I&f@EDt2QK2V!X$9G&j=4JO7C=#p-$1A%w=B!4*-=02*i2noI`X46k+ ztKCxP_UXaTnYBkK?)eX#4X)c>#1E=C%%Anxqii9ZzdBSH+`WHskavsizD0%wnk9G8l#QOSNs|UjG#Sws42<#6MVZN0g|74jCE*nrqH=NC=dhb4r^)a0 zOJm7sAfCFe9ln-4M%=e2Rl;a^S!bS!{ zHmlCdF{7Nkh!1#$teKGGqC$0bo3{?Lr62iNSqx;y8cjE^YCYLK zr=PkUeRAiw{Pj5iWUxxax@a+fs;nd|3bJ*q+V2_}F7uPW#e(5cczD*l($WcUZIyD2 zn$!_Qvt0xGj7|UmGqG!eUDxxNA2^FLAy`P&4b-~Px*6=LkC?Xr8wxQJzs9U>!5<3; zrSm0T^j|<_lSqFcyW?y=)eWXs z>w*0G6xOW&KxBL15`ZvjGiSUTE^7IZzn26&}}B|iob%BwE&c~Yx0Ew3dv6`YUv39q7p{g z;SG=V17%T-3#vzV%f!!i4e-bwho>Adm;0*s2ChtsnC*a&hZf?m0R}@`w;DWM3{hFhLeMS4gcncEZI%X=$>CB z?JMYs^?Ey25{?zMG0=@ghLx$!$|{$&~GgZ^TYANrS2V&Z2#22EOmeuqX4*>1?X z6^1HGqsi#6jTEqX;A-65&1_}ki;EEeWv;QXO6ps{S8xpgPVEQUw!7VLD&MWo3#&*yEUheS!B;cD3{g~FUm4jNbVY0HrC}JJ+ zb!GwsLZMi{XCm7B$vThFM1@9Io6Tx)p*>;{EG4iCp42{iwpn?+{F7=Cs=OgbL0Slf z+@oRhyR1v3sgRrdJ0*0`3dZ~XCwJC9VI{owr(^?wzEB3FI7&HV=c!GN!jf< zWYg3%Ow*-PHXUnwk}TB@^%|coOFNdH7*sk#ov^k6wedvM@25(E_`wLdXKFfBz`?_wkzvLLgfjyzsYnRQy0eWrYR)5VYT) ztQR9#z?x8t%tOkUonWamM9OH}oPUXuv1vRo=88<>gwb8o5b1oq&U3v##>a9?M~&_& zh7JgqEsGF=@o?&9A2etMw?j5FQ^>g%f2vF0rkAQpx)5)ifM{gGsG*ZJ{A2rXKeZI2 zb-3k?g?{&xL`p(d5SIGnQfT5t@U=k^VOXNc9m`~zLeXjccOpHcKmh`@pv-AIGsRD{ z_A*e2z=44np{}Di?@fgKHRX)AxtNRsQ*QGiWdM&4uVCY4^>m{1PCu-UJi&Q39vLZc zEokD1!o&j{tcG>W12n6E@)4T@6t0lC_=t7;qSjc+faPj8+F}r@tQJgjy7rM_`4cdC z{4QzzMcc5nUbt;ny}j3Q96jQy6#T~e4vjqIV1E?1HVIrWrj&{d#P=Mv(fei!&#rab zK%x|Peh2Ovvd%^L$oRp=CnxpmlxE?7jZRKgr}?2?uF+*>|RgyQZUCuO;;$9 zNsWMWd2eWNCNPKhaD`3Qu$-fb(9(!&csakf8G^ZXPuBtRe#kXs2qcYy+QbOJpVxX7 z+b$B>@hK=$eq<}56_sy<($7Oj=c2fVjL$}*oEj!O6jPo#bW$M7AO zsn-E0sc$+=rl}-ZcNK}M&{3`Ic7-Ls_4_XA&{##Syb$V={?!8#Z22=rdY`e-c&f~2 zd|+?TNaG+eXmFnpq}kJt$8u&;`m!}^N?`&OJ`Qz9td=;p0eept!8@GN=Khw-`3308 zgx|Ufk&`b{jt|Evr7*0ud|ujc+_ryMTwc< zJgnK)TEyLW3^d)XRau&e!DoSZo7YV?6rZ*);yA}lL@)Pd9MeUMg7>s+DF7syfVMw; z#$qnW1FH_==&=!HKYVxNJldxDu+r*jFvCqs4JIx}R0}<@Q$bAiW?a?F@8~Ou^Gyew zyaJMj{=}j5O7P+FM&@nSN8*3q)A%#t58YkUdr4k{FE9(es&wNGpOxle@+*fPt<1wk zb1tbf3hQoRKE%llb4m~arNIa{B}IEO*Qn&ZHKr2sRQnEP@#+8O%Z!VJ_qmpgRJ;>?L^21x{KM zedzy~yVd{kZ{<^1;$>=GXP2hb+nE;)B@<FBTVi?7nOlCPULR#A;S!E{+B5p!M_LFOGe2oY)5t%_a>D8H} z)@<`gsf85DBX<QmCF!)pJ3M1okb8$P$ZR~mCe>u0(U+N#2i*+1e^ttoaySavKS2perG+Wn zKLTaZ5^5gzga0!pVgJPp{4aK0w6If1%!J>h8`(6H|mGw{;18`m&L4D&`1qfpR_f$Q~ zy?pN=%sGjILKEbCm7P%;*6|+)kj6NBAnAknY_rT`Gv&=+qYrgsQ-yIgKrSaaKBc3N z^VO+v_C4!-H`AFG??ITt?mMGg^slRUtVl(4U}%|bK0Xi!(XCB3E{N-d;bZ=xHyt4Z zS|Oqe1iG5jL)}0yd%h_j<*l6{Nc*Xhio}g?brC$kgB7Gy4huhwRl`oBthF%cV$Jc;1?X9Dj7>?OkJAUme#6U^L;#6{Tc zA-dv%x--|hE@*6CuX$*qQUXGVCZJl_B<8JVbm#j^mV&m*CKZu!5^;QvQG l)BI17%|V0lUsd)UZhaKf&u;m)1pxXzlYcH(B4hIIe*i-^->?7x diff --git a/yogstation.dme b/yogstation.dme index 85a7eceac8ff..9ef6f0663be5 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -3098,6 +3098,7 @@ #include "code\modules\mob\living\simple_animal\friendly\snail.dm" #include "code\modules\mob\living\simple_animal\friendly\snake.dm" #include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm" +#include "code\modules\mob\living\simple_animal\friendly\triceratops.dm" #include "code\modules\mob\living\simple_animal\friendly\turtle.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\drones_as_items.dm" From d8282492c96b797f93a0abf28df050720ef0bcfe Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:45:29 -0400 Subject: [PATCH 2/3] byee --- _maps/RandomRuins/JungleRuins/miningbase.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index 50e8e26d83f5..223e0af279bd 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -24,7 +24,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/mob/living/simple_animal/turtle, +/mob/living/simple_animal/triceratops, /turf/open/floor/plasteel, /area/mine/living_quarters) "av" = ( From c5ba3883f873403de2e4f13dc26641ee60400d96 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:25:32 -0400 Subject: [PATCH 3/3] updates cap frfr --- code/controllers/configuration/entries/game_options.dm | 4 ++++ code/controllers/subsystem/mobs.dm | 1 + .../mob/living/simple_animal/friendly/triceratops.dm | 9 ++++++++- config/game_options.txt | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index fd65fd723ba1..dd48dae54a16 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -441,6 +441,10 @@ default = 64 min_val = 0 +/datum/config_entry/number/bismuthcap + config_entry_value = 6 + min_val = 0 + /datum/config_entry/flag/dynamic_config_enabled /datum/config_entry/number/engine_type diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 4e426872eff1..feea96624a4c 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -11,6 +11,7 @@ SUBSYSTEM_DEF(mobs) var/static/list/cubemonkeys = list() var/static/list/slimes = list() var/static/list/cheeserats = list() + var/static/list/bismuth = list() /datum/controller/subsystem/mobs/stat_entry(msg) msg = "P:[length(GLOB.mob_living_list)]" diff --git a/code/modules/mob/living/simple_animal/friendly/triceratops.dm b/code/modules/mob/living/simple_animal/friendly/triceratops.dm index 835f153b01c2..e29901d402a8 100644 --- a/code/modules/mob/living/simple_animal/friendly/triceratops.dm +++ b/code/modules/mob/living/simple_animal/friendly/triceratops.dm @@ -5,7 +5,6 @@ icon_state = "bismuth" icon_living = "bismuth" icon_dead = "bis_dead" - var/icon_hiding = "yeeslow_scared" speak_emote = list("grumbles") emote_hear = list("grunts.","grumbles.") emote_see = list("wags their tail.", "sniffs at the ground.") @@ -26,6 +25,14 @@ can_be_held = FALSE footstep_type = FOOTSTEP_MOB_SHOE +/mob/living/simple_animal/triceratops/Initialize(mapload) + var/cap = CONFIG_GET(number/bismuthcap) + if (LAZYLEN(SSmobs.bismuth) > cap) + if(prob(30)) + new /mob/living/simple_animal/triceratops(loc) + SSmobs.bismuth += src + . = ..() + /mob/living/simple_animal/triceratops/handle_automated_movement() if(!isturf(src.loc) || !(mobility_flags & MOBILITY_MOVE) || buckled) return //If it can't move, dont let it move. diff --git a/config/game_options.txt b/config/game_options.txt index 3d919ac80891..9003e7cd7186 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -695,6 +695,9 @@ ROUNDSTART_TRAITS ## Cap on how many regal rat minions there can be #RATCAP 64 +## Cap on how many bismuths there can be +#BISMUTHCAP 6 + ## Enable the capitalist agenda on your server. ECONOMY