From c9a8695f0ca55cbae6d33053e0935c5446251a26 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Tue, 30 Jun 2015 21:31:02 +0200 Subject: [PATCH 1/5] Revenant Role Candidacy Fixes https://github.com/ParadiseSS13/Paradise/issues/1395 maybe --- code/modules/client/preferences.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 6f0f19b0b31..6885083a3b3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -18,7 +18,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "vampire" = IS_MODE_COMPILED("vampire"), // 2048 / 12 "mutineer" = IS_MODE_COMPILED("mutiny"), // 4096 / 13 "blob" = IS_MODE_COMPILED("blob"), // 8192 / 14 - "shadowling" = IS_MODE_COMPILED("shadowling") //16384 / 15 + "shadowling" = IS_MODE_COMPILED("shadowling"), //16384 / 15 + "Revenant" = IS_MODE_COMPILED("Revenant"), //32768 / 16 ) var/global/list/special_role_times = list( //minimum age (in days) for accounts to play these roles num2text(BE_PAI) = 0, @@ -35,7 +36,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts num2text(BE_ALIEN) = 21, num2text(BE_NINJA) = 21, num2text(BE_MUTINEER) = 21, - num2text(BE_MALF) = 30 + num2text(BE_MALF) = 30, + num2text(BE_REVENANT) = 30 ) /proc/player_old_enough_antag(client/C, role) From db7d636c29f23cc025cc887cea973939edd40e44 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Tue, 30 Jun 2015 21:35:10 +0200 Subject: [PATCH 2/5] Fixes derp There is to Revenant gamemode. --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 6885083a3b3..ecc8ed6426b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -19,7 +19,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "mutineer" = IS_MODE_COMPILED("mutiny"), // 4096 / 13 "blob" = IS_MODE_COMPILED("blob"), // 8192 / 14 "shadowling" = IS_MODE_COMPILED("shadowling"), //16384 / 15 - "Revenant" = IS_MODE_COMPILED("Revenant"), //32768 / 16 + "Revenant" = 1 //32768 / 16 ) var/global/list/special_role_times = list( //minimum age (in days) for accounts to play these roles num2text(BE_PAI) = 0, From 42c5c29b12c505cfdc49d65d7682085e419f3d79 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 1 Jul 2015 03:37:11 +0200 Subject: [PATCH 3/5] 7 days title --- code/_globalvars/database.dm | 12 ++++++------ code/defines/procs/dbcore.dm | 2 +- code/modules/client/preferences.dm | 2 +- .../simple_animal/revenant/revenant_spawn_event.dm | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/_globalvars/database.dm b/code/_globalvars/database.dm index 437f479f99c..942c7c630b2 100644 --- a/code/_globalvars/database.dm +++ b/code/_globalvars/database.dm @@ -2,13 +2,13 @@ var/sqladdress = "localhost" var/sqlport = "3306" var/sqldb = "paradise" -var/sqllogin = "root" +var/sqllogin = "mylogin" var/sqlpass = "example" // Feedback gathering sql connection var/sqlfdbkdb = "paradise" -var/sqlfdbklogin = "root" -var/sqlfdbkpass = "example" +var/sqlfdbklogin = "mylogin" +var/sqlfdbkpass = "mypassword" var/sqllogging = 0 // Should we log deaths, population stats, etc? @@ -18,9 +18,9 @@ var/sqllogging = 0 // Should we log deaths, population stats, etc? var/forumsqladdress = "localhost" var/forumsqlport = "3306" -var/forumsqldb = "tgstation" -var/forumsqllogin = "root" -var/forumsqlpass = "bleh" +var/forumsqldb = "paradise" +var/forumsqllogin = "mylogin" +var/forumsqlpass = "mypassword" var/forum_activated_group = "2" var/forum_authenticated_group = "10" diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index 45139ab3fb1..788bbb705f0 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -45,7 +45,7 @@ DBConnection var/password // This variable contains the password data. var/default_cursor // This contains the default database cursor data. // - var/server = "" + var/server = "localhost" var/port = 3306 DBConnection/New(dbi_handler,username,password_handler,cursor_handler) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ecc8ed6426b..4f56edeff9d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -37,7 +37,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts num2text(BE_NINJA) = 21, num2text(BE_MUTINEER) = 21, num2text(BE_MALF) = 30, - num2text(BE_REVENANT) = 30 + num2text(BE_REVENANT) = 7 ) /proc/player_old_enough_antag(client/C, role) diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm index 0f1b3545391..3b96151f284 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm @@ -1,4 +1,4 @@ -#define REVENANT_SPAWN_THRESHOLD 10 +#define REVENANT_SPAWN_THRESHOLD 1 /datum/event/revenant var/key_of_revenant From b069ed6b01ae45658310e75d1f912c06d94625b2 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 1 Jul 2015 03:38:41 +0200 Subject: [PATCH 4/5] Revert "7 days" This reverts commit 42c5c29b12c505cfdc49d65d7682085e419f3d79. --- code/_globalvars/database.dm | 12 ++++++------ code/defines/procs/dbcore.dm | 2 +- code/modules/client/preferences.dm | 2 +- .../simple_animal/revenant/revenant_spawn_event.dm | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/_globalvars/database.dm b/code/_globalvars/database.dm index 942c7c630b2..437f479f99c 100644 --- a/code/_globalvars/database.dm +++ b/code/_globalvars/database.dm @@ -2,13 +2,13 @@ var/sqladdress = "localhost" var/sqlport = "3306" var/sqldb = "paradise" -var/sqllogin = "mylogin" +var/sqllogin = "root" var/sqlpass = "example" // Feedback gathering sql connection var/sqlfdbkdb = "paradise" -var/sqlfdbklogin = "mylogin" -var/sqlfdbkpass = "mypassword" +var/sqlfdbklogin = "root" +var/sqlfdbkpass = "example" var/sqllogging = 0 // Should we log deaths, population stats, etc? @@ -18,9 +18,9 @@ var/sqllogging = 0 // Should we log deaths, population stats, etc? var/forumsqladdress = "localhost" var/forumsqlport = "3306" -var/forumsqldb = "paradise" -var/forumsqllogin = "mylogin" -var/forumsqlpass = "mypassword" +var/forumsqldb = "tgstation" +var/forumsqllogin = "root" +var/forumsqlpass = "bleh" var/forum_activated_group = "2" var/forum_authenticated_group = "10" diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index 788bbb705f0..45139ab3fb1 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -45,7 +45,7 @@ DBConnection var/password // This variable contains the password data. var/default_cursor // This contains the default database cursor data. // - var/server = "localhost" + var/server = "" var/port = 3306 DBConnection/New(dbi_handler,username,password_handler,cursor_handler) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4f56edeff9d..ecc8ed6426b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -37,7 +37,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts num2text(BE_NINJA) = 21, num2text(BE_MUTINEER) = 21, num2text(BE_MALF) = 30, - num2text(BE_REVENANT) = 7 + num2text(BE_REVENANT) = 30 ) /proc/player_old_enough_antag(client/C, role) diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm index 3b96151f284..0f1b3545391 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm @@ -1,4 +1,4 @@ -#define REVENANT_SPAWN_THRESHOLD 1 +#define REVENANT_SPAWN_THRESHOLD 10 /datum/event/revenant var/key_of_revenant From fdb302e5a69f919f17973b0b011e2b6c0e9d79a8 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 1 Jul 2015 03:40:47 +0200 Subject: [PATCH 5/5] 7 days --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ecc8ed6426b..4f56edeff9d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -37,7 +37,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts num2text(BE_NINJA) = 21, num2text(BE_MUTINEER) = 21, num2text(BE_MALF) = 30, - num2text(BE_REVENANT) = 30 + num2text(BE_REVENANT) = 7 ) /proc/player_old_enough_antag(client/C, role)