From 4081e569c8c4682f6580310c248434799d7ce61e Mon Sep 17 00:00:00 2001 From: Froffy025 <78222136+froffy025@users.noreply.github.com> Date: Sat, 18 May 2024 15:43:45 -0400 Subject: [PATCH 1/2] carrypets * carrypets * carrypets * Update regalrat.yml Signed-off-by: Froffy025 <78222136+Froffy025@users.noreply.github.com> --------- Signed-off-by: Froffy025 <78222136+Froffy025@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 30 +++++++++++++++++++ .../Prototypes/Entities/Mobs/NPCs/carp.yml | 1 + .../Entities/Mobs/NPCs/regalrat.yml | 2 ++ .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 3 +- .../Prototypes/Entities/Mobs/NPCs/space.yml | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 369544fdc1b..b73d79deb28 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -13,6 +13,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: bat sprite: Mobs/Animals/bat.rsi + - type: Carriable #DeltaV - type: Speech speechSounds: Squeak speechVerb: SmallMob @@ -180,6 +181,8 @@ noMovementLayers: movement: state: chicken-0 + - type: Carriable #Delta-V + freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -571,6 +574,8 @@ - MobMask layer: - MobLayer + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: Tag tags: - DoorBumpOpener @@ -819,6 +824,8 @@ noMovementLayers: movement: state: crab + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -880,6 +887,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goat sprite: Mobs/Animals/goat.rsi + - type: Carriable #DeltaV - type: Fixtures fixtures: fix1: @@ -972,6 +980,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goose sprite: Mobs/Animals/goose.rsi + - type: Carriable #DeltaV - type: Fixtures fixtures: fix1: @@ -1218,6 +1227,7 @@ sprite: "Effects/creampie.rsi" state: "creampie_human" visible: false + - type: Carriable #DeltaV - type: Hands - type: GenericVisualizer visuals: @@ -1736,6 +1746,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: lizard sprite: Mobs/Animals/lizard.rsi + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -1790,6 +1801,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: slug sprite: Mobs/Animals/slug.rsi + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -1842,6 +1855,7 @@ noMovementLayers: movement: state: frog + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -1893,6 +1907,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -1948,6 +1964,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: penguin sprite: Mobs/Animals/penguin.rsi + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2077,6 +2094,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: snake sprite: Mobs/Animals/snake.rsi + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2131,6 +2149,7 @@ noMovementLayers: movement: state: tarantula + - type: Carriable #DeltaV ##shiva deserves to be held - type: Physics - type: Fixtures fixtures: @@ -2315,6 +2334,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: possum + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2390,6 +2410,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: raccoon + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2454,6 +2475,7 @@ noMovementLayers: movement: state: fox + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2534,6 +2556,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: corgi + - type: Carriable #DeltaV - type: Physics - type: Speech speechVerb: Canine @@ -2689,6 +2712,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2867,6 +2891,8 @@ Base: kitten_dead Dead: Base: kitten_dead + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: Butcherable spawned: - id: FoodMeat @@ -2897,6 +2923,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: sloth + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -2954,6 +2981,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ferret + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: @@ -3153,6 +3181,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: pig sprite: Mobs/Animals/pig.rsi + - type: Carriable #DeltaV - type: Fixtures fixtures: fix1: @@ -3228,6 +3257,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: nymph sprite: Mobs/Animals/nymph.rsi + - type: Carriable #DeltaV - type: Physics - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 3e6c603626b..1a6e8a7d504 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -22,6 +22,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive + - type: Carriable #DeltaV - this is for you, deltanedas o7 - type: CombatMode - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 50fe3b6765e..e7aa876e9e5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -170,6 +170,8 @@ description: He's da mini rat. He don't make da roolz. noSpawn: true #Must be configured to a King or the AI breaks. components: + - type: Carriable #DeltaV + freeHandsRequired: 1 - type: CombatMode - type: MovementSpeedModifier baseWalkSpeed : 3.5 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 901bf149cbc..797ea3b6085 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: basic slime id: MobAdultSlimes parent: [ SimpleMobBase, MobCombat ] @@ -17,6 +17,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: blue_adult_slime + - type: Carriable #DeltaV - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 9ea2d784dbb..9b79d67f408 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: basic id: MobSpaceBasic parent: SimpleSpaceMobBase From 2b133b4f432d807e50f7e1b5e1219f9639d31094 Mon Sep 17 00:00:00 2001 From: fox Date: Tue, 2 Jul 2024 00:56:25 +0300 Subject: [PATCH 2/2] Ctrl-shift-R troll --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 50 +++++++++---------- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 2 +- .../Entities/Mobs/NPCs/regalrat.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index b73d79deb28..b5437225744 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -13,7 +13,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: bat sprite: Mobs/Animals/bat.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Speech speechSounds: Squeak speechVerb: SmallMob @@ -181,7 +181,7 @@ noMovementLayers: movement: state: chicken-0 - - type: Carriable #Delta-V + - type: Carriable freeHandsRequired: 1 - type: Fixtures fixtures: @@ -574,7 +574,7 @@ - MobMask layer: - MobLayer - - type: Carriable #DeltaV + - type: Carriable freeHandsRequired: 1 - type: Tag tags: @@ -824,7 +824,7 @@ noMovementLayers: movement: state: crab - - type: Carriable #DeltaV + - type: Carriable freeHandsRequired: 1 - type: Physics - type: Fixtures @@ -887,7 +887,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goat sprite: Mobs/Animals/goat.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Fixtures fixtures: fix1: @@ -980,7 +980,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goose sprite: Mobs/Animals/goose.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Fixtures fixtures: fix1: @@ -1227,7 +1227,7 @@ sprite: "Effects/creampie.rsi" state: "creampie_human" visible: false - - type: Carriable #DeltaV + - type: Carriable - type: Hands - type: GenericVisualizer visuals: @@ -1746,7 +1746,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: lizard sprite: Mobs/Animals/lizard.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -1801,8 +1801,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: slug sprite: Mobs/Animals/slug.rsi - - type: Carriable #DeltaV - freeHandsRequired: 1 + - type: Carriable + freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -1855,7 +1855,7 @@ noMovementLayers: movement: state: frog - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -1907,7 +1907,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi - - type: Carriable #DeltaV + - type: Carriable freeHandsRequired: 1 - type: Fixtures fixtures: @@ -1964,7 +1964,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: penguin sprite: Mobs/Animals/penguin.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2094,7 +2094,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: snake sprite: Mobs/Animals/snake.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2149,7 +2149,7 @@ noMovementLayers: movement: state: tarantula - - type: Carriable #DeltaV ##shiva deserves to be held + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2334,7 +2334,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: possum - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2410,7 +2410,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: raccoon - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2475,7 +2475,7 @@ noMovementLayers: movement: state: fox - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2556,7 +2556,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: corgi - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Speech speechVerb: Canine @@ -2712,7 +2712,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2891,7 +2891,7 @@ Base: kitten_dead Dead: Base: kitten_dead - - type: Carriable #DeltaV + - type: Carriable freeHandsRequired: 1 - type: Butcherable spawned: @@ -2923,7 +2923,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: sloth - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2981,7 +2981,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ferret - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: @@ -3181,7 +3181,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: pig sprite: Mobs/Animals/pig.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Fixtures fixtures: fix1: @@ -3257,7 +3257,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: nymph sprite: Mobs/Animals/nymph.rsi - - type: Carriable #DeltaV + - type: Carriable - type: Physics - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 1a6e8a7d504..2aae27d31ef 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -22,7 +22,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive - - type: Carriable #DeltaV - this is for you, deltanedas o7 + - type: Carriable # This one is for you, deltanedas o7 - type: CombatMode - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index e7aa876e9e5..31a32333f3f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -170,7 +170,7 @@ description: He's da mini rat. He don't make da roolz. noSpawn: true #Must be configured to a King or the AI breaks. components: - - type: Carriable #DeltaV + - type: Carriable freeHandsRequired: 1 - type: CombatMode - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 797ea3b6085..f18b371c4c2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -17,7 +17,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: blue_adult_slime - - type: Carriable #DeltaV + - type: Carriable - type: Fixtures fixtures: fix1: