mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED
Conflicts: code/__HELPERS/game.dm code/game/machinery/alarm.dm code/game/machinery/doors/firedoor.dm code/modules/client/preferences_toggles.dm code/setup.dm maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
+2
-1
@@ -679,8 +679,9 @@ var/list/TAGGERLOCATIONS = list("Disposals",
|
||||
#define SOUND_AMBIENCE 4
|
||||
#define SOUND_LOBBY 8
|
||||
#define SOUND_VOICES 16
|
||||
#define SOUND_STREAMING 32
|
||||
|
||||
#define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY)
|
||||
#define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_STREAMING)
|
||||
#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC)
|
||||
|
||||
#define BE_TRAITOR 1
|
||||
|
||||
Reference in New Issue
Block a user