cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2"

Browse Source 
This reverts commit 79777f441e, reversing
changes made to a76e7c4060.
This commit is contained in:
Couls
2019-03-07 17:42:53 -05:00
parent 79777f441e
commit bed368d1c9
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client defines.dm
+1
View File
@@ -60,6 +60,7 @@
var/karma = 0
var/karma_spent = 0
var/karma_tab = 0
var/wants_karma = TRUE // let's just keep it true as default for obvious reasons
/////////////////////////////////////////////
// /vg/: MEDIAAAAAAAA
// Set on login.
code/modules/client/client procs.dm
+6 -5
View File
@@ -377,6 +377,7 @@
if(prefs.toggles & DISABLE_KARMA) // activates if karma is disabled
if(establish_db_connection())
wants_karma = FALSE
to_chat(src,"<span class='notice'>You have disabled karma gains.") // reminds those who have it disabled
if(!void)
@@ -668,7 +669,7 @@
/client/proc/on_varedit()
var_edited = TRUE
/////////////////
// DARKMODE UI //
/////////////////
@@ -705,7 +706,7 @@
/* Infowindow */
winset(src, "infowindow", "background-color=#272727;text-color=#FFFFFF")
winset(src, "infowindow.info", "background-color=#272727;text-color=#FFFFFF;highlight-color=#009900;tab-text-color=#FFFFFF;tab-background-color=#272727")
// NOTIFY USER
// NOTIFY USER
to_chat(src, "<span class='notice'>Darkmode Enabled</span>")
/client/proc/deactivate_darkmode()
@@ -746,15 +747,15 @@
// Better changelog button handling
/client/proc/update_changelog_button()
if(establish_db_connection())
if(prefs.lastchangelog != changelog_hash)
if(prefs.lastchangelog != changelog_hash)
winset(src, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold")
else
if(prefs.toggles & UI_DARKMODE)
if(prefs.toggles & UI_DARKMODE)
winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
else
winset(src, "rpane.changelog", "background-color=none;text-color=#000000")
else
if(prefs.toggles & UI_DARKMODE)
if(prefs.toggles & UI_DARKMODE)
winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
else
winset(src, "rpane.changelog", "background-color=none;text-color=#000000")
code/modules/client/preference/preferences_toggles.dm
+3 -1
View File
@@ -224,9 +224,11 @@
set name = "Toggle Karma Gains"
set category = "Special Verbs"
set desc = "This button will allow you to stop other people giving you karma."
if (prefs.toggles & DISABLE_KARMA)
if(prefs.toggles & DISABLE_KARMA)
wants_karma = FALSE
to_chat(usr, "<span class='notice'>You have disabled karma gains.")
else
wants_karma = TRUE
to_chat(usr, "<span class='notice'>You have enabled karma gains.")
prefs.toggles ^= DISABLE_KARMA
prefs.save_preferences(src)