From 2b113187dec1e87c23feed79fe0e2276570ce7c3 Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Tue, 3 May 2022 20:17:57 -0300 Subject: [PATCH] Makes Lizard animals REAL (#7889) --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 49 +++++++++++++++++- .../Textures/Mobs/Animals/lizard.rsi/dead.png | Bin 214 -> 902 bytes .../Mobs/Animals/lizard.rsi/lizard.png | Bin 361 -> 1399 bytes .../Mobs/Animals/lizard.rsi/meta.json | 2 +- .../Textures/Mobs/Animals/slug.rsi/dead.png | Bin 0 -> 214 bytes .../Textures/Mobs/Animals/slug.rsi/meta.json | 18 +++++++ .../Textures/Mobs/Animals/slug.rsi/slug.png | Bin 0 -> 361 bytes 7 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Mobs/Animals/slug.rsi/dead.png create mode 100644 Resources/Textures/Mobs/Animals/slug.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Animals/slug.rsi/slug.png diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6e394db345..d7db9e3140 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -808,7 +808,7 @@ name: lizard #Weh parent: SimpleMobBase id: MobLizard - description: I think it's lost. + description: A harmless dragon. components: - type: MovementSpeedModifier baseWalkSpeed : 2 @@ -849,11 +849,56 @@ interactSuccessSound: path: /Audio/Animals/lizard_happy.ogg - type: Bloodstream - bloodMaxVolume: 50 + bloodMaxVolume: 150 - type: Damageable damageContainer: Biological damageModifierSet: Scale +- type: entity + name: slug + parent: SimpleMobBase + id: MobSlug + description: And they called this a lizard? + components: + - type: MovementSpeedModifier + baseWalkSpeed : 2 + baseSprintSpeed : 3 + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: slug + sprite: Mobs/Animals/slug.rsi + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.2 + mass: 5 + mask: + - Impassable + - MobImpassable #Bullets?! + - SmallImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: slug + crit: dead + dead: dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: InteractionPopup + successChance: 0.3 + interactSuccessString: petting-success-generic + interactFailureString: petting-failure-generic + - type: Bloodstream + bloodMaxVolume: 50 + - type: entity name: frog parent: SimpleMobBase diff --git a/Resources/Textures/Mobs/Animals/lizard.rsi/dead.png b/Resources/Textures/Mobs/Animals/lizard.rsi/dead.png index 3026938567b6e736fc4421b3a5c254b1eb05f336..096cd4f84943883183be70e3a689ea9f565f025b 100644 GIT binary patch delta 880 zcmV-$1CRXH0fq;VBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iKcphn4t7v+ z$WWauh>AK&6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JW zDYS_3;J6>}?mh0_0p3Q1DTaR>P*hV-#bZJ?w<-i);YSF4n18{b$P6u!Ud+ICeBHyt z*SjdsazFRy=#}#Z13Uup9Mg1@c!PL))6_Wc6Ngzzl!?!Y$8@?N@gvtIhu=6CZT9la zu%1cH6Nia~Vh2kd%u2dKJVhLl6_xV6S%+oLTbz|jjkWH{Ul`1*D`~FN97Y^VNFWIT z5^5-;0uxbMRew?pq-a0p;vcg8NpeZ#Dua<@0aYjvZ9n)Q{O;B$OinmS!5Gl>Vp$&} zKwuYW)-CJ%*s_`@fbSW&QrrG&1DO3Jz24R$M?h#BxVUa>(jIWR0}MQAqAuE!kEXX! z0N&5&n{q(^Ezq;(^w!$P=>w3Vu9k0rgF|4nNZIQy?|<&@?Csw(t^R%hsf%*GN&q?` z00006VoOIv00000008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<^&K6 zH!u_1+!+7>02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00CV|L_t(o z!|jx>Pk+Ne6vw}}OtgkkLBa%+D+U3sO)xz<#eYFE3+_ZkT|tuY7tBmdfg6ToI3_S< zwh5~tdsLJn1Lw&jmED z)1;q3<2vMX8hw53!$p!HOk-{}aN=FFZwY8zCx5wkd^Cd5Zo+pe*gt#uQC3-@uc}uC z0I|Ic;1R+d!*lBp?g-IJ9llco0Q820K}>TCO&!O z?`ixl&E9t^h_3Dd02j|oIk_YVQ;9+avJ$cr0=9NVW*aj>Ax7!kCc}Jl5x4Z(f;*`$KYU?Wi0000ST5Czar90?=_@DSd@h5HPU5wZa#8)O8w zpvV>s!2qD7AWmg;fKBN6uj7A-JDmX{A|fIpB09Tlugq)b<+m~#Q`Z9k-meygb(=i+ zRPFA+gKMhr7QQqZ05Em^JVY6d;n~cCWglDq-y)Y(QCNrZ)-)_KIi!5tqq)qK(VHu- pCAZ6KmjU>$^Kg3k1V_cL@dK)|FFAvdctrpJ002ovPDHLkV1mQGQ@a2F diff --git a/Resources/Textures/Mobs/Animals/lizard.rsi/lizard.png b/Resources/Textures/Mobs/Animals/lizard.rsi/lizard.png index 213b0251464417d740bb85cdd72281a03b89cccf..25e4c3e5dbb81e758ba0935d86004a454f8d0e78 100644 GIT binary patch literal 1399 zcmV--1&I2IP)EX>4Tx04R}tkv&MmKpe$iQ>7{u1v`j1WT;LSq>4C76^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UmP&La) z#baVNw<-o+;YSdIh@w|wrk+SIX5cx#?&0I>U4&4rtTK|Hf* z>74h8L#!kz#OK5l23?T&k?XR{Z=8z`3p_JqWK#3QA!4!E!Ey()lA#h$6NeR5qkJLj zvch?bvs$UK);;+PgL!Qw&2^fih+_!}Bq2gZ4P{hdAwsK0iis5M$2|Najz38*nOtQs zax9<<6_Voz|AXJ%nuV#Tn-q)z-7mKNF$M&7fo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc zEqnwFYy%h9ZB5<-E_Z<8CtWfmNAlAY3I*W(jJ_!c4BY~KYi@6?eVjf38R}~J1~@nb z#*37_?(y!P&ffk#)9UXBa5QqJd2`7j000B7Nkl%hQf*dCqy3dYG17ZVsASkO%wFkwJ+sDtr7Lv!%9v{(xG zmh($Yq`kf8-1A-l7=~dOhG7_nVHk#C7=~dOhG7_n`JISm9@b1<(*G}Qd#SycuOYJ2 zG*g#)ZW{nFKE8!!>Kp_CsEI;&Z53wCI*24db-s$-AADL6{FLhBO%$WH1Hf&oFl*Mu zMwExF-7Tc@G1s-j%eR#%6b2uI$?@^+w+jMQ&!ch-56LuuXXj>e3s&0(;Mj9|y^%&L zAH(708=Pkca-BgCY2#)iJyWhy`2-Fx-|!iZPz_s8J|mS+V1KW_cDWTRE8E@s>1V$x z2soLm-ajhG@X(t80IbGvuAXFDvZvpELGl2=EM{=gya{cKrH$5Xq-83f0N_-C&uRk{ z1nZWkwwfRZ%!8c&k>kCPU87W1H6T8+%~C@kK;_Gc*z;?NcK057ZhNhjz&nH3{lQ9Q zF6(pvC>a9Pf{5gNf`Z`uTB0+aDY~KfC>R!=0mwL%eXUU(^`z6kss(}0cze3;vxYO$ zWm(j-sgw*cbwJ5*j#MqYA5C>o$q*=RJRy}&;Gs7`YZM1CjHFL%6i2-`LA8)TvG;`T z>!wSNR|f#D`<=1$oMj*ZcOWd}prFho+mEU0skBCMlnjA(_ue(#o5c(|W4Um3GHN?=-hPyHD$T1$-?^jvx(VPt zIMlWoS}76^IMIJ_a)*C^|KOoF0nGparb1hz_*#NM?ft8K6{USkhL{N;3Oe9DduSk} z&$PxXyV*#~=GEiEI%%dZ{cJ~iQb3VkNN2T*d4sNEWhEsi>EnKv3&BP6M$p84el1}& zhGKuOFZTEP;^5>CR%0kuo%Mw3Bx`pIbSgLEd@^Y*47S!K|B_40FW7#)N3 z`gY%*g+T%JK5QwX4{-@1Ghj zJ2L^zg8+kL7O#6Z*PZ>z&;9M!9-S%ETUGv63-@fc|LHyJ!;S?EvfH+*ygV7XHFR>- zmDp6x*-qd4ckflv{FAp@?d6{8XXoo!cRid`a_6nMeOLBLc9^LQVXyq#W`6Y1lM873 zdSzke{eKJBgq&nQ(i*c*aKe&!=hJ(1zI+WkUDJO)JykNjHrll6-;J2LH>Xd%)pK+9 zA^Cppm%?h>CY9W{cFOK~>d)|>)4!j+8oB+`lApaZN(%4a?Mwgce3V7A{J6zzPphNZ z+c)hh^*t-QC*jnZz1GX$uhXw|*XQN%OO8x#%d%vicyg|t(8o_dL2mPO^>bP0l+XkK D-ld{c diff --git a/Resources/Textures/Mobs/Animals/lizard.rsi/meta.json b/Resources/Textures/Mobs/Animals/lizard.rsi/meta.json index 9ffa4a0ded..77c7bebda9 100644 --- a/Resources/Textures/Mobs/Animals/lizard.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/lizard.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "copyright": "Made by Mithrandalf", "states": [ { "name": "lizard", diff --git a/Resources/Textures/Mobs/Animals/slug.rsi/dead.png b/Resources/Textures/Mobs/Animals/slug.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..3026938567b6e736fc4421b3a5c254b1eb05f336 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLAr*7pUfjsrY#_jT!C!_` zh3$jDy+f_Pc_s*MVpNq*VcE9egc#33h6PI${8CFAd|&)r|G2)>dM=|97+CGjS$`(` z`P1!2Qo+}m8SbqYYb~8^^CRT#yZz1Ct3HVBGm&C2DE({WBH8=!=9%VH`RIT5m8ORT zMznvtrekEeq~^}zooA+8oUOf1b^Gb;>5MM%=-ACqCoAfQ4Cseos9m?S8 L>gTe~DWM4f-{n?! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/slug.rsi/meta.json b/Resources/Textures/Mobs/Animals/slug.rsi/meta.json new file mode 100644 index 0000000000..103f08be90 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/slug.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "slug", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/slug.rsi/slug.png b/Resources/Textures/Mobs/Animals/slug.rsi/slug.png new file mode 100644 index 0000000000000000000000000000000000000000..213b0251464417d740bb85cdd72281a03b89cccf GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^MV_aSW-L^Y+%k+-3ujV;}p2 zPKH`DIB#&}-&fwybAi{Qs=4O?!`|W-VvT%JK5QwX4{-@1Ghj zJ2L^zg8+kL7O#6Z*PZ>z&;9M!9-S%ETUGv63-@fc|LHyJ!;S?EvfH+*ygV7XHFR>- zmDp6x*-qd4ckflv{FAp@?d6{8XXoo!cRid`a_6nMeOLBLc9^LQVXyq#W`6Y1lM873 zdSzke{eKJBgq&nQ(i*c*aKe&!=hJ(1zI+WkUDJO)JykNjHrll6-;J2LH>Xd%)pK+9 zA^Cppm%?h>CY9W{cFOK~>d)|>)4!j+8oB+`lApaZN(%4a?Mwgce3V7A{J6zzPphNZ z+c)hh^*t-QC*jnZz1GX$uhXw|*XQN%OO8x#%d%vicyg|t(8o_dL2mPO^>bP0l+XkK D-ld{c literal 0 HcmV?d00001