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

Merge branch 'upstream-master' into development-upstream

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
This commit is contained in:
Werner
2017-10-07 15:13:33 +02:00
parent 052aad8294 7d85f2ce12
commit baa9c475c1
25 changed files with 247 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/musician.dm
-1
View File
@@ -27,7 +27,6 @@
name = "space piano"
desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
icon_state = "piano"
w_class = 15
/obj/structure/device/piano/proc/playnote(var/note as text)
//world << "Note: [note]"