cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
This commit is contained in:
Markolie
2015-02-25 20:44:32 +01:00
parent 6efa3bcdaa 367fd7abea
commit bfe8a12f1e
68 changed files with 1185 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/musician.dm
+1 -1
View File
@@ -19,7 +19,7 @@
instrumentDir = dir
instrumentObj = obj
/datum/song/proc/Destroy()
/datum/song/Destroy()
instrumentObj = null
return