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

Taser Nerf and Blood No Longer Slips #8008

Merged
merged 2 commits into from
May 8, 2022
Merged

Taser Nerf and Blood No Longer Slips #8008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09f5d1f
Update battery_guns.yml
Emisse May 8, 2022
a0667ca
Update puddle.yml
Emisse May 8, 2022
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
24 changes: 17 additions & 7 deletions Resources/Prototypes/Entities/Effects/puddle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
path: /Audio/Effects/Fluids/splat.ogg
recolor: true
- type: Clickable
- type: Slippery
launchForwardsMultiplier: 2.0
- type: Evaporation
- type: Physics
- type: Fixtures
Expand Down Expand Up @@ -57,6 +55,8 @@
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0

- type: entity
name: puddle
Expand All @@ -73,7 +73,9 @@
visuals:
- type: PuddleVisualizer
recolor: true

- type: Slippery
launchForwardsMultiplier: 2.0

- type: entity
name: puddle
id: PuddleSplatter
Expand All @@ -88,7 +90,9 @@
- type: Appearance
visuals:
- type: PuddleVisualizer

- type: Slippery
launchForwardsMultiplier: 2.0

- type: entity
id: PuddleBlood
name: blood
Expand Down Expand Up @@ -131,7 +135,9 @@
- type: Appearance
visuals:
- type: PuddleVisualizer

- type: Slippery
launchForwardsMultiplier: 2.0

- type: entity
name: toxins vomit
id: PuddleVomitToxin
Expand All @@ -154,7 +160,9 @@
- type: Appearance
visuals:
- type: PuddleVisualizer

- type: Slippery
launchForwardsMultiplier: 2.0

- type: entity
name: writing
id: PuddleWriting
Expand All @@ -170,4 +178,6 @@
- type: Appearance
visuals:
- type: PuddleVisualizer

- type: Slippery
launchForwardsMultiplier: 2.0

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
- type: BatteryBarrel
minAngle: 5
angleIncrease: 20
fireCost: 80
fireCost: 360
ammoPrototype: BulletTaser
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser.ogg
Expand Down