Merge pull request #1655 from Giacom/robot_violin

Added the space violin to the service cyborg modules + MORE [CHANGELOG]
This commit is contained in:
Aranclanos
2013-10-30 08:19:22 -07:00
5 changed files with 33 additions and 15 deletions
+1 -1
View File
@@ -164,7 +164,7 @@
/datum/song/Topic(href, href_list)
if(!in_range(instrumentObj, usr) || issilicon(usr) || !isliving(usr) || !usr.canmove || usr.restrained())
if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained())
usr << browse(null, "window=instrument")
usr.unset_machine()
return