mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 08:01:06 +00:00
Toy click fix + langserv fixes. (#7837)
You can now actually take toys out of your pockets. Fixes langserver again.
This commit is contained in:
@@ -431,21 +431,12 @@
|
|||||||
drop_sound = 'sound/mecha/mechstep.ogg'
|
drop_sound = 'sound/mecha/mechstep.ogg'
|
||||||
|
|
||||||
//all credit to skasi for toy mech fun ideas
|
//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)
|
if(cooldown < world.time - 8)
|
||||||
to_chat(user, "<span class='notice'>You play with [src].</span>")
|
to_chat(user, "<span class='notice'>You play with [src].</span>")
|
||||||
playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
|
playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
|
||||||
cooldown = world.time
|
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
|
/obj/item/toy/prize/ripley
|
||||||
name = "toy ripley"
|
name = "toy ripley"
|
||||||
desc = "Mini-Mecha action figure! Collect them all! 1/11."
|
desc = "Mini-Mecha action figure! Collect them all! 1/11."
|
||||||
|
|||||||
@@ -447,9 +447,3 @@ Command action procs
|
|||||||
message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
|
message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
#undef STATE_DEFAULT
|
|
||||||
#undef STATE_MESSAGELIST
|
|
||||||
#undef STATE_VIEWMESSAGE
|
|
||||||
#undef STATE_STATUSDISPLAY
|
|
||||||
#undef STATE_ALERT_LEVEL
|
|
||||||
|
|||||||
41
html/changelogs/mattatlas-whowrotethis.yml
Normal file
41
html/changelogs/mattatlas-whowrotethis.yml
Normal file
@@ -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: MattAtlas
|
||||||
|
|
||||||
|
# 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:
|
||||||
|
- bugfix: "Toy figurines now only do the cool action when you activate them instead of when you click them, so you can actually remove them from your pockets."
|
||||||
Reference in New Issue
Block a user