diff --git a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml index 695e45a2e64..8184bb02428 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml @@ -392,4 +392,6 @@ - id: ThronglerToy prob: 0.30 orGroup: Prize - \ No newline at end of file + - id: BwoinkHammer + prob: 0.30 + orGroup: Prize \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index beafe7e3728..f0801cf3ff7 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1745,13 +1745,12 @@ types: Blunt: 0 -# description is aptly misspelled to reference to it's old self, where it was pointing out a joke at a funny translation to russian. vis below -# [user] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head" - 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 unreisinable. + suffix: DO NOT MAP components: - type: Sprite sprite: Objects/Fun/bwoink_hammer.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index de72dfcd5e4..cc1f208c87c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1408,6 +1408,7 @@ - SingularityToy - TeslaToy - ToySword + - BwoinkHammer - ThronglerToy - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml index e893c178358..c600702b206 100644 --- a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml +++ b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml @@ -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 diff --git a/Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json b/Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json index 606aec57e53..ebfac0b288d 100644 --- a/Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/bwoink_hammer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "taken from BigIron github", + "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