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.

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

Friend Shaped #132

Merged
merged 28 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b89c8c7
Update xeno.yml
fenndragon Aug 21, 2024
dfd5f85
Update xeno.yml
fenndragon Aug 21, 2024
9d62284
reverting changes
fenndragon Aug 21, 2024
2c26461
Update xeno.yml
fenndragon Aug 21, 2024
e017971
Update xeno.yml
fenndragon Aug 21, 2024
c1a3328
Update pets.yml
fenndragon Aug 21, 2024
d790796
Update pets.yml
fenndragon Aug 21, 2024
45a42ae
Update pets.yml
fenndragon Aug 21, 2024
d9fbb9e
Update xeno.yml
fenndragon Aug 21, 2024
f70e76a
Update xeno.yml
fenndragon Aug 21, 2024
9a169c8
Update xeno.yml
fenndragon Aug 22, 2024
fcd5636
Update xeno.yml
fenndragon Aug 22, 2024
bfbb21e
Update xeno.yml
fenndragon Aug 22, 2024
1fa6aa5
rouny texture shift
fenndragon Aug 22, 2024
7c30f26
Merge branch 'Fansana:master' into master
fenndragon Aug 22, 2024
79d9a75
Update pets.yml
fenndragon Aug 22, 2024
487b731
Create Xeno.yml
fenndragon Aug 22, 2024
e18ae03
Update xeno.yml
fenndragon Aug 22, 2024
1de1f36
Update xeno.yml
fenndragon Aug 22, 2024
cb08895
Merge branch 'Fansana:master' into friend-shaped
fenndragon Aug 23, 2024
cf1bde0
Merge branch 'Fansana:master' into friend-shaped
fenndragon Aug 23, 2024
d46a4ef
Update xeno.yml
fenndragon Aug 23, 2024
d40a165
Merge branch 'Fansana:master' into friend-shaped
fenndragon Aug 23, 2024
68b498c
Update Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
fenndragon Aug 23, 2024
e12d1f9
Update Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
fenndragon Aug 23, 2024
932cb77
Update Xeno.yml
fenndragon Aug 23, 2024
2acb56b
Merge branch 'Fansana:master' into friend-shaped
fenndragon Aug 23, 2024
ee19a3e
Merge branch 'Fansana:master' into friend-shaped
fenndragon Aug 23, 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
26 changes: 16 additions & 10 deletions Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@
- MobMask
layer:
- MobLayer
- type: MobState
allowedStates:
- Alive
- Dead
actions:
Critical:
- ActionCritSuccumb
- ActionCritFakeDeath
- ActionCritLastWords
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
- type: MobThresholds
thresholds:
0: Alive
50: Dead
50: Critical
100: Dead
- type: SlowOnDamage
speedModifierThresholds:
25: 0.5
Expand Down Expand Up @@ -146,7 +148,8 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
100: Critical
150: Dead
- type: Stamina
critThreshold: 300
- type: SlowOnDamage
Expand Down Expand Up @@ -179,7 +182,8 @@
- type: MobThresholds
thresholds:
0: Alive
80: Dead
80: Critical
120: Dead
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
- type: SlowOnDamage
speedModifierThresholds:
40: 0.7
Expand Down Expand Up @@ -216,7 +220,8 @@
- type: MobThresholds
thresholds:
0: Alive
300: Dead
300: Critical
400: Dead
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
- type: SlowOnDamage
speedModifierThresholds:
150: 0.7
Expand Down Expand Up @@ -262,7 +267,8 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
100: Critical
150: Dead
- type: MovementSpeedModifier
baseSprintSpeed: 4
- type: MeleeWeapon
Expand Down Expand Up @@ -301,7 +307,7 @@
- type: MeleeWeapon
damage:
groups:
Brute: 5
Brute: 10
FoxxoTrystan marked this conversation as resolved.
Show resolved Hide resolved
- type: Fixtures
fixtures:
fix1:
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
name: Friendshaped
parent: MobXenoRunnerNPC
id: MobFriendshapedNPC
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeatRouny
amount: 3
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Binary file modified Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading