Skip to content

Commit

Permalink
Cherry-Pick Carrypets From Delta-V (#501)
Browse files Browse the repository at this point in the history
# Description
Cherry-picks DeltaV-Station/Delta-v#1145

All credit goes to the original author of the PR.

Original description is: "adds carriable component to a lot of animals
that didn't have it"

---

# Why

## Renault my beloved!!!

---


<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/69920617/12777e9b-7d00-4df2-8703-a7f9e42ea1c6)


</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Froffy025
- add: You can now carry most of the station pets.

---------

Signed-off-by: Froffy025 <78222136+Froffy025@users.noreply.github.com>
Co-authored-by: Froffy025 <78222136+froffy025@users.noreply.github.com>
  • Loading branch information
Mnemotechnician and Froffy025 authored Jul 5, 2024
1 parent e06045c commit 4609f9e
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 2 deletions.
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
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
- type: Speech
speechSounds: Squeak
speechVerb: SmallMob
Expand Down Expand Up @@ -188,6 +189,8 @@
noMovementLayers:
movement:
state: chicken-0
- type: Carriable
freeHandsRequired: 1
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -580,6 +583,8 @@
- MobMask
layer:
- MobLayer
- type: Carriable
freeHandsRequired: 1
- type: Tag
tags:
- DoorBumpOpener
Expand Down Expand Up @@ -840,6 +845,8 @@
noMovementLayers:
movement:
state: crab
- type: Carriable
freeHandsRequired: 1
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -907,6 +914,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: goat
sprite: Mobs/Animals/goat.rsi
- type: Carriable
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -999,6 +1007,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: goose
sprite: Mobs/Animals/goose.rsi
- type: Carriable
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -1245,6 +1254,7 @@
sprite: "Effects/creampie.rsi"
state: "creampie_human"
visible: false
- type: Carriable
- type: Hands
- type: GenericVisualizer
visuals:
Expand Down Expand Up @@ -1767,6 +1777,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: lizard
sprite: Mobs/Animals/lizard.rsi
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -1821,6 +1832,8 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: slug
sprite: Mobs/Animals/slug.rsi
- type: Carriable
freeHandsRequired: 1
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -1873,6 +1886,7 @@
noMovementLayers:
movement:
state: frog
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -1936,6 +1950,8 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: parrot
sprite: Mobs/Animals/parrot.rsi
- type: Carriable
freeHandsRequired: 1
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -1991,6 +2007,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: penguin
sprite: Mobs/Animals/penguin.rsi
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2124,6 +2141,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: snake
sprite: Mobs/Animals/snake.rsi
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2186,6 +2204,7 @@
noMovementLayers:
movement:
state: tarantula
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2371,6 +2390,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: possum
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2446,6 +2466,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: raccoon
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2510,6 +2531,7 @@
noMovementLayers:
movement:
state: fox
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2590,6 +2612,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: corgi
- type: Carriable
- type: Physics
- type: Speech
speechVerb: Canine
Expand Down Expand Up @@ -2746,6 +2769,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: cat
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -2925,6 +2949,8 @@
Base: kitten_dead
Dead:
Base: kitten_dead
- type: Carriable
freeHandsRequired: 1
- type: Butcherable
spawned:
- id: FoodMeat
Expand Down Expand Up @@ -2955,6 +2981,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: sloth
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -3016,6 +3043,7 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: ferret
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -3217,6 +3245,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: pig
sprite: Mobs/Animals/pig.rsi
- type: Carriable
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -3292,6 +3321,7 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: nymph
sprite: Mobs/Animals/nymph.rsi
- type: Carriable
- type: Physics
- type: Fixtures
fixtures:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
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 # This one 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
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
freeHandsRequired: 1
- type: CombatMode
- type: MovementSpeedModifier
baseWalkSpeed : 3.5
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
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
- type: Fixtures
fixtures:
fix1:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/space.yml
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

0 comments on commit 4609f9e

Please sign in to comment.