From 090fa777dfcff43d80cbd146ff4c596df729eb5c Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 12 Jun 2023 10:14:46 -0400 Subject: [PATCH] added problems --- .../Entities/Mobs/NPCs/animals.yml | 2 +- .../Entities/Mobs/NPCs/pets.yml | 55 ++++++++++++---- .../shiro_inventory_template.yml | 62 +++++++++--------- .../Mobs/Pets/problems.rsi/cat.png | Bin 0 -> 2141 bytes .../Mobs/Pets/problems.rsi/cat_dead.png | Bin 0 -> 572 bytes .../Mobs/Pets/problems.rsi/meta.json | 37 +++++++++++ 6 files changed, 113 insertions(+), 43 deletions(-) create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 7852cefffd..363c8e7278 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -76,7 +76,7 @@ Alive: Base: shiro Critical: - Base: shiro + Base: shiro_dead Dead: Base: shiro_dead - type: Butcherable diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index b7ce64067c..f8a5eb476b 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -117,8 +117,8 @@ reagent: solutionName: chemicals reagent: ShirosDelight - unitsPerUpdate: 3.0 - accumulatorTime: 4.0 + unitsPerUpdate: 1.0 + accumulatorTime: 5.0 - type: SolutionContainerManager solutions: melee: @@ -128,11 +128,12 @@ - type: MeleeChemicalInjector solution: melee transferAmount: 2.0 - - type: AutoRegenReagent + - type: SolutionRegeneration solution: melee - unitsPerSecond: 0.5 - reagents: - - Desoxyephedrine + generated: + reagents: + - ReagentId: Desoxyephedrine + Quantity: 0.5 - type: MeleeWeapon animation: WeaponArcClaw attackRate: 2 @@ -168,6 +169,34 @@ - type: Loadout prototypes: [ ShirosVest ] +- type: entity + name: Problems + id: MobCatProblems + parent: MobCat + description: Defender of the medbay... from mice anyway. + components: + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/problems.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cat + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: cat + Critical: + Base: cat_dead + Dead: + Base: cat_dead + - type: Tag + tags: + - CannotSuicide + - type: Grammar + attributes: + gender: neuter + - type: entity name: Jack Parker id: MobMonkeyJackParker @@ -263,7 +292,7 @@ prototypes: [ JacksThings ] - type: entity - name: gorilla + name: Hughes parent: MobMonkey id: MobGorillaHughes description: Don't sign up for human testin bud. @@ -339,7 +368,7 @@ barks: - Grunt. - type: Loadout - prototypes: [] + prototypes: [ HughesThings ] - type: startingGear @@ -349,6 +378,10 @@ - type: startingGear id: JacksThings - equipment: - inhand: - right hand: BriefcaseBrownFilled + inhand: + right hand: BriefcaseBrownFilled + +- type: startingGear + id: HughesThings + inhand: + right hand: FoodBanana diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml index c4b5438c37..c362615a31 100644 --- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml @@ -1,36 +1,36 @@ - type: inventoryTemplate id: shiro slots: - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,1 - strippingWindowPos: 1,1 - displayName: Mask - whitelist: - tags: - - PetWearable + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable - - name: suitstorage - slotTexture: suit_storage - slotFlags: SUITSTORAGE - slotGroup: SecondHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 - displayName: Suit Storage - whitelist: - components: - - GasTank + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank - - name: belt - slotTexture: belt - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 3 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - whitelist: - tags: - - PetWearable + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + whitelist: + tags: + - PetWearable diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e3deeb62ffe9ecf78002f153a765cbf99e09e6 GIT binary patch literal 2141 zcmV-j2%`6iP)Px-7fD1xRCt{2n@wmNXBx-<^PyKWTG^5OA=h#?aWI&g6encqwq*0y^w3^* zA%{Y6=^>9!gV0mW{g!BrTimM~o9w*>ap6uT|TUrO8Md zYxM46^1ha=56_I{Y`e@4gq@jp{?EtzAz9B8z{khO$H%8_Xp0G|EhgwMMO*apP-1$r zp%aPeNgD150kECjgI{$py>LgUsdh8JTH!hYiRnrD^4L3d#@O{c|M;t0Nl)xd0`tdh z5@gqg(-i=~@K7f=rll(w9_j=Dygc>}^z4s_9~l?iYPTYOWL(e|6V$RS^!N85uN%-F zOws#uX=v#R4)#cRyk@!9b?sy>vp_eNuR&F06pCd4fKjj)Qb?_!>(_q(EDfDKueLP- z0FYa|MFF5AY;Uub)D4(svBv&lRS6;P!$=fBBMJhqB|-=Rb*@| zU)#5BaQ|OlLeCpmSy=-B^bfucLKKA53c90qDAg;|37!r?0Eku2xBT~h5>|6qN!`Fo z>IPEFxta-ai>CyT-U(#;G5`SmZ&?69wl4$HJK;snF}hwv>c_7D0Fqd)yI&}lVQfBe zrRi#)mP#diX_dYO02tOVP?`mTM-h_d?Loog_K#q&t!DtU{m-xdgrUQsntRD51Mxn> z&w`=j?>qLv)e4yT;sa!t{*1g{y007oE@&N4M0l@s}6RbSE z=vLA(ET~AQQnLymb>d(=f`jo$%{V7`eis0Mj<5nk0_X@Udy#QP=)kY|?`+S<`v^j6 zrS85H_LKlZ0yRIM6(O~PcppJFxBVfAU3bf#67au(9d@cB*UY?^&j5gjzXgoVCs36G zyE?d^7zGikQXjNY5CJpqO3Tv##{ZL4K{}D|k*F0&tUICj$ z8Jk5JgF`W-l4A0HndA0HndAD{mx_Oq`4b7E(lBD)B*uD!eE>Xox?OJ=*Yw8cbS|3bs>1NNGP z#PlS6>F>s>#6ynnq6bk785kHIzwsk9?h-YqS}KgPX-gylQfrEpt;Nf zy?W&=&1DumJ6^4k%Pdf@Nzfil(cIcCN{jbsW_6~13jp@=mm~?mcKzK8Bp_mA`5FLV z?3D=a-2B+H)}5OlW9${X*s-yE4J6?GOKcXCBuQY~0N7C)W0~pi?*U*pAjF?P=eWvp z^Ye3b@K6{=LFDy%M&IyxSLL$R`3p6(y`HHcq*jo6q+{&&Q;xN?2UE0v@O1#-eFfFs zD|IQYuD#!%bN)pq3!V^#2VdPYurr`mRF7pE-BA&QC>T5x#?8;qIo7&Am*(+=)m+{E zngrbcHUXeN3IMeyfcql{U|AF-AVF1RM53`> z&y2de<0mf(-_347)3!@ZEQ?lotAUpR+o7kBpuII%=SVwXT1*>&ZBwW(%QGLV>y(r#js>qNe!Onhp%bxWeRG7e8Q7(>}VGrYuT2qvyKXC>#LgpfRPv9+TM>O0Mpz8=^6#f8Xq_E z;#+MEo*^hF1X{dD=f3$A-F{QoTMWgKJI1e`j3S(tky?%I9fbevb1uD$dd&%T>+K0ZD^J^=m;YN|O0 T5`F5300000NkvXXu0mjf1|JSd literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..214e47b59a9cd8fde46b3e63492e77610d48aae0 GIT binary patch literal 572 zcmV-C0>k}@P)Px$_DMuRR9J=Wls&83U>Jt4r17hg0}g2&)c6ZjTn?0i|3M0tmQKYvVB5v6(y53U z#kE7*e<4WW42s9W)sIENK}F6{b5h<8lC<`ybdge;Yk30?dG7nUpEm&y4-b$3g;*>m z{+f6^9v9P3AH*Re^0~zmiG+|4gnSQ(#bToQ{>5HhI;VItnG{0o2EMpZna>xtLyr`{RaHL-5Cra%M#buJyNL@yU-%e$|>TrN{A77rT$s8*{&(=7vl*soVi*Rhs=9`pTB%ez>u