cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

schlorrgo plush go ough (#18591)

Browse Source 
* ough

* ough

* poke_sound

* Required changes

* indent

* move cooldown
This commit is contained in:
Greenjoe12345
2024-03-11 09:36:34 +00:00
committed by GitHub
parent 94ce315c3c
commit e80f7aab9b
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+14 -1
View File
@@ -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"