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

Add In-Hand Sprites to the Snapop Box and Decoy Balloons #34964

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
description: Contains snap pops for a few minutes of popping fun!
components:
- type: Item
inhandVisuals:
left:
- state: spbox-inhand-left
right:
- state: spbox-inhand-right
size: Normal
- type: Sprite
sprite: Objects/Fun/toys.rsi
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/decoys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
description: Upon closer inspection, this Syndicate operative is actually a balloon.
components:
- type: Sprite
inhandVisuals:
left:
- state: inter-inhand-left
right:
- state: inter-inhand-right
sprite: Objects/Tools/Decoys/operative_decoy.rsi
layers:
- state: oballoon
Expand All @@ -84,6 +89,11 @@
description: Upon closer inspection, this Syndicate agent is actually a balloon.
components:
- type: Sprite
inhandVisuals:
left:
- state: inter-inhand-left
right:
- state: inter-inhand-right
sprite: Objects/Tools/Decoys/agent_decoy.rsi
layers:
- state: aballoon
Expand All @@ -99,6 +109,11 @@
description: Upon closer inspection, this Syndicate elite operative is actually a balloon.
components:
- type: Sprite
inhandVisuals:
left:
- state: inter-inhand-left
right:
- state: inter-inhand-right
sprite: Objects/Tools/Decoys/elite_decoy.rsi
layers:
- state: eballoon
Expand All @@ -116,6 +131,11 @@
description: Upon closer inspection, this Syndicate juggernaut is actually a balloon.
components:
- type: Sprite
inhandVisuals:
left:
- state: inter-inhand-left
right:
- state: inter-inhand-right
sprite: Objects/Tools/Decoys/juggernaut_decoy.rsi
layers:
- state: jballoon
Expand All @@ -131,6 +151,11 @@
description: Upon closer inspection, this Syndicate commander is actually a balloon.
components:
- type: Sprite
inhandVisuals:
left:
- state: inter-inhand-left
right:
- state: inter-inhand-right
sprite: Objects/Tools/Decoys/commander_decoy.rsi
layers:
- state: cballoon
Expand Down
8 changes: 8 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,14 @@
{
"name": "spbox"
},
{
"name": "spbox-inhand-right",
"directions": 4
},
{
"name": "spbox-inhand-left",
"directions": 4
},
{
"name": "toy_mouse"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
{
"name": "folded"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "aballoon",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
{
"name": "folded"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "cballoon",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
{
"name": "folded"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "eballoon",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
{
"name": "folded"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "jballoon",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
{
"name": "folded"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "oballoon",
"directions": 4
Expand Down
Loading