From 12f94b33c3537ce9442b513d84bfce7b40d88169 Mon Sep 17 00:00:00 2001 From: James Simonson Date: Thu, 21 Mar 2024 21:16:18 +0800 Subject: [PATCH] Rats eyes glow in dark + reorganize rat textures (#26300) * Split mice from rats and made rats eye glow + added red eyes to regal rats (Both king and buff) + normal rats - removed mouse-3 sprites from mice and moved it into a dedicated rat rsi +fixed admin smite wording (you turn players into mice, not rats) * minor formatting fix * removed version numbers float. * Typo fix + removed unneeded layer name --- .../Locale/en-US/administration/smites.ftl | 2 +- .../Entities/Mobs/NPCs/regalrat.yml | 26 ++++-- .../Mobs/Animals/buffrat.rsi/eyes.png | Bin 0 -> 124 bytes .../Mobs/Animals/buffrat.rsi/meta.json | 40 +++++---- .../Textures/Mobs/Animals/mouse.rsi/meta.json | 39 --------- .../Mobs/Animals/mouse.rsi/mouse-moving-3.png | Bin 1535 -> 0 bytes .../dead-3.png => rat.rsi/dead.png} | Bin .../Mobs/Animals/rat.rsi/eyes-moving.png | Bin 0 -> 168 bytes .../Textures/Mobs/Animals/rat.rsi/eyes.png | Bin 0 -> 123 bytes .../icon-3.png => rat.rsi/icon.png} | Bin .../Textures/Mobs/Animals/rat.rsi/meta.json | 80 ++++++++++++++++++ .../Mobs/Animals/rat.rsi/rat-moving.png | Bin 0 -> 1581 bytes .../mouse-3.png => rat.rsi/rat.png} | Bin .../splat-3.png => rat.rsi/splat.png} | Bin .../Mobs/Animals/regalrat.rsi/eyes.png | Bin 0 -> 125 bytes .../Mobs/Animals/regalrat.rsi/meta.json | 46 +++++----- 16 files changed, 147 insertions(+), 86 deletions(-) create mode 100644 Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png delete mode 100644 Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png rename Resources/Textures/Mobs/Animals/{mouse.rsi/dead-3.png => rat.rsi/dead.png} (100%) create mode 100644 Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png create mode 100644 Resources/Textures/Mobs/Animals/rat.rsi/eyes.png rename Resources/Textures/Mobs/Animals/{mouse.rsi/icon-3.png => rat.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Mobs/Animals/rat.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png rename Resources/Textures/Mobs/Animals/{mouse.rsi/mouse-3.png => rat.rsi/rat.png} (100%) rename Resources/Textures/Mobs/Animals/{mouse.rsi/splat-3.png => rat.rsi/splat.png} (100%) create mode 100644 Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl index fe8077a550..ae4e6f7271 100644 --- a/Resources/Locale/en-US/administration/smites.ftl +++ b/Resources/Locale/en-US/administration/smites.ftl @@ -44,7 +44,7 @@ admin-smite-reptilian-species-swap-description = It changes their species to Rep admin-smite-locker-stuff-description = Stuffs them in a (welded) locker. admin-smite-headstand-description = Vertically flips their sprite. admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma. -admin-smite-become-mouse-description = They become a rat. Ratatouille. +admin-smite-become-mouse-description = They become a mouse. Squeak! admin-smite-maid-description = Forcibly converts them into a janitorial cat maid. This is actual torture for some players, use it wisely. admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings. admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index a287558212..afcb2bac47 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -26,6 +26,9 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: regalrat + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: eyes + shader: unshaded - type: Physics bodyType: KinematicController - type: Fixtures @@ -77,6 +80,7 @@ states: Alive: Base: regalrat + BaseUnshaded: eyes Critical: Base: critical Dead: @@ -126,6 +130,9 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: regalrat + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"] + state: eyes + shader: unshaded - type: MobState - type: MobThresholds thresholds: @@ -180,17 +187,21 @@ - SimpleHostile - type: Sprite drawdepth: SmallMobs - sprite: Mobs/Animals/mouse.rsi + sprite: Mobs/Animals/rat.rsi layers: - map: ["enum.DamageStateVisualLayers.Base", "movement"] - state: mouse-3 + state: rat + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"] + state: eyes + shader: unshaded + - type: SpriteMovement movementLayers: movement: - state: mouse-moving-3 + state: rat-moving noMovementLayers: movement: - state: mouse-3 + state: rat - type: Physics bodyType: KinematicController - type: Fixtures @@ -243,11 +254,12 @@ - type: DamageStateVisuals states: Alive: - Base: mouse-3 + Base: rat + BaseUnshaded: eyes Critical: - Base: dead-3 + Base: dead Dead: - Base: splat-3 + Base: splat - type: Butcherable spawned: - id: FoodMeatRat diff --git a/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..27e2720a91d02115dc87cb7212e3d8b28aaa5513 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|%sgEjLn`LH zy|s{+fq{c%?g~=jw*gW{8qELxId!qrMHW$1SqN=Dh&bS?o1puwizoEp9t_lMH z)dKf}=)lCF8HVpEgfpDmV9WOd*M1o*yK9_*%-UVxDD27i%TnF+1GzOV%TF799`hi5 z8~L7-_T>{D`5@Iz<`ok?`MMtJn_4pLPfT}s5>qRJA(?Wo1*qBb$gJSq^z@gO1$leu zTJOo$wxz!42$93QjXQmVle+Ogp=&5?t@UFhWuQ}2w{U#tb<#7yQN-i%Oeu8;Vz@*i z!G}9Xc{Wt+of|HxUR=qAHm$O&9_--Mt+HaR+0&Jm8Czv>Q@y>}0%lQ>+w~i3ZtUYr z0z_^O(f8cU`(iKenHVniT*#ki2{;b}PvIz4S|dmn^F;1m2qZO4nz!GV*Mt?_xgS6ASDQ9J~xb`BEQnn zgSiNmC=C^H+?*@DjsdB#++|i`o3P(uurDtabZ7J;4v#u1GMI0ERrllxjKAbZ*2xHn znXT|_YZMMf@JPdFM-o>5XsE=O4?ROpMA)^F43Li`Wp6*%7V<RqjS&5pR};qOBs<1dGLV?w^Wn_^5Sv0B z2TJ+_g|2uM*o60z>x&)Iq^UH|b(aWqV&-ihi!MqfwP=t7VU%Zswv?L+AoeE)K8CFw zXh=rrny8^afl~g{!~e=qWPulKFp@gotQS*vi1HAVi3-0GPproy-7VX}eZG(~MX&sa zxNGlj7aIBK`yoqZjq)f9RPE{e6QIo=W^-B;#?qwmu`BL z=iyp3*a3&^WQ=lXdOFU-J|Aq0DbfxBi3<34yCWjEVbX|)7bvG;~J2R+?&^`n?3wVj2-Y$l3pi;@?FTb^f3(Jg{TN zD-WM##AEUNdq!}8rIx^CUJT`NpMH9EVEt?}%k}n|<>L!-v&wBCbd>y4S!PyI46b}B z*ehUjqqlfa14^6RLZB? zR7RX)F%aa3%Grg5k*`}b`40(`+K#5?g@RvIO`kK~sU*p~!zOfsz4p8w4+UGFY511; zZmFL`gMO~8Y2P}fGfY;G}w=#hyx)syTtO&zNvOSGWD zYG7kW%bcKd=~msc@ZXoO07;D8kew2t{5cNKpRqBlDZB5YoyzuQzD}47*+ErC;_{+l zSBr0^o%-lSvw!>D<}Mn~FMjs;=?*cy?*o-pPI&LQEovWXM4xWBD7A+BBt@#kXtjv6 z9L86fq(h?R>=ar}9;^@{vjEm-S6e$5M;*Z-db{@lCoFn*^~wsfpCNJexp1o9Nvk6! zNEce8?ZxAXoqCzTvXN{S`3s9Zs;VY^fe{TS>%Bo^7zH7oWLS>9!QN52<|$Ub;l7&# idOz*5tMuBIHKm2fuZ(!FoLh>g4Y)h|9ArBMr~Cy=8Qu^8 diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/dead.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png rename to Resources/Textures/Mobs/Animals/rat.rsi/dead.png diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png new file mode 100644 index 0000000000000000000000000000000000000000..34020dad686d82fda5eb1a08f0e72fb6d3d12559 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDaPU;cPEB*=VV?2IZ2)_jv*Cu z-rm{B%V5C4?D&4aN#Xq8Bj1V@AY{=a8pRMFOn&^y&&+YbB gzuvc(AFA$v0=tL4_{&)a#cM$#p00i_>zopr05$F@`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..716195bc43c5900cdc66a0d87deb35ce2e6a0603 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Og&v3Ln`LH zy|s{$fq~=jhQI$!B2<{%lYY4f17#ytFG&N6gFr*Q-hM`YCLrs;LblNN>_2NIW6D7i Mp00i_>zopr05p>zrvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/icon.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png rename to Resources/Textures/Mobs/Animals/rat.rsi/icon.png diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/meta.json b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json new file mode 100644 index 0000000000..be50d5e880 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 eyes added by jamessimo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "rat", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "rat-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "eyes-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "dead" + }, + { + "name": "splat" + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c1d6d936f04a3f4ffb859caa834f86c3834d77 GIT binary patch literal 1581 zcmV+|2GaS7P)Px)=Sf6CRCt{2-9Km>R~!fMuSIb~FkBRMaEl^~!vsP@Vp|*td8ns=2{EKYJro)Y zF#(s*p`Jpz#3fS}6Cz?72pKwbsiDT0WXjSsAXLSnSwcCii-#_ba>NPLgI)&tU38LV z-^uq*|GpnEMmp)f@7_J#AHnYlAR;0nA|fIpqPCPy#YH+57k-yD@<}kwqA;XWaWOhN zDj$lc`OUuCWk-%20q~b=*?v5|NSd551OTi(&egqdzhyyb=lqPJ3jlbMGnM40Q*oi| zIsib^G+0&vsEb}r5JRbojCk*lP4>R(isP2UQmIbAq^D~An zZeN=R09?I!OQ;wGyE{|FV#fi%+1XMvJ0I{k0OZD>Oq{^>`}eTlZ8;+z0PJ^L_~Nq| z296%ZZYKr06WTo=fRlgw+Pu<1kWN8tZM{Y;cHA`xs*ea>cRt|b6d*g{-s)Pz*IYh7 ziR+8^l^ljUCI9NpTgpxYQq8r1qfjXL+W7zw@%qBG$GN`ii}$g<{sI7yy|?1}zrOy$ z)%p45tgoxlZpg3Q`9Ze}h#%A5f&o5_1 z>f&6WpN3w~-){f_{*MBlj{rbr9|W?4l=eGfg#1Nv<0j#gTz>S&jP$(2!7bJHU=7p+_XMW{2vsBuKX`0R; zu&g2qg#t>YZQs`)zFsUp0g1$rbJZy~-m;2KHGuj4oj-R*tUh|)C%+poO%qS^n|({O z)8fi6zo{Dlz{gIIw;TWviyaSb<9j{7)}4iU@%>M?n$Goo3b-_40I1w+%D<_hQ_l0M zT^cbkHFV0AU)`=&O z3A#SL)AGBGulWH~)Teh+emC;mNvi78J0;(XFy<%-I^XjVKvjKur{o``x`h0jA8#m` zqd-NzuTy}E`t(l9-%E8p;K{@ZytG~+IXsBWJ6*{f0YT?C)xaR@)7w42QJtUc__Jrf zbe`Mz_di7X|A(d>gQjT>tA^Vt-*;tD(Dmt^mJfU^5wGri07woGI-Q@rw*pPmkW9ww zW)o?reBT40*Q74a^;K8k)XooJS;e~d*tU(i%NGDtE?6JlU2J*~sLpS?I8=_bYGGFB zhMk{Z&Wfl1nE3UN-%&e3gk=?7?U7~Mavp&o+M_DJsfJ|?U6ji^&~@E)OBRXrhgPB6 zs{D+hi`ql4+yRnpzfpE45_Eo36GdJcF|b>QE_7XY!p@&N6Uw)6jq;afr^S<;sWkgZ z&g?6fcbxAeOw&Xp(vMPU8vr0n$5mYnw>rPhorU?9e)Za_{B$ZVmS(5-%+45k!(~Bc z@0FoC8-Tk$z11bkt=+^wEDub$pQ6HZ%bdek$ z#7pZHP9{#ca>FV`>(+cvZ{Dj$J&gMJ>PlGKwqe_EP~Q0z$>BlgHS*`&_sTfzZ}@g{ zzSryn%flP(eAV^w)f+F@rD?}p8xK?lpvoHjPR*|^D{th$0nm#2_>7^8hj$m9jJeAf z8vb0m%&6^z!+iRBDc^GgTTve`Hz=8m1AuG&w*AI6N02<-d^`0u(x>%6O2&F2-}6PF zTw%u0MeW24)s3k952ij|4xDm%$C(|hkxH93ahPAy?#2A3CyA=9PnT5Hr>9eKA%CV_ zl9NQpcBrh0@7DaLZUg0p-|!s5{_&PEke&Ufv6Rb2 OkbtMFpUXO@geCyIb|SX` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json index 5c80471313..f3ed84b963 100644 --- a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json @@ -1,24 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh", - "states": [ - { - "name": "critical" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "dead" - }, - { - "name": "icon" - }, - { - "name": "regalrat", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh + eyes added by jamessimo", + "states": [ + { + "name": "critical" + }, + { + "name": "dead" + }, + { + "name": "icon" + }, + { + "name": "regalrat", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + } + ] } -- 2.51.2