removes yapping and adds it to prizes

Simple-Station · Aug 21, 2024 · 7695635 · 7695635
1 parent 4011d37
commit 7695635
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git 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
-
+      - id: BwoinkHammer
+        prob: 0.30
+        orGroup: Prize
diff --git 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
-# <span class='danger'>[user] are stroking the head of [M] with a bangammer</span>", "<span class='userdanger'>[user] are stroking the head with a bangammer</span>", "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
@@ -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
@@ -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
@@ -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