From 7ce40c1108dee1cf6870e0407d05eb5deb525520 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 19 May 2023 11:37:47 -0400 Subject: [PATCH 01/27] baby fox! --- .../Entities/Mobs/NPCs/animals.yml | 31 +++++++++++++++ .../Mobs/Pets/fox.rsi/baby_fox.png | Bin 0 -> 1076 bytes .../Mobs/Pets/fox.rsi/baby_fox_dead.png | Bin 0 -> 449 bytes .../Mobs/Pets/fox.rsi/meta.json | 37 ++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox_dead.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml new file mode 100644 index 0000000000..d07e9f152c --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -0,0 +1,31 @@ +- type: entity + name: baby fox + parent: MobFox + id: MobFoxBaby + description: A little fox! Aww... + components: + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/fox.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: baby_fox + - type: Appearance + - type: Inventory + speciesId: baby_fox + templateId: pet + - type: DamageStateVisuals + states: + Alive: + Base: baby_fox + Critical: + Base: baby_fox_dead + Dead: + Base: baby_fox_dead + - type: Grammar + attributes: + gender: epicene diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png new file mode 100644 index 0000000000000000000000000000000000000000..039e5a44ae07066c2a886235c9b5dc621bbc3745 GIT binary patch literal 1076 zcmV-41k3x0P)Px&?ny*JRCt{2nm=gUcofIKDmMr_mr(j6e}w2(D+mJR(hS$d*uBv`?nssn9^AP@ zhnAAPP`clCa2^8f(t}bA2j%=TovzThOF+mS523h_427g<%CCd`Q|!opq@QJ{!}~yR zBw6p@@99a_djLTY1VIo4K@bE%5ClOGN#LBLz;pp1`n*j2ob&k_P++=nwzmWTINMud z-a#lZUEDMm1?L<$%|&JXKTKo95?h8_&50j#%hQON3Zq^T)3~9joa9z>!dTyc^~e9{ zJh&cx`tAYN_r5C0Os#*j6x;8&TdDP@3LWPh<#HKkyZeA?qWQZA>&_iCn@zwpaprlz zo}EVIbSzvu|NrDzNyJo_0AmczW)qCDX~d|b=yX4+0#GiO0RY`@R|6nS(*$D-x~{|X zJlM89^YjM*zt+%Duf&R;Uu$UCE2olmMa2N4UJ>To#|VM|x~?M#0+??f!>#7#awjnA z6=4*2AnSm!S%OjA=@rCuCY?k1+TgsP%QUK0&_u;z- z(Eq#(0MK95lqzs0^a`QhZiU4;CCVA_>py2eor_E@)|8hu+ z(p|u|ZLPp`;kR3nL6`A3e6bkX57QT6r3@%AU9hW*@M{fCraim5IJe&fQa^ymhWqaq zF6B1~K@bE%5ClOG1VIo4K@jKt`Yd|(QqHX2_htSbzrb|yy0`)R?+;pk0AyP&DHqRm zwztG@?+)~y&~LdPAsw6%phbMP1zfiO$zJzN3?$V0-*N} zACogduDlFh>E9)Ep8OQb=<7pdWpiRdob!pz$EZ8g>l-4^fcq~20G4Ip@bEB^zO}VA z(dl%;jlb><%ENgeM&Z{QTGC4{kwMYQ7I(&f@#Hw>yytlU!j^hcqd4bSU0oFbV47w; z2>pW*L-60d0+1|ICe{GAniGk8Z_=$7Am<6Vb+c%bnMswV;EVzARdE`Lkuw$HaNI#@s7tf2$2gD+ja_H!LqIcH` u{mF8CZ`4Z5XZBedLsxn8Y_mh2Px$dr3q=R9J=Wlrc}jKp2LfCJsbQ9B71V8aF8+aRCS8Mjho3I5;r5xEjJw@K4}C z*ch3NIl|;3E+&oLu||V~2|9WXwFCkM17R?^XS=)Rd)}|TexT84G#ZUYqxmmn&4kLD z2_>bRIy>6iQCTyg)*fP>XxR`OtH+8*N{Mw{Rsi3%djRtJys>nE`r#0(cudgisG!oG zD0FaFgQQ8&>nMPr(l)H?va)jfkTk)z>G%6nHI1pA8C|%pi|2XDzPW_YK_nVIV--u` ze%gUoAAsQLG2Guuh3jsMT;prXw=e(@%559!r(wZg$%wQwxsJ}$4nemCFjF2IAiC+J z&Ler$#e15W)X*YKcG@DH$ r0A3m{AA`5`kJ?#CDUnjLu37&BpJ1F Date: Fri, 19 May 2023 12:23:59 -0400 Subject: [PATCH 02/27] Added McG --- .../Entities/Mobs/NPCs/pets.yml | 13 ++++++++++++ .../Mobs/Pets/mc.rsi/image.png | Bin 0 -> 6018 bytes .../Mobs/Pets/mc.rsi/mcgriff.png | Bin 0 -> 994 bytes .../Mobs/Pets/mc.rsi/mcgriff_dead.png | Bin 0 -> 379 bytes .../Mobs/Pets/mc.rsi/meta.json | 20 ++++++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 6591b441e3..9f9161a166 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -68,3 +68,16 @@ attributes: proper: true gender: male + +- type: entity + name: McG + parent: MobMcGriff + id: MobMcGriffnt + description: This dog can tell something smells + components: + - type: Sprite + drawdepth: Mobs + sprite: SpaceStation14/Mobs/Pets/mcgriff.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: mcgriff diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png new file mode 100644 index 0000000000000000000000000000000000000000..d20fbf9940ca1399ec148031f1af1380a1f56de6 GIT binary patch literal 6018 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 QK>z>%07*qoM6N<$g5W^AI{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..173a378f6f771646b5849842dce96138e6838a5d GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4R9J=Wl`%`hKoo#KCBqe$CMc3kZjcCpf;hT3R0P36?CPk0K%5=K!NEZ& z{SkI`F%TD>bP+6daxd!XA_*Ee2MtsllD1b|?wf9T_rCYIdk-uYi^XEGSpJy_lb3bd z4V|ACw$4i3J!vwza3xh)A1Kb40Dx0*d3%gXS8rZGc!S4`nlz4MeAUvzl|#jk+yP&; zG<>%opepOX9^=>r0E8=tYQHgoy!w8jvRyDE&{utyDx8Xoa3!@cD3mbz3$j$<2oFbi z>>ge-J2PD-*fEAJcn!=I;K% z=*a&=x82aSFwmq002ovPDHLkV1lJaq#ytQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json new file mode 100644 index 0000000000..55282bb105 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/0348b921936c4736e0a9df337c8a64a69c617d13/icons/mob/pets.dmi modified by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "mcgriff", + "directions": 4 + }, + + { + "name": "mcgriff_dead", + "directions": 1 + } + ] +} From 72d0b33b105aedca187cfa5ede3fbe721d99a98e Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 19 May 2023 12:24:27 -0400 Subject: [PATCH 03/27] typo --- .../Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 9f9161a166..9ad4f9dd44 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -77,7 +77,7 @@ components: - type: Sprite drawdepth: Mobs - sprite: SpaceStation14/Mobs/Pets/mcgriff.rsi + sprite: SpaceStation14/Mobs/Pets/mc.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mcgriff From 121a8ad75ed7e39e92ff3270c07dae9c8633d03a Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 19 May 2023 15:34:17 -0400 Subject: [PATCH 04/27] wrong path --- .../Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 9ad4f9dd44..513117921b 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -77,7 +77,7 @@ components: - type: Sprite drawdepth: Mobs - sprite: SpaceStation14/Mobs/Pets/mc.rsi + sprite: SimpleStation14/Mobs/Pets/mc.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mcgriff From d6330df518e08dd06baf2a7ff8f6a9340feddca6 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 22 May 2023 10:13:06 -0400 Subject: [PATCH 05/27] jack pakrer and shiro added along with baby fox metadata corrected --- .../Entities/Mobs/NPCs/pets.yml | 231 ++++++++++++++++++ .../Mobs/Pets/fox.rsi/meta.json | 2 +- .../Mobs/Pets/jackparker.rsi/dead.png | Bin 0 -> 627 bytes .../Mobs/Pets/jackparker.rsi/meta.json | 18 ++ .../Mobs/Pets/jackparker.rsi/monkey.png | Bin 0 -> 1497 bytes .../Mobs/Pets/shiro.rsi/meta.json | 20 ++ .../Mobs/Pets/shiro.rsi/shiro.png | Bin 0 -> 1439 bytes .../Mobs/Pets/shiro.rsi/shiro_dead.png | Bin 0 -> 500 bytes 8 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro_dead.png diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 513117921b..7544539903 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -81,3 +81,234 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mcgriff + +- type: entity + name: Shiro + parent: SimpleMobBase + id: MobShiro + description: Huh, so this is what Shiro really looks like. + components: + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/pets/shiro.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: shiro + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.30 + density: 50 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: Inventory + speciesId: fox + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: shiro + Critical: + Base: shiro + Dead: + Base: shiro_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: InteractionPopup + successChance: 1.0 + interactSuccessString: petting-success-soft-floofy + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg + - type: Grammar + attributes: + proper: true + gender: female + - type: Damageable + damageContainer: Biological + damageModifierSet: Slime + - type: Bloodstream + bloodReagent: Slime + bloodlossDamage: + types: + Bloodloss: + 1 + bloodlossHealDamage: + types: + Bloodloss: + -0.25 + - type: Barotrauma + damage: + types: + Blunt: 0.45 + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaled: true + damage: + types: + Heat: 2 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "slime-hurt-by-water-popup" ] + probability: 0.25 + - type: DraconicBloodstream + reagent: + solutionName: chemicals + reagent: ShirosDelight + unitsPerUpdate: 0.30 + accumulatorTime: 0.4 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: Desoxyephedrine + Quantity: 10 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 2.0 + - type: AutoRegenReagent + solution: melee + unitsPerSecond: 0.25 + reagents: + - Desoxyephedrine + - type: MeleeWeapon + animation: WeaponArcBite + soundHit: + path: /Audio/Effects/bite.ogg + damage: + types: + Slash: 2 + Piercing: 3 + - type: Faction + factions: + - Pet + - type: RandomBark + barkMultiplier: 0.5 + barks: + - Shiro! + - Shiro. + - Wah! + - Wah. + - Shiro? + chatlog: True + - type: MovementSpeedModifier + baseWalkSpeed : 8.5 + baseSprintSpeed : 4.25 + - type: Tag + tags: + - CannotSuicide + +- type: entity + name: Jack Parker + id: MobMonkeyJackParker + parent: SimpleMobBase + description: Hasn't lost a case in his entire career. + startingGear: jackparkerstuff + components: + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-primate + - type: Inventory + templateId: monkey + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 80 + mask: + - MobMask + layer: + - MobLayer + - type: Strippable + - type: Stripping + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: monkey + sprite: SimpleStation14/Mobs/pets/jackparker.rsi + - type: Hands + - type: Speech + speechSounds: Monkey + - type: Body + prototype: Primate + requiredLegs: 1 + - type: DamageStateVisuals + states: + Alive: + Base: monkey + Critical: + Base: dead + Dead: + Base: dead + - type: Appearance + - type: FireVisuals + sprite: Mobs/Effects/onfire.rsi + normalState: Monkey_burning + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 3 + - type: Puller + - type: CanHostGuardian + - type: DiseaseCarrier + - type: CombatMode + canDisarm: true + + - type: MeleeWeapon + hidden: true + soundHit: + collection: Punch + angle: 30 + animation: WeaponArcFist + damage: + types: + Blunt: 5 + - type: RandomBark + barkMultiplier: 0.65 + barks: + - Oooook. + - Aaaaaaah. + - Ook ah. + - Ook. + - type: Grammar + attributes: + proper: true + gender: male + - type: Tag + tags: + - CannotSuicide + +- type: startingGear + id: jackparkerstuff + equipment: + hands: BriefcaseBrownFilled diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json index d9aea5e8f4..d74e9747ec 100644 --- a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", "states": [ { "name": "baby_fox", diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..21ee2e53bc3d7c552d1d8751899ebb026feca61d GIT binary patch literal 627 zcmV-(0*w8MP)Px%ElET{R9J=Wl`)9ZP#DL55fuVADLiqiSsbJE6|zYwob-l*MG$m2=#sHF2_iZ; zRL(`{Z3bL!IS}LyI~s$~65z~>Jx;6Vo!%y@6< z3TT7*zOQs8&VHSuHXd``xfjP>15W%eRNg6mc_(Qm4Q)O^$~{ zya0ah2UKpu&I^y-4$K-5&V31ItDwib9q7N4+Qpl)0D%Ai N002ovPDHLkV1g6`93%h$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json new file mode 100644 index 0000000000..50a63d9290 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "dead" + }, + { + "name": "monkey", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..9a145791b8d9d3f9dd245a23ee87df54fdf26750 GIT binary patch literal 1497 zcmV;~1t$85P)Px)lSxEDRCt{2T1{vhM-={40`-E0z>detL0M!-$-yioYpPogCJpK#&{9(9C5Hq= zPIWH@H=z(P#6FeECrgJOa!A2YT=1cyHuiao_Of6KJy`e$JYGRzAuz=uOb_c>kEE5f zyWW*cyB`S8&d$#F-rJcsYu*Q>NRc8%ivKS%Q6AC(-rZ+Loa?IjuZ0=Rn-xAcSI48W z&&>vSvspoAuAW#RlHdZ6_84LP*c?*Nw3JfpdUxo-qahm@M7J`1{Lv z^Wj|_uC0JEhEk~n!!URfK_G;1P19i8HV7d-_eH;DS)up?p8^7wWkFTdjy_dYVOdt# zsY1iHZBR;K+jgM-AP5uy@%DqDR4N5ps$n4Bz6{&8y`KzC(?anF-U4FjUv^AX*tQMF zaR!bVcHa+y_KF-)P1B$#3iu~qUQF`qPhgC7Y=b!SK=&KX=kq;dD5V|OLHPp>s+PgO z`pi9dCckar2AKo^Joxl;Z2s~y0HFPsgVUt~0AO{)#6ly!BT?p`{_Y5hq9B*cfl`Wm zJ`cxnz!;0fA1Vp1ZkWhsvl!1!VCL3s?CtGg=GJYD=O&;i3RX9g{UQ|eGsZwEMX^`} zrPSMcQTV+aP%U@Bd?ahd9%Xr&4AyVaoc{XjU;X8=C76!$%bg<@pEjgSCE<0 z0gSFZE@OMY=9cF#fzYKf59gWyVL-E{`)YUMh7Ry%P4D2oj6Nas3NV2T8sKAX6P2qJ zhDc7=>n2`}N*@69*62s64~UyT(iS)(1aCDBn@?V2voMPzLPmNFnn31=5NsA^vH9dR z-f9|-d`jj)5IO*&QtUVm4%b$I`_J%jc{=ur@Gu)5E>C;n499UISEVB-!6YleVR0E- zLIog&|{^Dx@@#+Ew+3?Ye zAKV;t4p|?Nm`3RN9UG@h1)MGwaD04>cV`Um&KPD7Elf@1006wEC$#P;dDZgwt&zHykTb;&rM)=cNgQi37jq!64eN-ZkRY-Ds*tZVQ0u@vypi_ zz61x=(J!t|e$saLT(MY0tJU)Uu5Q?gmZk)Mt3`UaPul(Kf~iUPph3W}n5qJ_Af^Ml|Q+`&S400000NkvXXu0mjfPK3rs literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json new file mode 100644 index 0000000000..fd7fda205f --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "shiro", + "directions": 4 + }, + + { + "name": "shiro_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..6b1c5447746a2604cbd825b98668aa71cc13678e GIT binary patch literal 1439 zcmV;Q1z`G#P)Px)SxH1eRCt{2nz3%;Oc2Nad=~+(5+I0NgA}D$kvfG7-0&DzT;-?W0rn-5nl2A; zO^TSpO=@l{B3F)Vb7!SUgp%_WVaVdxz+w~W`@a1(h_yXCGv1wD?+l>PXfzs)Mx)Va zH2*^?WeDM%C+W7~a9E1$eak;6Du8pIeEat8D&ta8hLZc1U&sNZoacETt}T=hthlb5 z2qBnhnuXquX_}SMXq3ougCMZl?Y5Kde^&~}0D_cqT{jsHhn1U~n^NSOrdb&b2H>10 zj4?s|ltm#2$ZrF9cLL`;84L!61JqzJ0LjZTo<>~}{!zJ^bDq$WG#m~qLI_4mjK^bp zJRaMmWLYDCIzpq-h{@wmPfv%9M#EnyaaeYcA{J9%#i@+3IRL!8yi|Yx{=JhE zww?l<^W@^vi8SjJRH}`<7*`yqPkhbCx`EcD-Kr zo6V-*>2%^|v+0vwjYcC@m8~2E0l;w_F`La!rqk)+Y&JV_97o94?7iJREj9on`Qo71{@{udgfrvy5Jhgu`_EI+RAhuV25GZ=%!b z#PaX!>#IRZmH8=5@}|=%9v>f#$Hzw_@4m@oqP+4bDatud&d$zoaBwgeLR6`pF*cvi z=hf+Sy4@k-5 z?7RQmWoDOc=)bXljYgxSySrOC*Qa8HvhscVB+GaJxVyWvJkJATOvtB4AEv-$GO?p5 zLKudu*Xu2ZP#MJtpG8_%*{0*;JgtWuuH@2QmbB3u<}D*W_n*B?tnGmcYDwHm1inc~Avflk+Hh@3D>U zYaJkOh_)FCK@eC$5PZ)wg3{NU`paUW!}o3VkT*cPx$u1Q2eR9J=WmA#ScAQXjyk7x_P zZeSB_@P;*#Ev)hGMo(YjF&D(SzW^&MD=RB2|2vzKv29y;?+2ySX20J*U4Ml?C8PI# zAfn*CA9AtNb!+XApR4P-=vdBZW81c07XSbe1$=V`#!yvN0D#No zLTT?3A$J12_rq?tJ5D$DeQ&C&`T+3GId`Rx#u#-H@=V0YXssO>V~|qb33!DRxsr&t z{7<@EYi$4^{k}>{ONo(ylso6#QEP3SbKi;t=iD*IFfGzq0d-w(x~?qkdJy zvnb5wCaET(5JI5bMnnPl=V87sguwZHHhB%j7+9TuId7)9PTnh}mUY1+mh^It5aMpFG_Dtacq!J}(ICrbL5fiRhCGeH zcac&aQ!6sYki8+lCt#WeDdmxf!lMcM;{udYo2F^ZRK#|>bwUVCTk^+i0JuGBhr{8^ q%h41ay|j#;O}BeSTbS&0000 Date: Mon, 22 May 2023 13:06:10 -0400 Subject: [PATCH 06/27] slimy head petting heeh --- .../interaction-popup-component.ftl | 1 + .../Entities/Mobs/NPCs/pets.yml | 27 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index 1ca909f8b6..ae72d75565 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -24,6 +24,7 @@ petting-success-holo = You pet {THE($target)} on {POSS-ADJ($target)} metallic sp petting-success-dragon = Dodging teeth, claws, and flames, you pet {THE($target)} on {POSS-ADJ($target)} massive scaled head. petting-success-hamster = You pet {THE($target)} on {POSS-ADJ($target)} fluffy little head. petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)} mystical head. +petting-success-slime = You pet {THE($target)} on {POSS-ADJ($target)} slimy little head. petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you. diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 7544539903..7e3de42502 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -99,7 +99,7 @@ fixtures: - shape: !type:PhysShapeCircle - radius: 0.30 + radius: 0.35 density: 50 mask: - MobMask @@ -128,7 +128,7 @@ amount: 3 - type: InteractionPopup successChance: 1.0 - interactSuccessString: petting-success-soft-floofy + interactSuccessString: petting-success-slime interactFailureString: petting-failure-generic interactSuccessSound: path: /Audio/Animals/fox_squeak.ogg @@ -179,30 +179,32 @@ reagent: solutionName: chemicals reagent: ShirosDelight - unitsPerUpdate: 0.30 + unitsPerUpdate: 0.3 accumulatorTime: 0.4 - type: SolutionContainerManager solutions: melee: reagents: - ReagentId: Desoxyephedrine - Quantity: 10 + Quantity: 40 - type: MeleeChemicalInjector solution: melee transferAmount: 2.0 - type: AutoRegenReagent solution: melee - unitsPerSecond: 0.25 + unitsPerSecond: 0.5 reagents: - Desoxyephedrine - type: MeleeWeapon - animation: WeaponArcBite + animation: WeaponArcClaw + attackRate: 2 soundHit: - path: /Audio/Effects/bite.ogg + path: /Audio/weapons/punch3.ogg damage: types: + Blunt: 1 Slash: 2 - Piercing: 3 + Piercing: 1 - type: Faction factions: - Pet @@ -216,11 +218,16 @@ - Shiro? chatlog: True - type: MovementSpeedModifier - baseWalkSpeed : 8.5 - baseSprintSpeed : 4.25 + baseWalkSpeed : 8.0 + baseSprintSpeed : 4.0 - type: Tag tags: - CannotSuicide + - type: GhostTakeoverAvailable + makeSentient: true + whitelistRequired: true + name: Shiro + description: Be Shiro! Be fast! Always be fast! - type: entity name: Jack Parker From 9c9260ad281cf02504e64c4ea797c50511d482dc Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 22 May 2023 13:28:44 -0400 Subject: [PATCH 07/27] monkey --- Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 7e3de42502..ad28865c2d 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -307,6 +307,7 @@ - Aaaaaaah. - Ook ah. - Ook. + - Ook ook! - type: Grammar attributes: proper: true From 65b9da70ada825cd40fab3a54ced67fe80135aff Mon Sep 17 00:00:00 2001 From: Cabbage Date: Tue, 23 May 2023 07:44:31 -0400 Subject: [PATCH 08/27] slimeballs for shiro --- .../Entities/Consumable/Food/meat.yml | 25 +++++++++++++++++++ .../Entities/Mobs/NPCs/pets.yml | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml diff --git a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml new file mode 100644 index 0000000000..2adcfdf70d --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml @@ -0,0 +1,25 @@ +- type: entity + name: dissociative slimeball + parent: FoodShiroSlime + id: FoodMeat + description: A perfectly round blob of Shiro's slime. + components: + - type: FlavorProfile + flavors: + - slimy + - type: Sprite + sprite: SimpleStation14/Objects/Consumable/Food/shiro.rsi + netsync: false + state: slime + - type: Tag + tags: + - Raw + - type: Sprite + state: plain + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: ShirosDelight + Quantity: 30 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index ad28865c2d..56f4535ef8 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -124,7 +124,7 @@ Base: shiro_dead - type: Butcherable spawned: - - id: FoodMeat + - id: FoodShiroSlime amount: 3 - type: InteractionPopup successChance: 1.0 @@ -203,7 +203,7 @@ damage: types: Blunt: 1 - Slash: 2 + Slash: 1 Piercing: 1 - type: Faction factions: From f27bbd552765191a10f8aca8bbf02a0de10517d0 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Tue, 23 May 2023 08:07:15 -0400 Subject: [PATCH 09/27] slime textures --- .../Entities/Consumable/Food/meat.yml | 2 +- .../Objects/Consumable/Food/shiro.rsi/meta.json | 14 ++++++++++++++ .../Objects/Consumable/Food/shiro.rsi/shiro.png | Bin 0 -> 376 bytes 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png diff --git a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml index 2adcfdf70d..d53a6b2b01 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml @@ -10,7 +10,7 @@ - type: Sprite sprite: SimpleStation14/Objects/Consumable/Food/shiro.rsi netsync: false - state: slime + state: shiro - type: Tag tags: - Raw diff --git a/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json new file mode 100644 index 0000000000..7291a9ba2d --- /dev/null +++ b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shiro" + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..ded053a1b1fe70626e0b8700e31d1e6989d1ca82 GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R9J=WmAj3EFcd}aY_MAZ#3ptRN8lecsj&Y0|*u)z> z^^L1Rn=fV!@K0if^upSK85aMyK@^t!e7enlip zz!($L;HGH?0GQ`_y=JYw=SZ*xw&AG&K_WR4ECFLolu|x~5Qq0ukz9!{jz9Xj(*0HK8NGYGT z-1fz!aHSM$HoE~@3JRffy5(}ifeRlat#t$dYC{NtX`0r`bHXnPY( Date: Tue, 23 May 2023 11:37:49 -0400 Subject: [PATCH 10/27] added breathing mask and tank sprites for shiro and funny webbing for uniqueness --- .../Entities/Clothing/Belt/belts.yml | 18 ++ .../Entities/Consumable/Food/meat.yml | 6 +- .../Entities/Mobs/NPCs/pets.yml | 12 +- .../shiro_inventory_template.yml | 36 ++++ .../Mask/breath.rsi/equipped-MASK-shiro.png | Bin 0 -> 417 bytes .../Clothing/Mask/breath.rsi/meta.json | 119 +++++++++++- .../equipped-SUITSTORAGE-shiro.png | Bin 0 -> 497 bytes .../Objects/Tanks/anesthetic.rsi/meta.json | 169 ++++++++++++------ .../equipped-SUITSTORAGE-shiro.png | Bin 0 -> 539 bytes .../Objects/Tanks/emergency.rsi/meta.json | 149 +++++++++------ .../equipped-SUITSTORAGE-shiro.png | Bin 0 -> 523 bytes .../Tanks/emergency_double.rsi/meta.json | 149 +++++++++------ .../equipped-SUITSTORAGE-shiro.png | Bin 0 -> 523 bytes .../Tanks/emergency_yellow.rsi/meta.json | 149 +++++++++------ .../equipped-SUITSTORAGE-shiro.png | Bin 0 -> 514 bytes .../Objects/Tanks/generic.rsi/meta.json | 149 +++++++++------ .../oxygen.rsi/equipped-SUITSTORAGE-shiro.png | Bin 0 -> 539 bytes .../Objects/Tanks/oxygen.rsi/meta.json | 149 +++++++++------ .../red.rsi/equipped-SUITSTORAGE-shiro.png | Bin 0 -> 535 bytes .../Textures/Objects/Tanks/red.rsi/meta.json | 149 +++++++++------ .../yellow.rsi/equipped-SUITSTORAGE-shiro.png | Bin 0 -> 523 bytes .../Objects/Tanks/yellow.rsi/meta.json | 149 +++++++++------ .../shirowebbing.rsi/equipped-BELT-shiro.png | Bin 0 -> 507 bytes .../Belt/shirowebbing.rsi/equipped-BELT.png | Bin 0 -> 789 bytes .../Clothing/Belt/shirowebbing.rsi/icon.png | Bin 0 -> 401 bytes .../Belt/shirowebbing.rsi/inhand-left.png | Bin 0 -> 440 bytes .../Belt/shirowebbing.rsi/inhand-right.png | Bin 0 -> 451 bytes .../Clothing/Belt/shirowebbing.rsi/meta.json | 30 ++++ 28 files changed, 1008 insertions(+), 425 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml create mode 100644 Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml create mode 100644 Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT-shiro.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-left.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml new file mode 100644 index 0000000000..4da069bd98 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,18 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltWebbingShiro + name: shiro's webbing + description: A flexible set of webbing worn by little Shiro. + components: + - type: Sprite + sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi + - type: Clothing + sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi + - type: Item + size: 60 + - type: Storage + capacity: 60 + - type: Tag + tags: + - BeltSlotNotBelt + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml index d53a6b2b01..b9acc5f338 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml @@ -1,7 +1,7 @@ - type: entity name: dissociative slimeball - parent: FoodShiroSlime - id: FoodMeat + parent: FoodMeatBase + id: FoodShiroSlime description: A perfectly round blob of Shiro's slime. components: - type: FlavorProfile @@ -14,8 +14,6 @@ - type: Tag tags: - Raw - - type: Sprite - state: plain - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 56f4535ef8..c0971e09a7 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -87,6 +87,7 @@ parent: SimpleMobBase id: MobShiro description: Huh, so this is what Shiro really looks like. + startingGear: shirosvest components: - type: Sprite drawdepth: Mobs @@ -107,8 +108,8 @@ - MobLayer - type: Appearance - type: Inventory - speciesId: fox - templateId: pet + speciesId: shiro + templateId: shiro - type: Strippable - type: UserInterface interfaces: @@ -198,8 +199,6 @@ - type: MeleeWeapon animation: WeaponArcClaw attackRate: 2 - soundHit: - path: /Audio/weapons/punch3.ogg damage: types: Blunt: 1 @@ -320,3 +319,8 @@ id: jackparkerstuff equipment: hands: BriefcaseBrownFilled + +- type: startingGear + id: shirosvest + equipment: + belt: ClothingBeltWebbingShiro \ No newline at end of file diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml new file mode 100644 index 0000000000..7b6709f559 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml @@ -0,0 +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: 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: 300 # only if you're reeaaaaly dedicated to taking it since it autofills with shiro's vest + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + whitelist: + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..a53543aaeed56808432a8c1c09fa8abdf210c9ea GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zqdi?5Ln`LH zy|po~*+78pfw#C->WMCi#rv3)lQ@)uw%fUG%MtXS&?}y}dI8trvwNJ}Tq2BJHiayE z&7#z?h3jZm=f8ZXZ-tvS9xZZb0U8bm1xLTz6w12K*eQ8>>ZD&YXPzvT`Dp83CHyCN zb9Gbg`N^wRy(rzkd~4>V&q3R`{) z-FiIvfmPoX(I+vQmSRWy}O`KVa#W|pdic}4h|MiS3j3^P6B;e283Cp?e*E)zS%f( zzpj~L>Af;%U&HCw(kY)?JC8i7HOT^Noi)%jX&5nFH>7-(^K6&V(ozEZZ5yWRaZ zThwU%#apcw+}q-OFYQa| zaJgN_Y#+4=wg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index 819d0b14d7..1025426d21 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -6,56 +6,121 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE-dog", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-puppy", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-fox", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-cat", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-sloth", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-possum", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-pig", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..95b216b09cae0618d08483dbba44d013846932d8 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX?&ThE&XX zd&}N~DNu&}L;gfjrx5l=R$eIyQI`vax^a6JoX~68wqW5(+YHetrCHHyS1M){3CY}I zQuHj?=_b$Ocqzb%sF;=H>a(9HhtR0-SrJWmpsbd}zpZlSVAND?5tui(!9{6d zi$K8Ly>UmX*GK5AN-pi<`^XohY28lermn$Q6Qj8|>D=s;0$6yB(SbCg&?j(C5i`#B; z4sr+X{!(1Dso_jAtEUVK|}BR zvkTkHSPq|6N6aOFRw4ON{ zYhBUlt#HiE`NOm;kup12gvFbT_sM3ldi|X`S$F4`pT16y?md53^6e9sf)W(`TCd{6 zzN=67VCmK{^L4`8)zz9~j!!$A!&m*A{l=MR|8DfG5anX!oSeUf@oJRq!YNLxuQml~ zZ4(aAn(Cs-S~;yp*{&`sTXXv9Nhed1tQ%dB!Iyl4SFeC(pYG0Qx3m8BD>rTKBmUbv z7y4c}z1q(tHtYJvr^_Zy+Pzu#VwCst*Fbdo?#*d;LV^}neSOTb(=l%O>+Wk-A>V>0 zcbe32zs~lZGiScS>|Z^dibkG3>JTC%e5Zm;I$HHrC#VFW`ThBHhcK z{pQC?sj@4d=9zDv-|+gzBdcvsZ1WTTp0K}svie^9WJ$A~nH*vk8pYFgCbK>a^i%3P zGjUNJ_vJIjzr1oL9BnPXtYsP=Dct#3N6aOFRw4ON{ zYhBUlt#HiE`NOm;kup12gvFbT_sM3ldi|X`S$F4`pT16y?md53^6e9sf)W(`TCd{6 zzN=67VCmK{^L4`8)zz9~j!!$A!&m*A{l=MR|8DfG5anX!oSeUf@oJRq!YNLxuQml~ zZ4(aAn(Cs-S~;yp*{&`sTXXv9Nhed1tQ%dB!Iyl4SFeC(pYG0Qx3m8BD>rTKBmUbv z7y4c}z1q(tHtYJvr^_Zy+Pzu#VwCst*Fbdo?#*d;LV^}neSOTb(=l%O>+Wk-A>V>0 zcbe32zs~lZGiScS>|Z^dibkG3>JTC%e5Zm;I$HHrC#VFW`ThBHhcK z{pQC?sj@4d=9zDv-|+gzBdcvsZ1WTTp0K}svie^9WJ$A~nH*vk8pYFgCbK>a^i%3P zGjUNJ_vJIjzr1oL9BnPXtYsP=Dct#3Z-XM3A9 zA39*(`Z#z_e9WSPnqP^=&(?-$&Gh`V*6hKvcXsM64O4`iI?nhx?2IvU;+Qe@s?MX$ z*WZ@;E)6pLS!1_Z*uw=G)HjEQoAcCc-ni5DOYGLDxsl5)`W{d8z3|WZ_$u$cHt!mM zHdmA|T`v_pZaC|#8pDFCS&m+vK-n{^V&7HD#awTFY>~13c7Y80yypwURy%reG9;(> z?`33Iu$7HL#j`1H{q#2H?B3UXfR~>{4Ld zqZ_8#s^Ym|Yu)`RTfg$&o^=1yx3aVU?(xlAe=Z^JSAf^Tiy01@se3E37q43)vN&VW zYc2cKw#NLfK$9*1?yP?)viQa66gS^IsY|SUr{|=;>%a7&(od=TO#a#5+CIkTf2set x`R&@XEnd1I*Vd;Liikh^v3%1Hb^+gaq6<&&oXL}CzZe*)44$rjF6*2UngB@P>{S2& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json index 819d0b14d7..e091a36f52 100644 --- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json @@ -6,56 +6,101 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE-dog", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-puppy", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-fox", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-cat", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-sloth", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-possum", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-pig", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..95b216b09cae0618d08483dbba44d013846932d8 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX?&ThE&XX zd&}N~DNu&}L;gfjrx5l=R$eIyQI`vax^a6JoX~68wqW5(+YHetrCHHyS1M){3CY}I zQuHj?=_b$Ocqzb%sF;=H>a(9HhtR0-SrJWmpsbd}zpZlSVAND?5tui(!9{6d zi$K8Ly>UmX*GK5AN-pi<`^XohY28lermn$Q6Qj8|>D=s;0$6yB(SbCg&?j(C5i`#B; z4sr+X{!(1Dso_jAtEUVK|}BR zvkTkHSPq|6Px$(Md!>RCt{2+PzD|Ko|z_C#4ZTkg8Bnv4bdr9h^c0Y05292o&6%oE)5V5(+LN zI_cnK9h{u|7Zd~`pmgpaLWbC(h*%XAw0I6uMQqhxKce{jrjl^)b9X(myax~w5fKp) z5fKsnE1K#+%QR%=_wi{?xsKlgDuXQ3kn!0B);2Z~pG|z&jCM<!IK0Ax#LpihVAI7ql2@&Wzr z`Az9srR0yST$TZ7z|{q|!#bj_2gh*`3FxnLQlPW}!0Tdr3I*)mY5?BDLw)_KCBHN^ zF(xM`A~;!}M(^A{vZa1xp`oWxz?tIWmDReElCc$yQoH|!X67l~602r-Xs}tOepS|w_;D0}&GE1B;~PNK ZxEG6AsVXCw`<4Iz002ovPDHLkV1fe)@IL?m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json index 819d0b14d7..e091a36f52 100644 --- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json @@ -6,56 +6,101 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE-dog", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-puppy", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-fox", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-cat", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-sloth", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-possum", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "equipped-SUITSTORAGE-pig", - "directions": 4, - "delays": [[1],[1],[1],[1]] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4, + "delays": [ + [ 1 ], + [ 1 ], + [ 1 ], + [ 1 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000000000000000000000000000000000..15c15258f5c7cd60b3dbb5046b42dd4e730afa96 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zk9xW|hE&XX zduwm@Z3hXq5672^l)n&N6aOFRw4ON{ zYhBUlt#HiE`NOm;kup12gvFbT_sM3ldi|X`S$F4`pT16y?md53^6e9sf)W(`TCd{6 zzN=67VCmK{^L4`8)zz9~j!!$A!&m*A{l=MR|8DfG5anX!oSeUf@oJRq!YNLxuQml~ zZ4(aAn(Cs-S~;yp*{&`sTXXv9Nhed1tQ%dB!Iyl4SFeC(pYG0Qx3m8BD>rTKBmUbv z7y4c}z1q(tHtYJvr^_Zy+Pzu#VwCst*Fbdo?#*d;LV^}neSOTb(=l%O>+Wk-A>V>0 zcbe32zs~lZGiScS>|Z^dibkG3>JTC%e5Zm;I$HHrC#VFW`ThBHhcK z{pQC?sj@4d=9zDv-|+gzBdcvsZ1WTTp0K}svie^9WJ$A~nH*vk8pYFgCbK>a^i%3P zGjUNJ_vJIjzr1oL9BnPXtYsP=Dct#3Km~hbHV88(f-gbX2$#>0PBp2B^%d1oz3Hq48&DO)l#m2`QqAE8- zX6IG4qkfzA-}l$bczP#RFMZ`CW&uGsxM(TJ>AX(*w8qck=6}o7VoD;HtcqlPvQ9qA z@1Gy~6yn8k)2H_97`g zZ@o>|+E%SHnCti0pRvMzQqa|lQc6mS&lnnR=CCo`c>kS2z-!ioTE{(=?`x~s(t8db zzHIz%-FmnAY=WHq`s;V>-YS5Md(@7DrIq;^mh5aharw2Vq#$Q$?Do6;zw>*_TawO{^j|NveR;cO(SOFwz)Z(N srm)qa^Eb$QZ4aAuIm)_XUHwyDA>T`(7Vl4Z0%McG)78&qol`;+0I2BCApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..c1e6c60c102de9eb07df48d9084191b843adfd29 GIT binary patch literal 789 zcmV+w1M2*VP)Px%&q+iPT7i;Jcb?X|9o&DkRIr0q(PC69cR(n*o z;zIj4c+i&ehN{EM1v_;UOOBlc?g!y;EOh7don&+e2!bF8f*=U}vDW%S*Vm*!iBYbU z0uk;0z+)(__ZJOZ~j&|1Se7d2l{$Z+_jY5LE-x~}o?{VP6v{4`n`9Md0@1~(yt zi3mi5x~@@GRZ9{P?jL@JOcwpcP+UELZvq74s zEg74Jy&S-yr<6jLWdP7AUv0;X;RI`~*IFNp0IhYf?p_WcBBW^wBEovTJ}7zIso^;mmlx3MHrCM*9h+6kU=IuS$7~_v^ zH++8#2V4Zkn1lIs?EY0V_4j@(p?3BPRo(@hbC}QPsH$p`@BY3t?c<%IuYJLv!i&Ws z0f4v0_|F%R>&6(*4?AiKUQ2#oi=BcX2!bF8f*=TjAe@ij6P-NITL%uyZB{Y^E~&)7|(KS8=AVh_WaNk3|a)cJnozW7bd6Z3*bfw*4f8KVJt48XJDueQ6bx` z$1A1I)+=DG_1qm6+bbNk3vizC!=Ixh&3ysfBRqNT8)GI}^{>SaK@bE%xI+E{K`s|z TBrd?j00000NkvXXu0mjff#GcL literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3ae067f8c24068819fbe08ab16c6cb7c50c5e190 GIT binary patch literal 401 zcmV;C0dD?@P)Px$OG!jQR9J=Wl|636AP|MWtfDA2rCVIW5mubt;s$FeqLU0 z-|Gij1f^6}tZD*sPojwxxZWe3*sIL15wOMo|yMU1_bW?HrO7Fvg&@#(R&5;JpW67>31X&yN1*^BI7y z>we6UY?3Iu+u&=#*|P!Kwq3~V9YMBBV?4k{S1y zJK*5oME=(fp>G*#=Iie-+kN+mt$aF%^UtbJiW=qi?jPElcuUn|M82i z0awpin*WIIxwwU6+5Lu1IuG}@7xNjqSv=nmwYI=Q#x4D*gzo=azG_5)jN@6BG^YkMR~E^(UTN`XUfa&uN!wrqd5 fwYaU}MW#I$|IVdyf-5wDF~Z>K>gTe~DWM4f>{`qQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8280138ae7516e8099c3829e2ec1c711cff76f7e GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?dAaSW-L^Y)fu-ys75)(hvg zc=MDVa$j&=xr0HJeTH;_C*OupJ%_h#M!eH9-Y9u2R20gX`@lir=H35RIg@?dw#}Ao z=zxJ2@-s_)yF7Rw{QgzE`Sx3@>;8`SXH4!$&x`AO^?6b9zp5s@; zelX$8yhb%f=Y7V@>=jbB%xk={seDcQUq;2`FFbdq?c09)ZG!v4aHd(CDkG<9oEFNQ zweM+6+r8COn!d}0hAv#S>fk)tT9#c^Y%WXczQ=y>d1>vo-a28;yvA*pz6&f8Hb^_~ o5Gb-4$XQ*L8-4A5=f64JkAQ|w-~MGAFmf0?UHx3vIVCg!09YB%!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json new file mode 100644 index 0000000000..d367224dce --- /dev/null +++ b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by DSC@Cabbage#9633 (561159087765848084)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT-shiro", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 1a65df2dadb5f59f5aaf15f0d73c2d9895494da7 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Tue, 23 May 2023 11:45:58 -0400 Subject: [PATCH 11/27] redoing the starting items for the pets --- .../SimpleStation14/Entities/Mobs/NPCs/pets.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index c0971e09a7..7370379ca9 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -87,7 +87,6 @@ parent: SimpleMobBase id: MobShiro description: Huh, so this is what Shiro really looks like. - startingGear: shirosvest components: - type: Sprite drawdepth: Mobs @@ -233,7 +232,6 @@ id: MobMonkeyJackParker parent: SimpleMobBase description: Hasn't lost a case in his entire career. - startingGear: jackparkerstuff components: - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-primate @@ -313,14 +311,4 @@ gender: male - type: Tag tags: - - CannotSuicide - -- type: startingGear - id: jackparkerstuff - equipment: - hands: BriefcaseBrownFilled - -- type: startingGear - id: shirosvest - equipment: - belt: ClothingBeltWebbingShiro \ No newline at end of file + - CannotSuicide \ No newline at end of file From dcf47a8e30eaf319443abbb2da9033baa031e054 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Tue, 23 May 2023 14:03:53 -0400 Subject: [PATCH 12/27] changing things --- .../Catalog/Fills/Items/belt.yml | 8 ++++++++ .../Entities/Clothing/Belt/belts.yml | 4 ++-- .../Entities/Mobs/NPCs/pets.yml | 16 ++++++++++++++- .../shiro_inventory_template.yml | 4 ++-- .../Objects/Tanks/anesthetic.rsi/meta.json | 20 ------------------- 5 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml new file mode 100644 index 0000000000..7a24775407 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml @@ -0,0 +1,8 @@ +- type: entity + id: ClothingBeltWebbingShiroFilled + parent: ClothingBeltWebbingShiro + suffix: Filled + components: + - type: StorageFill + contents: + - id: DrinkRewriter diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml index 4da069bd98..4cf21ef69c 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml @@ -9,9 +9,9 @@ - type: Clothing sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi - type: Item - size: 60 + size: 15 - type: Storage - capacity: 60 + capacity: 10 - type: Tag tags: - BeltSlotNotBelt diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 7370379ca9..cf6a915546 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -226,6 +226,8 @@ whitelistRequired: true name: Shiro description: Be Shiro! Be fast! Always be fast! + - loadout: + prototype: [ ShirosVest ] - type: entity name: Jack Parker @@ -311,4 +313,16 @@ gender: male - type: Tag tags: - - CannotSuicide \ No newline at end of file + - CannotSuicide + - loadout: + prototype: [ JacksThings ] + +- type: startingGear + id: ShirosVest + equipment: + belt: ClothingBeltWebbingShiroFilled + +- type: startingGear + id: JacksThings + equipment: + hands: BriefcaseBrownFilled \ No newline at end of file diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml index 7b6709f559..c4b5438c37 100644 --- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml @@ -27,10 +27,10 @@ slotTexture: belt slotFlags: BELT slotGroup: SecondHotbar - stripTime: 300 # only if you're reeaaaaly dedicated to taking it since it autofills with shiro's vest + stripTime: 3 uiWindowPos: 3,1 strippingWindowPos: 1,5 displayName: Belt whitelist: tags: - - PetWearable \ No newline at end of file + - PetWearable diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index 1025426d21..e091a36f52 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -84,26 +84,6 @@ [ 1 ] ] }, - { - "name": "equipped-SUITSTORAGE-pig", - "directions": 4, - "delays": [ - [ 1 ], - [ 1 ], - [ 1 ], - [ 1 ] - ] - }, - { - "name": "equipped-SUITSTORAGE-pig", - "directions": 4, - "delays": [ - [ 1 ], - [ 1 ], - [ 1 ], - [ 1 ] - ] - }, { "name": "equipped-SUITSTORAGE-shiro", "directions": 4, From 30549607c904486d8bb247b8c2c699136224df71 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 24 May 2023 09:59:02 -0400 Subject: [PATCH 13/27] shiro got working and more colors too! --- .../Entities/Mobs/NPCs/pets.yml | 20 +++++++++++++------ .../Objects/Tanks/anesthetic.rsi/meta.json | 8 +------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index cf6a915546..cb7b0ddd5a 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -88,12 +88,20 @@ id: MobShiro description: Huh, so this is what Shiro really looks like. components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + shiro: Sixteen + - type: Sprite drawdepth: Mobs + netsync: false sprite: SimpleStation14/Mobs/pets/shiro.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] + sprite: SimpleStation14/Mobs/pets/shiro.rsi state: shiro + color: "#FF00FF" - type: Physics - type: Fixtures fixtures: @@ -226,8 +234,8 @@ whitelistRequired: true name: Shiro description: Be Shiro! Be fast! Always be fast! - - loadout: - prototype: [ ShirosVest ] + - type: Loadout + prototypes: [ ShirosVest ] - type: entity name: Jack Parker @@ -314,15 +322,15 @@ - type: Tag tags: - CannotSuicide - - loadout: - prototype: [ JacksThings ] + - type: Loadout + prototypes: [ JacksThings ] - type: startingGear id: ShirosVest equipment: - belt: ClothingBeltWebbingShiroFilled + belt: ClothingBeltWebbingShiroFilled - type: startingGear id: JacksThings equipment: - hands: BriefcaseBrownFilled \ No newline at end of file + hands: BriefcaseBrownFilled diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index e091a36f52..dd85e53c2c 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -86,13 +86,7 @@ }, { "name": "equipped-SUITSTORAGE-shiro", - "directions": 4, - "delays": [ - [ 1 ], - [ 1 ], - [ 1 ], - [ 1 ] - ] + "directions": 4 }, { "name": "inhand-left", From 752eab2b0eb3ff887813cd979c66cd1e1a6c9a97 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 24 May 2023 15:58:03 -0400 Subject: [PATCH 14/27] restructured shiro into a base and unique entity being the slime cat and Shiro --- .../Entities/Mobs/NPCs/animals.yml | 121 ++++++++++++++++++ .../Entities/Mobs/NPCs/pets.yml | 75 +---------- 2 files changed, 124 insertions(+), 72 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index d07e9f152c..7dad40dca8 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -29,3 +29,124 @@ - type: Grammar attributes: gender: epicene + +- type: entity + name: slime cat + parent: SimpleMobBase + id: MobSlimeCat + description: A cute squishy slime cat. Humorous pet. + components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + shiro: Sixteen + + - type: Sprite + drawdepth: Mobs + netsync: false + sprite: SimpleStation14/Mobs/pets/shiro.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: SimpleStation14/Mobs/pets/shiro.rsi + state: shiro + color: "#FF00FF" + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: Inventory + speciesId: shiro + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: shiro + Critical: + Base: shiro + Dead: + Base: shiro_dead + - type: Butcherable + spawned: + - id: FoodMeatSlime + amount: 3 + - type: InteractionPopup + successChance: 1.0 + interactSuccessString: petting-success-slime + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg + - type: Grammar + attributes: + gender: epicene + - type: Damageable + damageContainer: Biological + damageModifierSet: Slime + - type: Bloodstream + bloodReagent: Slime + bloodlossDamage: + types: + Bloodloss: + 1 + bloodlossHealDamage: + types: + Bloodloss: + -0.25 + - type: Barotrauma + damage: + types: + Blunt: 0.45 + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaled: true + damage: + types: + Heat: 2 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "slime-hurt-by-water-popup" ] + probability: 0.25 + - type: MeleeWeapon + animation: WeaponArcClaw + attackRate: 1.4 + damage: + types: + Blunt: 1 + Slash: 3 + Piercing: 2 + - type: Faction + factions: + - Pet + - type: RandomBark + barkMultiplier: 1.0 + barks: + - Squish. + - Splort. + chatlog: True + - type: MovementSpeedModifier + baseWalkSpeed : 8.0 + baseSprintSpeed : 4.0 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index cb7b0ddd5a..f465ab5a15 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -84,14 +84,14 @@ - type: entity name: Shiro - parent: SimpleMobBase + parent: MobSlimeCat id: MobShiro description: Huh, so this is what Shiro really looks like. components: - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: - shiro: Sixteen + shiro: "" - type: Sprite drawdepth: Mobs @@ -101,88 +101,19 @@ - map: ["enum.DamageStateVisualLayers.Base"] sprite: SimpleStation14/Mobs/pets/shiro.rsi state: shiro - color: "#FF00FF" + color: "#FFFFFF" - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - MobMask - layer: - - MobLayer - - type: Appearance - type: Inventory speciesId: shiro templateId: shiro - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: DamageStateVisuals - states: - Alive: - Base: shiro - Critical: - Base: shiro - Dead: - Base: shiro_dead - type: Butcherable spawned: - id: FoodShiroSlime amount: 3 - - type: InteractionPopup - successChance: 1.0 - interactSuccessString: petting-success-slime - interactFailureString: petting-failure-generic - interactSuccessSound: - path: /Audio/Animals/fox_squeak.ogg - type: Grammar attributes: proper: true gender: female - - type: Damageable - damageContainer: Biological - damageModifierSet: Slime - - type: Bloodstream - bloodReagent: Slime - bloodlossDamage: - types: - Bloodloss: - 1 - bloodlossHealDamage: - types: - Bloodloss: - -0.25 - - type: Barotrauma - damage: - types: - Blunt: 0.45 - - type: Reactive - groups: - Flammable: [ Touch ] - Extinguish: [ Touch ] - reactions: - - reagents: [ Water, SpaceCleaner ] - methods: [ Touch ] - effects: - - !type:WashCreamPieReaction - - reagents: [ Water ] - methods: [ Touch ] - effects: - - !type:HealthChange - scaled: true - damage: - types: - Heat: 2 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "slime-hurt-by-water-popup" ] - probability: 0.25 - type: DraconicBloodstream reagent: solutionName: chemicals From 6b43c60b9db85acf889096a74876bfebec3520a8 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 24 May 2023 16:02:10 -0400 Subject: [PATCH 15/27] forgot to remove the image --- .../SimpleStation14/Mobs/Pets/mc.rsi/image.png | Bin 6018 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/image.png deleted file mode 100644 index d20fbf9940ca1399ec148031f1af1380a1f56de6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6018 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 Date: Sun, 28 May 2023 10:07:03 -0400 Subject: [PATCH 16/27] minor changes --- .../SimpleStation14/Entities/Mobs/NPCs/animals.yml | 2 ++ .../SimpleStation14/Entities/Mobs/NPCs/pets.yml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 7dad40dca8..f2dd861e01 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -146,6 +146,8 @@ barks: - Squish. - Splort. + - Meow. + - Mew. chatlog: True - type: MovementSpeedModifier baseWalkSpeed : 8.0 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index f465ab5a15..0e045d64c1 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -92,7 +92,6 @@ available: - enum.DamageStateVisualLayers.Base: shiro: "" - - type: Sprite drawdepth: Mobs netsync: false @@ -118,8 +117,8 @@ reagent: solutionName: chemicals reagent: ShirosDelight - unitsPerUpdate: 0.3 - accumulatorTime: 0.4 + unitsPerUpdate: 3.0 + accumulatorTime: 4.0 - type: SolutionContainerManager solutions: melee: @@ -153,6 +152,7 @@ - Wah! - Wah. - Shiro? + - Squish. chatlog: True - type: MovementSpeedModifier baseWalkSpeed : 8.0 @@ -237,7 +237,7 @@ animation: WeaponArcFist damage: types: - Blunt: 5 + Blunt: 6 - type: RandomBark barkMultiplier: 0.65 barks: From 377f04a3b90bd14d7b8de62c1b3e1bc8a73db38e Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 2 Jun 2023 10:24:17 -0400 Subject: [PATCH 17/27] transleuceny on th slime --- .../Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index f2dd861e01..7852cefffd 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -50,6 +50,7 @@ sprite: SimpleStation14/Mobs/pets/shiro.rsi state: shiro color: "#FF00FF" + alpha: 200 - type: Physics - type: Fixtures fixtures: @@ -148,7 +149,7 @@ - Splort. - Meow. - Mew. - chatlog: True + chatlog: False - type: MovementSpeedModifier baseWalkSpeed : 8.0 baseSprintSpeed : 4.0 From 7fa44e76afd28a1882d27d64d4979ede07aaea66 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 11 Jun 2023 11:47:30 -0400 Subject: [PATCH 18/27] added gorilla and more --- .../Entities/Mobs/NPCs/pets.yml | 89 ++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 0e045d64c1..b7ce64067c 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -200,6 +200,11 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: monkey sprite: SimpleStation14/Mobs/pets/jackparker.rsi + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false - type: Hands - type: Speech speechSounds: Monkey @@ -228,6 +233,7 @@ - type: DiseaseCarrier - type: CombatMode canDisarm: true + - type: Cuffable - type: MeleeWeapon hidden: true @@ -256,6 +262,86 @@ - type: Loadout prototypes: [ JacksThings ] +- type: entity + name: gorilla + parent: MobMonkey + id: MobGorillaHughes + description: Don't sign up for human testin bud. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: crawling + sprite: Mobs/Animals/gorilla.rsi + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.48 + density: 200 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: crawling + Critical: + Base: dead + Dead: + Base: dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 4 + - type: Bloodstream + bloodMaxVolume: 300 + - type: Puller + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Oni + modifiers: + coefficients: + Blunt: 2 + Slash: 1.7 + Piercing: 1.7 + Asphyxiation: 2 + stamDamageBonus: 1.7 + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive + 100: Critical + 200: Dead + - type: Damageable + damageContainer: Biological + damageModifierSet: Oni + - type: Stamina + - type: MeleeWeapon + hidden: true + angle: 0 + animation: WeaponArcFist + damage: + types: + Blunt: 7 # See oni component + - type: RandomBark + barks: + - Grunt. + - type: Loadout + prototypes: [] + + - type: startingGear id: ShirosVest equipment: @@ -264,4 +350,5 @@ - type: startingGear id: JacksThings equipment: - hands: BriefcaseBrownFilled + inhand: + right hand: BriefcaseBrownFilled From ce04246a1afab0e0ca5e0146720a04d4229bb771 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 12 Jun 2023 10:14:46 -0400 Subject: [PATCH 19/27] 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 Date: Mon, 12 Jun 2023 11:52:04 -0400 Subject: [PATCH 20/27] updated sprites and added a nonaccented cat prototype --- .../Entities/Mobs/NPCs/animals.yml | 79 +++++++++++++++++- .../Entities/Mobs/NPCs/pets.yml | 20 +++-- .../Mobs/Pets/problems.rsi/cat.png | Bin 2141 -> 2145 bytes .../Mobs/Pets/problems.rsi/cat_dead.png | Bin 572 -> 714 bytes .../Mobs/Pets/problems.rsi/meta.json | 68 +++++++-------- 5 files changed, 125 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 363c8e7278..66e75224ec 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -30,6 +30,84 @@ attributes: gender: epicene +- type: entity + name: cat + parent: SimpleMobBase + id: MobCatNoAccent + description: Feline pet, very funny. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cat + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 15 + mask: + - MobMask + layer: + - MobLayer + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Slash: 2 + Piercing: 5 + - type: Appearance + - type: Inventory + speciesId: cat + templateId: pet + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: cat + Critical: + Base: cat_dead + Dead: + Base: cat_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: InteractionPopup + successChance: 0.7 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg + - type: Grammar + attributes: + gender: epicene + - type: MobPrice + price: 200 + - type: Faction + factions: + - Cat + - type: RandomBark + barkMultiplier: 1.0 + barks: + - Meow! + - Mow. + - Meow. + - Mew. + chatlog: False + - type: entity name: slime cat parent: SimpleMobBase @@ -40,7 +118,6 @@ available: - enum.DamageStateVisualLayers.Base: shiro: Sixteen - - type: Sprite drawdepth: Mobs netsync: false diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index f8a5eb476b..1c5e2395a2 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -85,7 +85,7 @@ - type: entity name: Shiro parent: MobSlimeCat - id: MobShiro + id: MobSlimeCatShiro description: Huh, so this is what Shiro really looks like. components: - type: RandomSprite @@ -172,7 +172,7 @@ - type: entity name: Problems id: MobCatProblems - parent: MobCat + parent: MobCatNoAccent description: Defender of the medbay... from mice anyway. components: - type: Sprite @@ -195,7 +195,14 @@ - CannotSuicide - type: Grammar attributes: + proper: true gender: neuter + - type: InteractionPopup + successChance: 1 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg - type: entity name: Jack Parker @@ -263,7 +270,6 @@ - type: CombatMode canDisarm: true - type: Cuffable - - type: MeleeWeapon hidden: true soundHit: @@ -293,9 +299,9 @@ - type: entity name: Hughes - parent: MobMonkey + parent: MobMonkeyJackParker id: MobGorillaHughes - description: Don't sign up for human testin bud. + description: Don't sign up for human testin' bud. components: - type: Sprite drawdepth: Mobs @@ -363,7 +369,7 @@ animation: WeaponArcFist damage: types: - Blunt: 7 # See oni component + Blunt: 7 - type: RandomBark barks: - Grunt. @@ -384,4 +390,4 @@ - type: startingGear id: HughesThings inhand: - right hand: FoodBanana + left hand: FoodBanana diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png index b9e3deeb62ffe9ecf78002f153a765cbf99e09e6..4fde7444d934d2438896813a1256523a45a08c9f 100644 GIT binary patch delta 2119 zcmV-N2)Os%5aAGzF@GCLL_t(|ob8)UXd7o5$N%%8S2J4Kk^EW9*~GzM)}%NgOSdgs zs1L>TuoRL*d)b8?7K}>|A$4;|p@$X%G1(kjatli??P0x#(gcxZ<8A^;%Vzsw1UFHYE&dfXi=i~j5tbgYT;N#=tLsYrgkmA>ft&8@yT)e((v0=#@O|{ z|M;t0Nl)xd0`tdh5@gqgQzZbvKz}PYrlm?4=x+r8yfpka^o<`7J2E1;)vibE$cUgV z#HnRj=;`S|R)063J(!@=vngn)5)O7qc)V)4)^+VXD6X1>DyTq1*!lb0OZcC`iKljA&i08kYf zsv@I3Dxy6qLRDm}FJ0TWZ7}_>8_=@`mX}un06l%LfqxJMA+?0|s2xiA%5;LKLl6LN z{N;SzfA1$@HG}2kO)MvGBDs{Qm=L#kN&x8`!yBV%0D%6t4FJF!qiK-NF)wnC(e*r% zKYR%Qki=ru{an5XWAlkCO;`K0P$<|-tMCl~z_12@!VC~RijXvC4+B zVP!8et_U6Y1^=Dx`B*nWNG(;}cfy_$KuDnC=d&WDmJsVE*vM>u2x8aWvZn<6FJOnA zs(;88GwrCqh-KgEn#^U}jxud0GLvd=Zv@haZA#>seU( z9eyhBCt1C~XMHVQ;xEA70$IJ_O3(EQ$m#`dq_6)D*6>?c`W++_DYsIdS^4)m0HC|K z4Sho&2+8k0q{+mpCoR`2U^6dcGcTjBzkdtKL<$|TSA}FEg}(kSes4c1w_nb)vJU{b zcl`{#cl``)bnWM0-&4AF%kneH{7=NbkB^U!kB^U!kI(-T`&rljDX}w7kzEAp*WTT7 z^~%|%C9_#t+Csdle__|}1NNGP_~bY}_2xSO_U1f$_SBp2cxrwqr(sOmLY$^orhh2S z-=~??+f;in;mKfpa-3$;^E8v5r&q6>rJ3}+XUEGmGU<8hH3`~-37T2GO=V=Oa0Jskk-287tJ&N;5K+<*G~9PK+4hLIC_y`IrMaNbq9Y-R33#cZ#oO9-hY zBp>M*{@sLQE$zVs?df|B0C-c0i<&bqD~cothZReOm&#Q1h*9bwh1 zdXSZ)0pR(;F53tdU{MK@SbwygjlIhI2%^uqYnn>`=Qd@H7i-!S*OUYc5GbsYT(L!K z`M5Kdoefkqze;6Qp0H{n7PAjURgqy9Oh~d_47G||kOCndylEC71wuS{1dk&^XCOq~ zcZ@}!dqtr6`_vSUqdf+!X;T0I(=33HASAJf=LfrBZ5b8*kRYk(8-HNG*Qy=X-B3nO zL?qe;Rgpmg5-f|_#svE%1wsJb;xkWz1lE=T()uC@34qWU2+9f1%@TrgLLhX;)@psx z)(#R_R05~~PvS)n< z<)=SuoY>3kGX&*?u(Jtc*LNwp#kYVY2~ZWeqFkOJk~bq zw$3^#sI9GR0ssbIcx!t91ZnO9v0x`|Yd0|Jiv|E@9eP zJ%!mvB2JH1CwgV>0%iRRSv`eDA=Z757&&=KD6hxY`h({5=w+c+-M*QW_W+z8y}YY0 z-2>-^@^Oti#~XgI)>0)LP>M(s1IR{TcBxV2r002ovPDHLkV1g-F{}ccK delta 2115 zcmV-J2)y^<5Zw@vF@G0HL_t(|ob8)UXd7o5$N%%8S2J4Kk^CXoayD@=n3@zPWa+kL z3-zJ+w3qbIUUngeLU8FJq;3u=^w5PsOg6`s+`^Jed+{DhQ$&`Hy9p#Mo9#!86I0o8 zoE@)K+mfZpNE&PO?qTx2maGrYjOA>*%nyW}nRour$NM2!&wmrZ$H&LV$ER&*iwUYN zCg?9kTlDf!VtTTn6N%|b8tw=Iu$|q5Uv)6Oa7U=Ab~C?P;W`0{=}G$X*gJK`*!4UA z_^Vqn%6#&5SP$xI0r7IX7>I4A1JoXOs?2m{a85i7Yw<3OIT+kL1 z)Uqt}_xB*L8-LIqOws#uX=v#R4)#cRyk@!9b?sy>vp_eNuR&F06pCd4fKjj)Qb?_! z>(_q(EDfDKueLP-0FYa|MFF5AY;Uub)D4(svBv&lRS6;P!$=f zBBMJhqB|-=Rb*@|U)#5BaQ|OlLeCpmSy=-B^bfucLVpy5)C#(zb|}>=(+QpqK>&zV z&bR#ceiBx5SV`T$O6mqu%ek5faf_z}klqPo`!WCk{cl+SK(;Rf(mUZr&M~@PMC!+{ z005F$uDf3-mSJo@ai!^MpO#7`duf%v1ppY5ul zeDQ%BSw{qeK_M6n3c6lIa>?M=`9b`2<{xWWKGun@>scz5O4Kk6ScUJ=-PHlp+yVgP z^&%v76roV4?XzEPJNfm8$QA<_IvnD`YuXz00)GJj9PE)W^xKad`{4QvSb2C6=1-ph z0M^dA3-*^{UL~5cgvm<@V|f^cB&%R z%zwO>&j5gjzXgoVCs36GyE?d^7zGikQXjNY5CJpqO3Tv## z{ZL4K{}D|k*F0&tUICj$8Jk5JgF`W-l7DIR#9tFq$utIsV*K8IQf%mTf7F@6WU^gJdpFiig%5wAbbANR3P#8u*4AOz4YKJz3v0cxMy1U~iFA3kxZa~wvOHC|`R(Y#|mjTiw)XY5dz52l3Nq^G>jGw$DJl3-O6lFbl zQg8s0a)iGi$6;(f;e7$+r|r7!n0*G*V%prE9Ix?33J$>7e8Q7(>}VGrYuT2qvyKXC z>#LgpfRPv9+TM>O0Mpz8=^6#f8Xq_E;#+MEo*^hF1X{dD=f3$A-F$S zal3Vn@A|=7OIL6}DI=9kqgDOg={T?4y?%zKl4%@J$~^r4EbL_*W7hWBaU002ovPDHLkV1miN4{rbf diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png index 214e47b59a9cd8fde46b3e63492e77610d48aae0..a1f737c12744ee544e97e073e2f4aab737dca693 100644 GIT binary patch delta 678 zcmV;X0$KgM1j+@FFns8FH)lcuM}-3xPYlzNnVae(sw?EbzhFD}%uhl3mqOXO2{#tC zNwlW`*ee!J-KkhwV6Uk%y*)8BO-INM0Q0kx+{=P2i^`^HZss3{1Yk}*7DQvq+R9C1Uc|CSy9$}g$Eh2|mAArME+PiK^ zq8VP^dGB_lu6dE}t^05QRgqB@nJvSntyM(`nYvR$mVX5_l}TN`bUXsUm2i;}vco~~ z6K!qr031L8FgCI-Ks?q0Kt8`iEYat6Ue2++y6Xc5`df+WUROeB$0G=)aFUFRkQ@?S zchEHNJfgP;Qdf+PtQ(7a;Jwm5LU`R&tX5XOWC3V9o?|@ONp5YA;i05I7EM(Vk?xa< zj^U3hs(&k3Rfm+Ova~QmZ-45PM;V~9Z&KMevCKmN(wR{yof(xH@KV+5_@@zso23Ip zq#L1U{0}9KSvtTh9e94~C$Qz!T|T~j>^47eC7l_S8Y5^x|5O9IxmI9vtw1~$0bp=s z4BM^&plK?$T|-OW0LK8}*LI1)kujDQW&-t$!XMFDm{6fYg}NC124}belYXsxV*mgE M07*qoM6N<$f^zOd8UO$Q delta 535 zcmV+y0_gq91-t~1Fn2K;@vD*p4rv|K_zP5A4wQobK?;_Z zPQ^K3+r_TZsfZcHwL{x~AxPm2ipRm#k43>jMb1%kQr-@dwDzcUky4s#c>@o5?)$l) zHvtb150C$aSS%*~ns_`O7t>E4#33W{xy2KSgpd$~d=H4lVt=Cf{>5HhI;VItnG{0o z2EMpZna>xtLyr`{RaHL-5Cra%M#bu zJyNL@y2#WIw@W6I z`DxsFm`I-L$*zkEjV{n`HQyIu5e-o8WAG-k6IrfFgr2CAyMhMZcdR66T#z{A7C!{guJ Z2c;3ieh`g~S=0ak002ovPDHLkV1jgS1A_nn diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json index 2b62ebe775..f43db3e79d 100644 --- a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "", - "states": [ - { - "name": "cat", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "cat_dead", - "delays": [ - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "cat", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cat_dead", + "delays": [ + [ + 1 + ] + ] + } + ] } From 651c08bd40a4f29a8333f320e088d71fd3349c6a Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 12 Jun 2023 14:16:54 -0400 Subject: [PATCH 21/27] added a combo faction of the cat and pet ones, as well as wilson --- .../Entities/Mobs/NPCs/animals.yml | 6 +-- .../Entities/Mobs/NPCs/pets.yml | 44 ++++++++++++++++-- .../SimpleStation14/ai_factions.yml | 8 ++++ Resources/Prototypes/ai_factions.yml | 3 ++ .../Mobs/Pets/fox.rsi/meta.json | 26 +++++++++++ .../Mobs/Pets/fox.rsi/wilson.png | Bin 0 -> 882 bytes .../Mobs/Pets/fox.rsi/wilson_dead.png | Bin 0 -> 390 bytes 7 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/ai_factions.yml create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 66e75224ec..0564b2e36f 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -61,7 +61,7 @@ animation: WeaponArcBite damage: types: - Slash: 2 + Slash: 3 Piercing: 5 - type: Appearance - type: Inventory @@ -98,7 +98,7 @@ price: 200 - type: Faction factions: - - Cat + - PetCat - type: RandomBark barkMultiplier: 1.0 barks: @@ -218,7 +218,7 @@ Piercing: 2 - type: Faction factions: - - Pet + - PetCat - type: RandomBark barkMultiplier: 1.0 barks: diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 1c5e2395a2..3b9be74023 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -140,11 +140,8 @@ damage: types: Blunt: 1 - Slash: 1 - Piercing: 1 - - type: Faction - factions: - - Pet + Slash: 2 + Piercing: 2 - type: RandomBark barkMultiplier: 0.5 barks: @@ -294,6 +291,9 @@ - type: Tag tags: - CannotSuicide + - type: Faction + factions: + - Pet - type: Loadout prototypes: [ JacksThings ] @@ -373,9 +373,43 @@ - type: RandomBark barks: - Grunt. + - type: Faction + factions: + - Pet - type: Loadout prototypes: [ HughesThings ] +- type: entity + name: Wilson + parent: MobFoxBaby + id: MobFoxBabyWilson + description: "A two tailed fox of two tales: Music and salvage." + components: + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/fox.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: wilson + - type: Appearance + - type: Inventory + speciesId: wilson + templateId: pet + - type: DamageStateVisuals + states: + Alive: + Base: wilson + Critical: + Base: wilson_dead + Dead: + Base: wilson_dead + - type: Grammar + attributes: + gender: epicene - type: startingGear id: ShirosVest diff --git a/Resources/Prototypes/SimpleStation14/ai_factions.yml b/Resources/Prototypes/SimpleStation14/ai_factions.yml new file mode 100644 index 0000000000..42202a2c2e --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/ai_factions.yml @@ -0,0 +1,8 @@ +- type: faction + id: PetCat + hostile: + - RatPassive + - RatHostile + - SimpleHostile + - Xeno + - Dragon diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index db7632549b..ca3f2e6613 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -8,6 +8,7 @@ - SimpleHostile - Xeno - Pet + - PetCat - type: faction id: NanoTrasen @@ -28,6 +29,7 @@ - Xeno - Dragon - Pet + - PetCat - type: faction id: SimpleNeutral @@ -66,6 +68,7 @@ - NanoTrasen - Syndicate - Pet + - CatPet - type: faction id: Pet diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json index d74e9747ec..81cb2be146 100644 --- a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json @@ -32,6 +32,32 @@ 1 ] ] + }, + { + "name": "wilson", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "wilson_dead", + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7351f41f8f4f0c7c6d6e7e96b4ec02dd7d0387 GIT binary patch literal 882 zcmV-&1C9KNP)Px&EJ;K`RCt{2n!QfrKoH0OKAi+9=$s-^3cIqPp`xK955Yt3JJ@tIsc4LxX0}Km zim2?ubaMra&v8D8*TLv?^J|>l&Cbkzjjf#l6h%=KMNt$*Q4~c{6h%1}V+_}y|CN4Y z3};!!0FY%F_icnRhKY!iBmogQ>;K)wh>MF05D}l9oplk@i7*WNUwtBCX6DgowDBaO zUW_3k78?YqYb)!QiveX>q9_W)ag6bJj5v-_6a~t%bP?x75CjLy$Ko^rg75o?;~2j0 zcMTeutE(&T#P;okh&%vW+x@e?7Xz4?dA(k9p69$? zuY30a^|N39-BwnoBLD#J@9$kjIAg6v5CpK+I?Hf&g4S9LheH6sa5#juwl^mz`s=vr zcisWB*$lwn!ArR>>Rvwx0_V4Yv(qrf@XgIlRi4dexWB*e#|h!X4>aq-FziRad~zze0-F)qmG2Eyd*x{-rnNnB|WKJ|^Mv^0F#hYe7WbSJ@c5qBBKN005#W!t3knQHGC3BhIo6z{hTC z@>MKQY^~e#{QTT5dc7+Hqb+%!bDE}{rs+ly<13ORf%MDsytUq4w(rxmH$NZ@L$BVk zZS1WmifYTX8N9Gst-R@US{=z zcf%3ZkK{om;(TOwo2!^*88h?F**w&C3YfV{&OD|~k|>F&a>mVmTTZaAM5jLZ{N^|~ zp4J&6Q51Re`Fv-7?sB=@+tw9h4A19tESJlz0ZCgFMXeX_59+tY?<~YBKmY&$07*qo IM6N<$g0!rrjQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..a90e1f7721b42b3cac145d239f71cd75a4c1e19b GIT binary patch literal 390 zcmV;10eSw3P)Px$KuJVFR9J=WlrfHjFc3vQ(zfa2hypi6$`L4Y2yRHjA$*KMR6~KBh6)#yv(187 zVw?@DEmrcYkVo*J#~y%4Boc{4B9X{{p{{Fb+g6M*yR|=;5Ru)WP%XsA@3r^VG0{}SZ(D(hZT>to1WM&p35+ZtfKlmT0sw!b-JRT1?=MIlisADhN kF;B!W3{sZm&)W9}pNax3B*MxbkpKVy07*qoM6N<$f< Date: Mon, 12 Jun 2023 14:34:27 -0400 Subject: [PATCH 22/27] slimeball made to actually contain slime --- .../Entities/Consumable/Food/meat.yml | 13 +++++++++++++ .../SimpleStation14/Entities/Mobs/NPCs/animals.yml | 2 +- .../SimpleStation14/Entities/Mobs/NPCs/pets.yml | 10 +++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml index b9acc5f338..a99d031438 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml @@ -21,3 +21,16 @@ reagents: - ReagentId: ShirosDelight Quantity: 30 +- type: entity + name: slimeball + parent: FoodMeatSlime + id: FoodMeatSlimeWithSlime + description: A gelatinous shaping of slime jelly. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Slime + Quantity: 30 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 0564b2e36f..cb9d4900a4 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -158,7 +158,7 @@ Base: shiro_dead - type: Butcherable spawned: - - id: FoodMeatSlime + - id: FoodMeatSlimeWithSlime amount: 3 - type: InteractionPopup successChance: 1.0 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 3b9be74023..e8aebc9b0e 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -383,7 +383,7 @@ name: Wilson parent: MobFoxBaby id: MobFoxBabyWilson - description: "A two tailed fox of two tales: Music and salvage." + description: "A two-tailed fox of two tales: music and salvage." components: - type: Butcherable spawned: @@ -397,7 +397,7 @@ state: wilson - type: Appearance - type: Inventory - speciesId: wilson + speciesId: baby_fox templateId: pet - type: DamageStateVisuals states: @@ -409,7 +409,11 @@ Base: wilson_dead - type: Grammar attributes: - gender: epicene + gender: female + proper: true + - type: Faction + factions: + - Pet - type: startingGear id: ShirosVest From f59ee9d45f25822a3cb88f70866595931c1fc9b8 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 15 Jun 2023 00:28:27 -0400 Subject: [PATCH 23/27] InventorySlots component that was missing from certain mobs --- .../SimpleStation14/Entities/Mobs/NPCs/animals.yml | 5 ++++- .../Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index cb9d4900a4..8968f9f1c9 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -16,8 +16,9 @@ state: baby_fox - type: Appearance - type: Inventory - speciesId: baby_fox + speciesId: fox templateId: pet + - type: InventorySlots - type: DamageStateVisuals states: Alive: @@ -35,6 +36,7 @@ parent: SimpleMobBase id: MobCatNoAccent description: Feline pet, very funny. + abstract: true components: - type: Sprite drawdepth: Mobs @@ -143,6 +145,7 @@ - type: Inventory speciesId: shiro templateId: pet + - type: InventorySlots - type: Strippable - type: UserInterface interfaces: diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index e8aebc9b0e..63eb8f19a1 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -211,6 +211,7 @@ flavorKind: station-event-random-sentience-flavor-primate - type: Inventory templateId: monkey + - type: InventorySlots - type: Fixtures fixtures: - shape: @@ -396,9 +397,6 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: wilson - type: Appearance - - type: Inventory - speciesId: baby_fox - templateId: pet - type: DamageStateVisuals states: Alive: From de3a4e3bea88735bec32b1d3b1615822ca17cb97 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 19 Jun 2023 12:18:47 -0400 Subject: [PATCH 24/27] hughes unique texture --- .../Entities/Mobs/NPCs/pets.yml | 14 +++---- .../Mobs/Pets/hughes.rsi/crawling.png | Bin 0 -> 2607 bytes .../Mobs/Pets/hughes.rsi/dead.png | Bin 0 -> 674 bytes .../Mobs/Pets/hughes.rsi/meta.json | 37 ++++++++++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png create mode 100644 Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 63eb8f19a1..d79097b95b 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -123,7 +123,7 @@ solutions: melee: reagents: - - ReagentId: Desoxyephedrine + - ReagentId: Synaptizine Quantity: 40 - type: MeleeChemicalInjector solution: melee @@ -132,7 +132,7 @@ solution: melee generated: reagents: - - ReagentId: Desoxyephedrine + - ReagentId: Synaptizine Quantity: 0.5 - type: MeleeWeapon animation: WeaponArcClaw @@ -167,7 +167,7 @@ prototypes: [ ShirosVest ] - type: entity - name: Problems + name: problems id: MobCatProblems parent: MobCatNoAccent description: Defender of the medbay... from mice anyway. @@ -309,7 +309,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: crawling - sprite: Mobs/Animals/gorilla.rsi + sprite: SimpleStation14/Mobs/Pets/hughes.rsi - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] color: "#ffffff" sprite: Objects/Misc/handcuffs.rsi @@ -358,8 +358,8 @@ - type: MobThresholds thresholds: 0: Alive - 100: Critical - 200: Dead + 110: Critical + 220: Dead - type: Damageable damageContainer: Biological damageModifierSet: Oni @@ -370,7 +370,7 @@ animation: WeaponArcFist damage: types: - Blunt: 7 + Blunt: 8 - type: RandomBark barks: - Grunt. diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png new file mode 100644 index 0000000000000000000000000000000000000000..748baf4e465d8b678cd0a08a7b8d6cf29624c66f GIT binary patch literal 2607 zcmV+~3efe5P)Px;=}AOERCt{2oK0^V#~H`}blihQgjgeED z&ye&ZB&PyB<_iQl^&1odio%u-sVvzC_fW>AmB<#X#U>2JB~4NXE7=~%XY}ms%)XIo z5O{uoA@1(XJTLpq%dYnsz+f;K3w(VD|OK_ZhP%&<5BS@ zK5K3PIG^#LY}@|IaviGfM>x(tnyo#gaX{h-XtwsSvRnrM?D|*miyN=uhd;9L)t4T2 zpZpg^R_^=6g|rn8pFF_o+8RFoL2dE64*-Lq2LPy6 zegdm-8Nj&DQx_bL1^~tmaNI8d0P}eZ0B~^ld88hZU7)eP;d}iyynb7p8;%C(dCyQ^ zTNCH@c6WsmV@29{k17&6B$ag0VwZ-cJ;{gOlf3N>Fs?{a* zJQqc)f+P2yhzwqi>i3^_wNapS01YDiPLKb(!dMlm^25;pjr9$GnlXV4CFAJsldOfx zwNOOz<0!PVfE?z)IMjHEbH-6I2%IZgl|ZPbL2gTKH|jWPJAlRk&DLJ1qT`%}yzB&i z%*&Ai)2t0>d{K2N-8o%(6|oB;-VpESG}6)?=7S*BNg9SpWS>|4NC&7I;9cX$-C=`H zvOAO%KK0U6%pETGc>rSS)3u{QI|g|Dwh+R@mA^X^l$DzOUaaNGl*^mzL0 zF`hnq46onD(L`qR(Y?UmBljRwR@PBPYy`+&r4g2at{Ingfys4h}!RRkrPK2SYChoEgu@8vub-VPLkoI+jaLXm>idbh08JhE!7s zHJYEB7ytPAxcVu`0YG(f6J+B7gqG;MTvc)NR75&J)sLv*;b;(u1}>1wXYKz0(C&1^ zZ>vzAM4B`;OHQXUeEH7XQ4u)?IPO89F*@hC2dGwRunJ}HeyXZJ4KGelMH^fXF0*PM*hqjFO?8$pR+_0A8<`Q?2+^^$Z4s z!C){L3< znYjZf;gWIG+J1kQ3eU^|W!v_vl^RrOHbtuf$Jxj2g}gTL5*UA8e|sSh$Jtk=+$~JL z1)k;Scr$ST8Q*{21#p(WLK$8?&qcMmgkAp%-n#uR-g*1IkOA+!{ht5U?RT;3UlDo1 zybWrz|GYa>Crs@CSrJlnI2s6t5cRb+{N=BIMtyB9P_Jy;KEKB4Kko+GjFO#&%p)oZ zUsq&s~7;hjL;-~RrO0LGg!sEj{6YO$RpY9ft}Qh1xKy-Zv9q^_Xa z&4nje${A)n8st1<9s%5;a%!BaO*yKv>>vZAbU@TrHk384OSO}CqL3A(wh5Ktz*+W~ zPKUHkP!^8IK=yp58+yC798|1-?;1NLEUywqie3HAvy93pwwvJdHqbdSuaQ)4#KM9>=TVx%? zG$`PJf_Vxp-$sKBh}r>4rdnMJ)TOp~+OBRdApk<(Qt2#@;L@cM zN+mnA8Wj#u8P9(c6o#}+<+=Nu=A)g!c{)x)T-~HP$Tn~%5Ep>6z9$<@VbkpfQ&MzE z(LBp^p;8l(A#baZ1lqB#=edF9wQf5OStrt)M=o$?BiS5S2b`RA15V(Ece|Z{=i~v8 z!v{oCIB7OFLG{jL21A~YEu59*dPr|>lk5=D1xTP=K&Kd2M22>A;Ks|V!zipmSvaiO z+6(L)5hXirvlg&~+DGdnB85i9=HOYRaS0u+6`KWOmBn; z3h^j~c$uhjs%xt7Px@$`l*|!uPMPAFm`0a?1ERbsU!&u=mmAY47uSYPhctGCx_}(A zT$%ISH+)*SZgCFdL~f)MS2<~Uel1NqQASOpkHKIt7z_r3!C){L42GAR{{h>1(e*z* R!_xo&002ovPDHLkV1hyr>qP(n literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..1c28758d25f9b2cda3d8851d73395c9b982f1a26 GIT binary patch literal 674 zcmV;T0$u%yP)Px%TuDShRA_|PCsFu>O4Hk0W%ZsN{HmKvznnzMGdMY&XAYjc}? zVF!RwH~`?=k57^3he5Dbs<~wkNTqRc`CcwnBF}rq%sgXOP9oE-XUt4Qe7_hGmjr;c zmaLS<(gXl}zi0)ea`}XLI{Ui^i3Kc6BjQjhjwAgS;eP)nBCd(g34mb`ENBTim`^m% zm|3}0iS$&i+uatE=@|Gs`6TkmbZqa*m^hv>0ExwI$P)AYBK`giPs$Ade*OGz1w?Qd z1k`IyJ6KF;(WJQ`Bqfp4;?G~c;@$f3-%Sk20ng%3&6$Yai#&CNIao5VkTZk4Cp_&?%Z;Eaz(!I zkWS~8Q8ad7w?2X^4Xs@r`COIayT3ghr{7;I2`xNZ=e`Pth^8oK>z>%07*qo IM6N<$f&h;>LjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json new file mode 100644 index 0000000000..050c1fb128 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "states": [ + { + "name": "dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "crawling", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} From df045444c0db2fd6cf5dd0568ee489e95d136a26 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Mon, 19 Jun 2023 15:55:25 -0400 Subject: [PATCH 25/27] accents brown hughes other things? --- Resources/Locale/en-US/accent/accents.ftl | 24 ++++++++++++ .../Accents/full_replacements.yml | 28 ++++++++++++++ .../Body/Prototypes/animalslime.yml | 18 +++++++++ .../Entities/Mobs/NPCs/animals.yml | 6 ++- .../Entities/Mobs/NPCs/pets.yml | 36 ++++++++++++++---- .../Mobs/Pets/hughes.rsi/crawling.png | Bin 2607 -> 2636 bytes .../Mobs/Pets/hughes.rsi/dead.png | Bin 674 -> 683 bytes 7 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml create mode 100644 Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl index ebb14f6fd0..5e3e4c35f6 100644 --- a/Resources/Locale/en-US/accent/accents.ftl +++ b/Resources/Locale/en-US/accent/accents.ftl @@ -74,3 +74,27 @@ accent-words-mothroach-2 = Chirp! accent-words-mothroach-3 = Peep! accent-words-mothroach-4 = Eeee! accent-words-mothroach-5 = Eep! + +## Parkstation +# Slimecat +accent-words-slimecat-1 = Squish. +accent-words-slimecat-2 = Splort. +accent-words-slimecat-3 = Meow! +accent-words-slimecat-4 = Mew! +accent-words-slimecat-5 = Mow. + +# Shiro +accent-words-shiro-1 = Shiro. +accent-words-shiro-2 = Shiro! +accent-words-shiro-3 = Meow! +accent-words-shiro-4 = Squish. +accent-words-shiro-5 = Squish! + +# problems +accent-words-problems-1 = Meow! +accent-words-problems-2 = Mew. +accent-words-problems-3 = problems. +accent-words-problems-4 = Squish! +accent-words-problems-5 = Gurgle. +accent-words-problems-6 = Merp. +accent-words-problems-7 = uwu. diff --git a/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml b/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml new file mode 100644 index 0000000000..f073859605 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml @@ -0,0 +1,28 @@ +- type: accent + id: slimecat + fullReplacements: + - accent-words-slimecat-1 + - accent-words-slimecat-2 + - accent-words-slimecat-3 + - accent-words-slimecat-4 + - accent-words-slimecat-5 + +- type: accent + id: shiro + fullReplacements: + - accent-words-shiro-1 + - accent-words-shiro-2 + - accent-words-shiro-3 + - accent-words-shiro-4 + - accent-words-shiro-5 + +- type: accent + id: problems + fullReplacements: + - accent-words-problems-1 + - accent-words-problems-2 + - accent-words-problems-3 + - accent-words-problems-4 + - accent-words-problems-5 + - accent-words-problems-6 + - accent-words-problems-7 diff --git a/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml b/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml new file mode 100644 index 0000000000..ac94baa575 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml @@ -0,0 +1,18 @@ +- type: body + id: AnimalSlime + name: "animalslime" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - legs + organs: + core: SentientSlimeCore + lungs: OrganSlimeLungs + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml index 8968f9f1c9..759e517963 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -130,6 +130,8 @@ state: shiro color: "#FF00FF" alpha: 200 + - type: Body + prototype: AnimalSlime - type: Physics - type: Fixtures fixtures: @@ -169,6 +171,8 @@ interactFailureString: petting-failure-generic interactSuccessSound: path: /Audio/Animals/fox_squeak.ogg + - type: ReplacementAccent + accent: slimecat - type: Grammar attributes: gender: epicene @@ -218,7 +222,7 @@ types: Blunt: 1 Slash: 3 - Piercing: 2 + Piercing: 3 - type: Faction factions: - PetCat diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index d79097b95b..9e4c1987fa 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -113,21 +113,23 @@ attributes: proper: true gender: female + - type: ReplacementAccent + accent: shiro - type: DraconicBloodstream reagent: solutionName: chemicals reagent: ShirosDelight - unitsPerUpdate: 1.0 + unitsPerUpdate: 0.5 accumulatorTime: 5.0 - type: SolutionContainerManager solutions: melee: reagents: - ReagentId: Synaptizine - Quantity: 40 + Quantity: 30 - type: MeleeChemicalInjector solution: melee - transferAmount: 2.0 + transferAmount: 1.0 - type: SolutionRegeneration solution: melee generated: @@ -159,26 +161,36 @@ tags: - CannotSuicide - type: GhostTakeoverAvailable - makeSentient: true - whitelistRequired: true + - type: GhostRole + makeSentient: false + whitelistRequired: false name: Shiro - description: Be Shiro! Be fast! Always be fast! + description: Be Shiro! Be fast! Always be fast! Don't be mean! - type: Loadout prototypes: [ ShirosVest ] - type: entity name: problems - id: MobCatProblems - parent: MobCatNoAccent + id: MobSlimeCatProblems + parent: MobSlimeCat description: Defender of the medbay... from mice anyway. components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + cat: "" - type: Sprite drawdepth: Mobs sprite: SimpleStation14/Mobs/Pets/problems.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat + alpha: 200 - type: Appearance + - type: Butcherable + spawned: + - id: FoodShiroSlime + amount: 3 - type: DamageStateVisuals states: Alive: @@ -190,6 +202,8 @@ - type: Tag tags: - CannotSuicide + - type: ReplacementAccent + accent: problems - type: Grammar attributes: proper: true @@ -200,6 +214,12 @@ interactFailureString: petting-failure-generic interactSuccessSound: path: /Audio/Animals/cat_meow.ogg + - type: GhostTakeoverAvailable + - type: GhostRole + makeSentient: false + whitelistRequired: false + name: problems + description: Be a problems. Eat live power cables. Or not. Who cares? You're a cat. - type: entity name: Jack Parker diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png index 748baf4e465d8b678cd0a08a7b8d6cf29624c66f..92079e5ffda539150a3bf140466d24fb842e1155 100644 GIT binary patch delta 2615 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 diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png index 1c28758d25f9b2cda3d8851d73395c9b982f1a26..c2211f45d8dc9e86b91286d00a0796c4e1f7fb75 100644 GIT binary patch delta 645 zcmV;00($+T1*-*+F@I%AL_t(&f$f&RYZ_q~$3KxGA(h+>(sB?j9Rfi_2yKuIEp!n| z*VHW83R#=~pyog5oHo! z)pBuKZ?&o9b8K#`vz5*O(3uPX_;~d*@Vwvct(0nN(F0OxSX{nW^0~nCuIEf$hI zAknSsIa3iSxY>ZXBml&w2qAe>4XEPCkjeKN_2RGA4}cIRKHxt;rHA zxLF$h4X++N0^rl&mk|&_zuTi)E}Fq&LW@St1tBVlloo&U{3UO{ex^AY^7`ouo@E|V zaI>bzuIB_+h4j7NY9|WoB*JYrlTi0^zqH5U`5Dd0kbnIrdu*jMftYnmPD;Bb0d2zX z_6WCB88Ig2R>4VW7l4bS62{-{n0q-R7^CX#f<@VbETb7n~)7lkI}>#U3gfCse_&Exzn&S z87wvVk__BiG*EBF9cBsW(@;_fwFzF@Ic1L_t(&f$f&RYZ_q~$3KxyNkHM{ARMK15TQ;P62(bL1I4AK zYx+lIOtvOl(k=f)w?elrrL+Ulj%5a;?72v8mQNr zvv#*dxm00mbDMl&2Y^vH0N~q?Pm$+`L9kY;xn&PXrEzijUM^K4&wIwqJY!Z)BGavB z%uGalzZemh1c0=btdz#m1OR-$Xa%Km`Gk2o`@08;1uRP=;!rA%BmEcQe*Y#Su8GeH zfMF0UXbCx(Pk%Jem|3}0iS$&i+uatE=@|Gs`6TkmbZqa*m^hv>0ExwI$P)AYBK`gi zPs$Ade*OGz1w?Qd1k`IyJ6KF;(WJQ`Bqfp4;?G~c;@$fPG-4)R zM-1pcxbEC?dU8d+@Q_aDmQgr}v`8;Yz%EPKvIU(&iizY^FbaEix#?9P;`(~cs;x0= z0HOy@nsu12dNLhnor;+zw74~(ZmzWxY7??y=`or#qe~A9F}1&Yuy7iV!of Date: Thu, 29 Jun 2023 12:07:40 -0400 Subject: [PATCH 26/27] hat wearing looks better and lawyer typing indicators --- .../Entities/Mobs/NPCs/pets.yml | 6 +++-- .../jackparker_inventory_template.yml | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 9e4c1987fa..240ff05477 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -230,7 +230,7 @@ - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-primate - type: Inventory - templateId: monkey + templateId: jackparker - type: InventorySlots - type: Fixtures fixtures: @@ -301,7 +301,7 @@ barkMultiplier: 0.65 barks: - Oooook. - - Aaaaaaah. + - Ahahah. - Ook ah. - Ook. - Ook ook! @@ -309,6 +309,8 @@ attributes: proper: true gender: male + - type: TypingIndicator + proto: lawyer - type: Tag tags: - CannotSuicide diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml new file mode 100644 index 0000000000..b346745a37 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml @@ -0,0 +1,25 @@ +- type: inventoryTemplate + id: jackparker + slots: + - name: head + slotTexture: head + slotFlags: HEAD + slotGroup: MainHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Head + offset: 0, -0.10 + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID From 10f396eff7ee7276c2896aaff8847c0529d8002f Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 29 Jun 2023 12:10:41 -0400 Subject: [PATCH 27/27] hchaged offset --- .../InventoryTemplates/jackparker_inventory_template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml index b346745a37..fa56eeb752 100644 --- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml @@ -8,7 +8,7 @@ uiWindowPos: 0,0 strippingWindowPos: 0,0 displayName: Head - offset: 0, -0.10 + offset: 0, -0.08 - name: mask slotTexture: mask slotFlags: MASK