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

Toy click fix + langserv fixes. (#7837)

Browse Source 
You can now actually take toys out of your pockets.

Fixes langserver again.
This commit is contained in:
Matt Atlas
2019-12-29 00:42:25 +02:00
committed by Erki
parent af983ebad3
commit 4e4e39b890
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+1 -10
View File
@@ -431,21 +431,12 @@
drop_sound = 'sound/mecha/mechstep.ogg'
//all credit to skasi for toy mech fun ideas
/obj/item/toy/prize/attack_self(mob/user as mob)
/obj/item/toy/prize/attack_self(mob/user)
if(cooldown < world.time - 8)
to_chat(user, "<span class='notice'>You play with [src].</span>")
playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
cooldown = world.time
/obj/item/toy/prize/attack_hand(mob/user as mob)
if(loc == user)
if(cooldown < world.time - 8)
to_chat(user, "<span class='notice'>You play with [src].</span>")
playsound(user, 'sound/mecha/mechturn.ogg', 20, 1)
cooldown = world.time
return
..()
/obj/item/toy/prize/ripley
name = "toy ripley"
desc = "Mini-Mecha action figure! Collect them all! 1/11."