(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	code/game/machinery/atmoalter/canister.dm
This commit is contained in:
Markolie
2015-02-17 02:12:22 +01:00
28 changed files with 1764 additions and 1287 deletions
+1
View File
@@ -638,6 +638,7 @@ var/list/admin_verbs_mod = list(
set category = "Preferences"
prefs.toggles ^= CHAT_ATTACKLOGS
prefs.save_preferences(src)
if (prefs.toggles & CHAT_ATTACKLOGS)
usr << "You now will get attack log messages"
else