schlorrgo plush go ough (#18591)

* ough

* ough

* poke_sound

* Required changes

* indent

* move cooldown

code/game/objects/items/toys.dm

@@ -956,8 +956,15 @@
 	drop_sound = 'sound/items/drop/plushie.ogg'
 	pickup_sound = 'sound/items/pickup/plushie.ogg'
 	var/phrase = "Hewwo!"
+	/// defines what sound is played when poking the plushie (using it inhand on disarm intent).
+	var/poke_sound = 'sound/items/drop/plushie.ogg'
+	///A cooldown to stop the poke sound being spammed.
+	var/poke_cooldown = 0
 
 /obj/item/toy/plushie/attack_self(mob/user as mob)
+	if(poke_cooldown > world.time)
+		return
+	poke_cooldown = world.time + 2 SECONDS
 	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>\The [user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
 	else if (user.a_intent == I_HURT)
@@ -966,7 +973,7 @@
 		user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
-		playsound(src, 'sound/items/drop/plushie.ogg', 25, 0)
+		playsound(src, poke_sound, 25, 0)
 		visible_message("[src] says, \"[phrase]\"")
 
 //Large plushies.
@@ -1058,12 +1065,18 @@
 	desc = "A schlorrgo plushie, ready to roll his way into your heart!"
 	icon_state = "schlorrgoplushie"
 	phrase = "Eough!"
+	drop_sound = 'sound/effects/creatures/ough.ogg'
+	pickup_sound = 'sound/effects/creatures/ough.ogg'
+	poke_sound = 'sound/effects/creatures/ough.ogg'
 
 /obj/item/toy/plushie/coolschlorrgo
 	name = "Cool Schlorrgo plush"
 	desc = "A plushie of the popular cartoon character, Cool Schlorrgo. Hadii's grace!"
 	icon_state = "coolerschlorrgoplushie"
 	phrase = "Eough!"
+	drop_sound = 'sound/effects/creatures/ough.ogg'
+	pickup_sound = 'sound/effects/creatures/ough.ogg'
+	poke_sound = 'sound/effects/creatures/ough.ogg'
 
 /obj/item/toy/plushie/slime
 	name = "slime plush"

html/changelogs/greenjoe12345 - ough.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Greenjoe12345
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Schlorrgo plushies now go ough."