cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

Browse Source 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
This commit is contained in:
bgobandit
2016-05-15 17:19:14 -04:00
parent fff00dfe2b 01ce91bf6d
commit eaf93e34cd
218 changed files with 7810 additions and 3098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/playsound.dm
-2
View File
@@ -26,8 +26,6 @@ var/sound/admin_sound
for(var/mob/M in player_list)
if(M.client.prefs.toggles & SOUND_MIDI)
var/vol = M.client.prefs.adminmusicvolume
admin_sound.volume = vol
M << admin_sound
feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!