From 440cf202932712a7ab19775610c4a57c4b48a737 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 22 Sep 2024 19:34:07 -0400 Subject: [PATCH] Minor cleanup --- .../_NF/ghost/roles/ghost-role-component.ftl | 2 +- .../_NF/Catalog/Fills/Crates/npc.yml | 1 + .../_NF/Entities/Mobs/NPCs/pets.yml | 10 +- .../Structures/Storage/Crates/crates.yml | 8 +- .../Textures/_NF/Mobs/Pets/cat.rsi/meta.json | 168 ++---------------- .../Storage/Crates/woodcage.rsi/base.png | Bin 497 -> 484 bytes .../Storage/Crates/woodcage.rsi/meta.json | 2 +- .../Storage/Crates/woodcage.rsi/open.png | Bin 498 -> 501 bytes 8 files changed, 27 insertions(+), 164 deletions(-) diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index 8c2fed6e4c9..47bff5fc12d 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -9,7 +9,7 @@ ghost-role-information-clippy-name = Clippy ghost-role-information-clippy-description = The Station Representative's loyal worker, smells like cardboard and papers. ghost-role-information-clugg-name = Clugg -ghost-role-information-clugg-description = Ug! Me hungry for big rock! Where mammoth burger? +ghost-role-information-clugg-description = Ugg! Clugg love eat meat. Find new home off space rock, make big hunt. ghost-role-information-clarpy-name = Clarpy ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice. diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml index 949e75b2e65..10fd11a4815 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml @@ -83,6 +83,7 @@ - type: entity id: CrateWoodCageClugg parent: CrateWoodCage + suffix: Filled, Clugg components: - type: StorageFill contents: diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index da05b7e889d..75f92e152c2 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -19,7 +19,7 @@ - type: Loadout prototypes: [ MobClippyGear ] - type: RandomMetadata - nameSegments: [names_cat_clippy] # Its needed to fix the names since it was using the MobCatGhost list. + nameSegments: [names_cat_clippy] - type: AutoImplant implants: - MindShieldImplant @@ -71,7 +71,7 @@ - type: ReplacementAccent accent: pirateCat - type: RandomMetadata - nameSegments: [names_cat_clarpy] # Its needed to fix the names since it was using the MobCatGhost list. + nameSegments: [names_cat_clarpy] - type: AutoImplant implants: - FreelanceTrackingImplant @@ -112,7 +112,7 @@ - type: ReplacementAccent accent: nfsdCat - type: RandomMetadata - nameSegments: [names_cat_cappy] # Its needed to fix the names since it was using the MobCatGhost list. + nameSegments: [names_cat_cappy] - type: AutoImplant implants: - MindShieldImplant @@ -168,7 +168,7 @@ description: ghost-role-information-clugg-description rules: ghost-role-information-nonantagonist-rules - type: RandomMetadata - nameSegments: [names_cat_clugg] # Its needed to fix the names since it was using the MobCatGhost list. + nameSegments: [names_cat_clugg] - type: NpcFactionMember factions: - Cat @@ -200,7 +200,7 @@ - type: ReplacementAccent accent: mistakeCat - type: RandomMetadata - nameSegments: [names_cat_mistake] # Its needed to fix the names since it was using the MobCatGhost list. + nameSegments: [names_cat_mistake] - type: Vocal sounds: Male: CatMistake diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index a4893318126..613345b8f69 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -300,21 +300,17 @@ - type: entity parent: CrateLivestock id: CrateWoodCage - name: wood cage + name: wooden cage description: Looks like somebody made this in a cave, with a box of scraps. components: - type: EntityStorage - airtight: false + airtight: false # Keep this explicit in case the parent changes. - type: Sprite sprite: _NF/Structures/Storage/Crates/woodcage.rsi layers: - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] - - state: paper - sprite: Structures/Storage/Crates/labels.rsi - offset: "-0.25,0.625" - map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: _NF/Structures/Storage/Crates/woodcage.rsi state: base \ No newline at end of file diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index f740f84fe73..e8f1d8ea4ab 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -5,119 +5,38 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, Clarpy and Mistake edited by Dvir001, Cappy edited by ghostprince", + "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince", "states": [ { "name": "piratecat", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "nfsdcat", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "cavecat", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "mistakecat", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "piratecat_dead", - "delays": [ - [ - 1 - ] - ] + "name": "piratecat_dead" }, { - "name": "nfsdcat_dead", - "delays": [ - [ - 1 - ] - ] + "name": "nfsdcat_dead" }, { - "name": "mistakecat_dead", - "delays": [ - [ - 1 - ] - ] + "name": "mistakecat_dead" }, { - "name": "cat_deadcollar", - "delays": [ - [ - 1 - ] - ] + "name": "cat_deadcollar" }, { - "name": "cat_deadtag", - "delays": [ - [ - 1 - ] - ] + "name": "cat_deadtag" }, { "name": "piratecat_rest", @@ -153,80 +72,27 @@ ] }, { - "name": "cat_restcollar", - "delays": [ - [ - 1 - ] - ] + "name": "cat_restcollar" }, { - "name": "cat_resttag", - "delays": [ - [ - 1 - ] - ] + "name": "cat_resttag" }, { - "name": "piratecat_sit", - "delays": [ - [ - 1 - ] - ] + "name": "piratecat_sit" }, { - "name": "nfsdcat_sit", - "delays": [ - [ - 1 - ] - ] + "name": "nfsdcat_sit" }, { - "name": "mistakecat_sit", - "delays": [ - [ - 1 - ] - ] + "name": "mistakecat_sit" }, { "name": "catcollar", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "cattag", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/base.png index dc5cd91927329c9a27752260154b9ff35eade75c..fc087df2be139b11a77ef0d4df02ba58b30daa70 100644 GIT binary patch delta 459 zcmV;+0W|*c1LOmcBYy#_NklXp{jVt;O2Z>CAEW9z5tJF8wZ)cbD(?Q+Rg(z&~pZD_#x`7p8-* z?;g;s4J_RETo^_pIB@rCjkg^K^6{8Fe;hr7@3{Z~3k;$JAb-Nu03kI9lbEA|P!Q|X zKa&lyU{R-_ZJ*z-LxywdvOnIlpSG5x_7S!Np0xu^FWxj6q#pB!CDH!q^xtQVoQuT*rdc@m2uplERFd1T_Yrf@Go zKsBd!z-7g{0;a;20^kU{N=pM^rqt~*+5=TV)EK9xinZNQ!JMm8rxL(xI{iB)FZz?P zt-6j~@+Sdg^|}u1*k+ywSg?@MRnSH&fE9q&=1E?_`9yIKZtkC8(&8l()77949~r(9 z&~=vN1)Lu38VLuee#_E67SFsr<6p)?x6zxH_X~2t(SURAX7B(2002ovPDHLkV1gCI B)m8ui delta 472 zcmV;}0Vn?C1MvfpBYyw^b5ch_0Itp)=>Px$t4TybR9J=Wmp@O!Kp4g!Eu@e}Sx9uK z=zv=%M`e}O4`8C-&7>c|6<5>IMaB;PfoPPWlz>zuIGC&L-Fv+&Az&g;LdrdT`#wL) zwY>r>)&^x>G!ABq4!XL1AhQZoc+;`bYIm@2?oL4L8Jg! zI3K{o2T@`*JctZpQ})Y}4XI$}%b=2emW00`sUUnyd{1wAMUyFl&`6EVqCpqy0#J>j z$yBH@i-u666RriI+c>#TH(UwO4USC!R5Pz3p)3M=tK1$^RO64EE_izjVvB&$BZ8QE*^{(ej&!_+pj6Q`T%G2?6 zCS&G}h;P7OZaPxcO9Ao*%`4@tcx3?89dD@s%hDPk6M&xwdFMqmnJSM_J`Gh+GEY}2 zfR|t#Z+qR}C*gg!Padr6S1mKuUkZ>^t!klS<~~8Bs8L|1zdZ@p0RI9&nC87fgtMa> zuJ4{Onq!ek>9SFeS4m0$261w@vygB=zH$PHx8qZ1cj0fwOgHUUA@3U+w9xR~$&cv( O0000Hog9%B2N!<;iT(+H zhQGpuAHd?`s*X$yCNdZn{9q_0fmR@Oz&707+iR~@6O2zn=soYfcTeBT`{bGef%Dpd z+o)EkP%Jbby12f3PEoNmzcBzbsueUJx<1d3Rr#-%aRCTI)_?fq6Qk@W@0WK00PmLV zkG)@1-m5@RMFj!o_(PaPadG%a0>V(p=VQf!kd_5a>rEJ&7Cq0I&S6@bG+$W&1!p=Z zc|D_%d>E9Dz?sgWXEbuNAYoyUR$yp3%-EjHU{7X&^Y|E_uOz^08={|;dCDt71yD&r z3#syv1Z-p%p?~GFdK}LeH+BDcx$M*$Jd}Mv1yMSK5zsen=3mcf4Ci$K&#SB<6`-m< z3H<00d`m!FV@XWFZ(%hBBzZi75e-HT&W`rbYWI9@E4K~+cJVfGX%aR2n0xBwXh0aRZ3bJ;YCy7GO6MBlV=d1~P5 zrX$2wvkU$O{3!uaBN|I?GAfW65!q*hk%J@+N%pBGd@|RKlAGAh9C#N5fKTaL;C#td R#EJj_002ovPDHLkV1i#O*_;3X delta 472 zcmV;}0Vn?T1M&lqB!9U{L_t(oh3!|pPQp+W{;*&Lf;gDSfIkCnog9%B2NxfJL|?+k z@F`4q02UWlWn^M7k-@Ow4?`&lv;wIEw&C7;dfQv8E__MT-tU}q@7L3wlY3Jja9KNY z8`TPBiiKvohuepj6lF{E3j;u-T0yhj^Lc)(%74F%3qTOE!G8yz8D&5Cu)Gfd_^@n$ z>|IfLF9Sgt6$F@*Pr-@e;_#6KgrShn$Fc<>Ei;;Cg<+Nn8sDE9#sM5zo$z`(SbyPnY)ZnXk<->7p)1*ob| z0>AnRek34nV@XWFUtujkXhg%YgNu^`v^ssC+sSPL0G|3I#y2W|Rjc^BBp%HEtZtOt z)8jq0SBQY!!m?AgI(^)CUzs(93_L!+B`!b)L4cS3Tv0ZSqOQDOAu%v*T%Q}bx$6qH zfBy;B0@ebgjc6j-$*4fqh{!q{jvXY~kYq