Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-Pick Carrypets From Delta-V #501

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Cherry-Pick Carrypets From Delta-V #501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4081e56
carrypets
Froffy025 May 18, 2024
2b133b4
Ctrl-shift-R troll
Mnemotechnician Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: bat
sprite: Mobs/Animals/bat.rsi
- type: Carriable #DeltaV
- type: Speech
Mnemotechnician marked this conversation as resolved.
Show resolved Hide resolved
speechSounds: Squeak
speechVerb: SmallMob
Expand Down Expand Up @@ -180,6 +181,8 @@
noMovementLayers:
movement:
state: chicken-0
- type: Carriable #Delta-V
freeHandsRequired: 1
Mnemotechnician marked this conversation as resolved.
Show resolved Hide resolved
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -571,6 +574,8 @@
- MobMask
layer:
- MobLayer
- type: Carriable #DeltaV
freeHandsRequired: 1
- type: Tag
tags:
- DoorBumpOpener
Expand Down Expand Up @@ -819,6 +824,8 @@
noMovementLayers:
movement:
state: crab
- type: Carriable #DeltaV
freeHandsRequired: 1
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -880,6 +887,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: goat
sprite: Mobs/Animals/goat.rsi
- type: Carriable #DeltaV
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -972,6 +980,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: goose
sprite: Mobs/Animals/goose.rsi
- type: Carriable #DeltaV
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -1218,6 +1227,7 @@
sprite: "Effects/creampie.rsi"
state: "creampie_human"
visible: false
- type: Carriable #DeltaV
- type: Hands
- type: GenericVisualizer
visuals:
Expand Down Expand Up @@ -1736,6 +1746,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: lizard
sprite: Mobs/Animals/lizard.rsi
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -1842,6 +1855,7 @@
noMovementLayers:
movement:
state: frog
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -1893,6 +1907,8 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: parrot
sprite: Mobs/Animals/parrot.rsi
- type: Carriable #DeltaV
freeHandsRequired: 1
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -1948,6 +1964,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: penguin
sprite: Mobs/Animals/penguin.rsi
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2077,6 +2094,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: snake
sprite: Mobs/Animals/snake.rsi
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2131,6 +2149,7 @@
noMovementLayers:
movement:
state: tarantula
- type: Carriable #DeltaV ##shiva deserves to be held
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2315,6 +2334,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: possum
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2390,6 +2410,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: raccoon
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2454,6 +2475,7 @@
noMovementLayers:
movement:
state: fox
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2534,6 +2556,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: corgi
- type: Carriable #DeltaV
- type: Physics
- type: Speech
speechVerb: Canine
Expand Down Expand Up @@ -2689,6 +2712,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: cat
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2867,6 +2891,8 @@
Base: kitten_dead
Dead:
Base: kitten_dead
- type: Carriable #DeltaV
freeHandsRequired: 1
- type: Butcherable
spawned:
- id: FoodMeat
Expand Down Expand Up @@ -2897,6 +2923,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: sloth
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2954,6 +2981,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: ferret
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -3153,6 +3181,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: pig
sprite: Mobs/Animals/pig.rsi
- type: Carriable #DeltaV
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -3228,6 +3257,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: nymph
sprite: Mobs/Animals/nymph.rsi
- type: Carriable #DeltaV
- type: Physics
- type: Fixtures
fixtures:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
name: basic slime
id: MobAdultSlimes
parent: [ SimpleMobBase, MobCombat ]
Expand All @@ -17,6 +17,7 @@
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: blue_adult_slime
- type: Carriable #DeltaV
- type: Fixtures
fixtures:
fix1:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/space.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
name: basic
id: MobSpaceBasic
parent: SimpleSpaceMobBase
Expand Down
Loading