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

Adds a Toy Which Makes Bwoink Sound #759

Merged
merged 8 commits into from
Sep 8, 2024
Merged
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
Binary file added Resources/Audio/Admin/adminhelp_old.ogg
Binary file not shown.
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,4 +392,6 @@
- id: ThronglerToy
prob: 0.30
orGroup: Prize

- id: BwoinkHammer
prob: 0.30
orGroup: Prize
28 changes: 28 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1745,6 +1745,34 @@
types:
Blunt: 0

- type: entity
parent: ToyHammer
id: BwoinkHammer
name: bwoink hammer
description: A toy hammer which makes a wildly terrifying sound. It is missing it's old spirit of bangammer and is still unraisinable.
suffix: DO NOT MAP
components:
- type: Sprite
sprite: Objects/Fun/bwoink_hammer.rsi
state: icon
- type: Item
size: Small
sprite: Objects/Fun/bwoink_hammer.rsi
- type: MeleeWeapon
soundHit:
path: /Audio/Admin/adminhelp_old.ogg
params:
variation: 0.03
volume: 3
soundNoDamage:
path: /Audio/Admin/adminhelp_old.ogg
params:
variation: 0.03
volume: 3
damage:
types:
Blunt: 0

- type: entity
parent: BaseItem
id: WhoopieCushion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,7 @@
- SingularityToy
- TeslaToy
- ToySword
- BwoinkHammer
- ThronglerToy
- type: MaterialStorage
whitelist:
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/prizecounter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,14 @@
materials:
PrizeTicket: 200

- type: latheRecipe
id: BwoinkHammer
result: BwoinkHammer
applyMaterialDiscount: false
completetime: 0.1
materials:
PrizeTicket: 200

- type: latheRecipe
id: ThronglerToy
result: ThronglerToy
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.
22 changes: 22 additions & 0 deletions Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "inhands made by Blu , Icon taken from beestation and belonged to original ss13 https://github.com/BeeStation/BeeStation-Hornet",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading