mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Merge branch 'master' of https://github.com/Baystation12/Baystation12
This commit is contained in:
+4
-2
@@ -641,6 +641,7 @@ var/list/TAGGERLOCATIONS = list("Disposals",
|
||||
#define BE_MONKEY 512
|
||||
#define BE_NINJA 1024
|
||||
#define BE_RAIDER 2048
|
||||
#define BE_PLANT 4096
|
||||
|
||||
var/list/be_special_flags = list(
|
||||
"Traitor" = BE_TRAITOR,
|
||||
@@ -654,7 +655,8 @@ var/list/be_special_flags = list(
|
||||
"Cultist" = BE_CULTIST,
|
||||
"Monkey" = BE_MONKEY,
|
||||
"Ninja" = BE_NINJA,
|
||||
"Raider" = BE_RAIDER
|
||||
"Raider" = BE_RAIDER,
|
||||
"Diona" = BE_PLANT
|
||||
)
|
||||
|
||||
#define AGE_MIN 17 //youngest a character can be
|
||||
@@ -720,4 +722,4 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
|
||||
|
||||
//Language flags.
|
||||
#define WHITELISTED 1 // Language is available if the speaker is whitelisted.
|
||||
#define RESTRICTED 2 // Language can only be accquired by spawning or an admin.
|
||||
#define RESTRICTED 2 // Language can only be accquired by spawning or an admin.
|
||||
|
||||
Reference in New Issue
Block a user