From d3effda06b0427aa1021bd7dabda4a898243f054 Mon Sep 17 00:00:00 2001 From: quardbreak <44920739+quardbreak@users.noreply.github.com> Date: Fri, 31 Dec 2021 02:14:24 +0300 Subject: [PATCH] fixes simple animal rest state bump --- code/modules/mob/living/living.dm | 1 + .../living/simple_animal/friendly/mouse.dm | 4 ---- .../mob/living/simple_animal/simple_animal.dm | 6 +++--- icons/mob/simple_animal/mouse_brown.dmi | Bin 1272 -> 1286 bytes icons/mob/simple_animal/mouse_gray.dmi | Bin 1277 -> 1287 bytes icons/mob/simple_animal/mouse_white.dmi | Bin 1301 -> 1306 bytes 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9de86c53f62..3f274e02aa1 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -602,6 +602,7 @@ default behaviour is: return resting = !resting UpdateLyingBuckledAndVerbStatus() + update_icon() to_chat(src, SPAN_NOTICE("You are now [resting ? "resting" : "getting up"].")) //called when the mob receives a bright flash diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 442359e40af..566a122645f 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -54,10 +54,6 @@ else if(prob(5)) INVOKE_ASYNC(src, .proc/audible_emote, "snuffles.") -/mob/living/simple_animal/mouse/lay_down() - ..() - icon_state = resting ? "mouse_[body_color]_sleep" : "mouse_[body_color]" - /mob/living/simple_animal/mouse/Initialize() verbs += /mob/living/proc/ventcrawl verbs += /mob/living/proc/hide diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 9532faf3a58..a208a54d7d4 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -119,10 +119,10 @@ icon_state = ICON_STATE_WORLD if(stat == DEAD && (mob_icon_state_flags & MOB_ICON_HAS_DEAD_STATE)) icon_state += "-dead" - else if(!incapacitated() && resting && (mob_icon_state_flags & MOB_ICON_HAS_REST_STATE)) - icon_state += "-resting" - else if((lying || incapacitated()) && (mob_icon_state_flags & MOB_ICON_HAS_SLEEP_STATE)) + else if(stat == UNCONSCIOUS && (mob_icon_state_flags & MOB_ICON_HAS_SLEEP_STATE)) icon_state += "-sleeping" + else if(resting && (mob_icon_state_flags & MOB_ICON_HAS_REST_STATE)) + icon_state += "-resting" z_flags &= ~ZMM_MANGLE_PLANES if(stat == CONSCIOUS) diff --git a/icons/mob/simple_animal/mouse_brown.dmi b/icons/mob/simple_animal/mouse_brown.dmi index 07342b037bb72e3a5865f87dffb0354e4e1229c2..d0d96de3b96ecd9b59c0e69533bbcf52cc34a0de 100644 GIT binary patch delta 1207 zcmV;o1W5b%35E)g7Y?8Z0{{R3yb+fl0001KktIxjfB*oVRbXiwE0-)mlV&-Qc3Yus zIjeL%fG{v%LLj={-*5LzY8@LEjU5k{ZLY7}p=Ug(o5rJe(hAA`u1?$&enxz-zk)vX?nun9+NE#4Zyev*U#(_;5jp3? z8e)FZ?y4_{Yd7EJc<)@iBJw650KbsipXxdd<3buRatTf5u<>+Wy2PKT*t z?l#H>#|Uq_@BwgzLbu_K%QZ+{s0~m@UB}6DS;JjuaFq|=ahH!5@^9t$&e{o=O08aR8insV)ud+O(# ze%Lh!00000000000Qh={B~`Tkrh}^J%9X6YDG^t$Wc^J`;rlWkTl~{40002rkAK*N VCf`hP8`A&)002ovPDHLkV1iOqMzsI{ delta 1193 zcmV;a1XlZo3it_-7Y=|30{{R3ySfFDZ*Bkpc$}S) z&klkx42RF#Q!H>*BPvHP1Y$VIE0CF1wq$H%n-bpMp$Gp2iSgE7^L1I_q?h1D2-^)M0%aroBRJ1JhBE4nRS;1E(z;QiFX8lA|w5=jY)oAnnqC+MNt$*Q6>U#`gVT+BJtag8!4=G5VS2Wh+u&a zh9=~heEd_BLL;yij&D+f$99Q`%jK%9&vs%0=yHjVO+tEPiGt3M_bHwLJY^FRt%(1B zi&dzzC?o*1UHOAaUz8}HB-t@uI8m||RTYNst0ngYz(s2ld4g%I^SRsj> zM1U{hFQ&*1GM|H}5I*7nE@b(vFz9&M!|=emlNkkIOi5ZAJZZP(hL(n8~%M1 z3FIL5APQ~F@(-DZOb0cbfm-4`GUObE$u8-O3PUKi$bLMP2xA>O9Hq4iOjt#K3i`NA zIqIW&5Kn<8xA&E$W)#_oD>i5M`3`FG-|u_jZm$!R{{&b!>zhuZH@miPh4{Mv+poV( zjeyka)rVmy)#f|&f(KQJUq=q4SaSSweWU%g-@orA`zuXPF7Bi+ zL5dspu&(hXIoe&%x?q9zDu>q{8VwbCG^Tq~8)K?y}V5^HTgd zR+Os|=Xl8;fFDZ*Bkpc$}S) zO%8%E5JuPSDH_Rz?{%ha%ntdnC|PzY z=nbuZlSZ>W+pX4=bP~J>VY{J3psa;|2IslQP)41x3L;8CS~p0PTr6*JsFM$B3CLg2 zWD0ey;{H$8qVrPM<8;^?Q1O0fr;8;08l({08Me4KTpJ1OY@iRP7+;CE>-~6%5l>Zu z>sh9qG-H;R+2d31dfScB$PbeI000AoNkl<^RCt{2n*meeFc5{in*&p6t)w~cs(8x( z|C5(&iy&^&0)yq|-lxzRHrc#vYH44_q5uE@0001BB1DIW+k=>m9DdBCaHK%ASn$#q zTJoJW6Y@;{{8N)mBPvVUAG8Mdixo4kR#jeKS*r=CP9@$q3F%oRDmp{nhd2RxNG39W zrZV!%j$-PPl?23Po$uJ|ixTxonsSI|CTg07^-*@GN0_>~U-08m4tnIpz1c6JQXmq2 zRumewNQQVFeqxH$A~&(Ss*pb7L@s3ctT5rc8WvB>WVAoYt#fXv)YvRTpg+UZ zzTwqIkz^dj3bNA1u6`SPmncvn8O*{+9v$PH2`9UzFDeY7*dp1zA0n)EC^&0>*DA8% zDw5GB!{noFR8Q&@S}9UHa;X_a7U~sSvbX6173sh4Tj6H!6951J0002^rx-O^t{U&U zF4s3cm}K0M>&ByZ(h14_Wu15?{Eqlwe+7N&(~+28b(wznzH)qTe|4JuMbtEnSVPQf z?Wy{N`14uu-nn>5*k8S~6-^+2UTZTvA^v<;ytltLffvpGiv4Lwpe=#K#lXtMFX_Lt zzc!oKjb?xKr>Asw+DY8Ut$0}J_yzsro7i8ko7We|-SHeqGP~$JkyVV7K5lJ3et!R* z{nhpMSNFyKqQ0jw;b;{9=GyTcUE6hSxXyg3vMGXavA*=~*N%S(jI?rpAv|8==zC@Q zUORrEaM1ZBLw1+t`ti?Xzm5TzjX%Ede=_lSj=$v+ycL(Z+;62Xa|8JI_jjKTQ^D-F z$_B>{-umzbaDl>d%iA*7Aa$cQK)&*xlh?AAeQ0oz5AQispctoo{z`t&kB?Hd`To^~ z`2hd`00902#%`NuXY{szd3MHbn`dY2wiy5b0000000000d_R*drJQ*uF=fm46w@yu zWMs4YfXt>kZ{wSy@C4J3wEs#h#y6`ES|&HuTXFW(Jd;hoAVY6Cd9&K*+9mhYr<;D* zH3t9y000000002EJ;ah4wf^RVis;IXS$}gPuH2aQH!maqFH_ANuMhwL063MuGj1ka T*evo800000NkvXXu0mjfg7rv( delta 1195 zcmV;c1XTNn3jGO?7Y=|30{{R3yS=fB*nfQ&XN* zU}+mGmn=blH{C7(0004WQchCV=-0C=38kkpWSbJ+-k}Ho1c~w1U-NxUo5n0F4rRsiV@a=Q zoiv(%?b&X%rlgnPMF`ssB?4t5{3AHeJ%%#sja3j)0@AusqU3COi({R9P)k7mf+lmQ z>lF9DvI?=2x|znq;(&?|V>?|W>C+aMmTMz{oeT_Nit)90+wjXV6P~IC*MFII){I$E z<@dkb0GE4wO4JjjQUCx0fk{L`RCt{2n}Je);~)@*+2vA+O^gEPo!V%9|Cbb&)YiH{ zW}4dG&3=x}OqMKvmXszx6Qu+}5ClOG1YsrshnwpI5H)RnT}WZ2K+rU}(i&EHWAuzX zv-f{#QfLHi3;PY%;I>&K;(Fbc^|d{l0Qy|weUp$LNg|^&rf#S15@hXMIsc9%yub$#35{ZS6M$L3b=hma`{kUm2SHCrSN z_z?bLirgR%@o-ile8vH6$nsTT(D#6rBn-d`1m)0xF#~l0K_fQ`KEynqfX-klaZX{> z7b{?G_&6LR=y!WfQpo624os97724f@rFcXK_#1VX)2G1LN4!~^OjJ_=jg4B4(}%Lg z{f0`&6o>Z2$szPHU>pLjfT8PN|5>xuoisF$t86q~ZTlZ zQ9ZDy;HXHhGSy5X6+2^7c9$=Z%74GFg{!?!5dIOKyz)<%6!6^o_PG%EFE20t$J8*i z8{D*|2ANs>=kQoAkOzNRg`MllaaE2Bf*=UO4^cH)&f5Dpj-|figGs?1sl`ttdM6{1 zZPE6bXTo{$6ZIwgE9hgNj>!Cf>f8LocO|}zzL@R>}7|0qzeC3|1EAf-nP4?GY z#{NpqRy2X|m8(!KezLw~e{BPAoc$I1he-f8gcK(Oi;thKZ?eC(+xIPJf2GTlI=9@H zAjJ)NSm*eX?Cr1j?faX>@wf&+%4~F=z%a&1iW`%QFQU+eIWXB@<2U<%3sTQohplG( zn_7G+MmLTw%roCcNvj~7tS`R%T6{5q5l0i@@fb(ntI&5Xz7*+4g!?Ul;wno$zAVL` zV?j6@@ft7LV-&ogy8{Z*Z7j}-+7POxy+#t4KC`Bb*k)t)#8F62!bF8 z!uiQ9ThCsqF5c8HKxWy0dcNgVx~X3Te%X5dVs+uBei`^>>)DIdUT)e2K@bE%5ClOG z1VIq46!PX67pnHI$|1ZF2%qUoUDv=({9qJT-&HwK!o5`(m-AK8`lGIEICAz_AFuYV z%3g^Fwk7S&TYqk5{_L81?Om0_6q%Nl_4@9juQLgPAPD~{AE}NKAi-&6v7i6|002ov JPDHLkV1iPFJk$UH diff --git a/icons/mob/simple_animal/mouse_white.dmi b/icons/mob/simple_animal/mouse_white.dmi index a555c025406bb72ea9a4f6d5d92d3c6554e9aec8..2117dde525161a103f4f2d82ef7cd11c6212420c 100644 GIT binary patch delta 1221 zcmV;$1Umbb3YrR#7Y?8Z0{{R3yb+fl0001TktI@pv9Yn9RbXiwE0-)mPft&2X=!?T zdXaWplarH%hK7JJFu=gTM|Oun00001bW%=J06^y0W&i*Hyn0kvbVOxyV{&P5bZKvH z004NLosmrrf-n$9*X=19*s2kgr5gh=EaVELW=7hiw4|*PZg0_zKS&I_`6lmmrftj) z`LQT}S#~Pu4Xu+#vpw6b)|7M-ya-{tp+umpg?|R;xyMjOov{icNU(jRfts5Zf8HxHeoH3G8g352qMkiMQ+h zc!?2DRf6kTrkylnmY3P%Q}24)jnT*tlKcRF00WLmL_t(|ob8(dQ{pfXg|nLjQlZwS zJ?~CYs`CGT<0WYk#7zQtwcO16lrqyzwlAAn+80p@000000Du!AI()l6h*^iX9}_9e z6o_Uso@-5WUKo8so|E@~Xp(3|MM3*Fslm-`$;`{;Dy^?5#ROEw67QS1^c*A#I$hp> zTR#B0jV981rNb+E6kQf9Bp@!zbjMzwmnaWX7ehQTP+e6lA7yuXxS{Kt8Q&e{pgW%3 z==~H51)`wO1ch2Gk|wU*k53Vsp$SE5GMAb`q!O>#A$t=qkc$6(Ukg`zp8x;=0002M ze?``088u$lb*is_FiE&0c z#DjsAh<~O3&i-1jpVpH7)t{cBvz1QbK5l}C6_0uLS;DA->VGF$h{!NQRa zV9A(t{PO-g`>XElFLxFl*O}al_`#K4K00000!1Uy9nRQbi~gO<@n^(HubVxE&tKPN+O zdGca)m;C>s=r>nSHvO<_4gdfE00000003}(bbgby{-&c--j&NNS$|U!T)CX}H!Yd( j%TV_{G5`PofPctes`n@P4KoAc00000NkvXXu0mjft58W< delta 1198 zcmV;f1X25%3Y7|w7Y=|30{{R3ySgFJ8!MMALG)XzMgRZ+0d!JMQvg8b*k%9#0JxE`6@SkTf-nq+&)ZWha8)BJ zM=u0oILIrInO3%BY-F1f-rk`H{{)Hg)?f2|O`FCnD-LDF@?%M_Xq_~g?b&X%rlgnP zMF`ssB?4t5{3AHeJ%%#sja3j)0@AusqU3COi({R9P)k7mf+lmQ>lF9DvI?=2x|znq z;(&?|V>?|W>3`D}mzHZIft?HtVT$p!c-!#HF%zDu1=oL>cGiqpQRVl)+yIw*d`i?4 zrBVO@1CU8XK~#90?VEv8qc9ML+1;ZCTSOAhyR&N1`u@*&$wFhfdce-X7(ETP&|>KZHVofb|(xNMex)u=Rf-MQo6pu)C-b z-r@k(XMcIG(Ccf_vV;aiflxR!U`)eZfY&IELg!&=)FTt$#ZlBdB*< z&7e@wS2!?1Vo+#zr{WPSz@JE~n7#sxy~C?tCK4qsps_*Aae80Yu-$M8h2rp*Fgf@> z8Vo}q6>w>wrr%4kx}%2jZV`!hZ*bGfdpqzg!RrWc|VTqY>Jepm6#7tT5#4?0!jE+*xHMOR@hKAexSMp;1@#~vg5x5&%v3Xq zEW{a`v%7eKium{YQn=Xb1mz#$eqF5Zzf!O{WYAP+_{y$1Vh}g zhxHj>lD+-)x_x~S>@Q$t*8d}0IFdjM#>C>YD0F@f9PF?bF%I_UP$JV8h}}k5pxA+%&QIX|*#v!{@1D92qjQeNO3EXd2&(-*4~7xnWXFI!JutnT%qT~QQ8Q4~c{ z6h%=Ke(SHUj&%^joQ}bKoYt2@12%svIbho+=E>`9;$D`NLd;kCd