cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant var

Browse Source
This commit is contained in:
Couls
2019-03-07 15:45:58 -05:00
parent 8bc511f50f
commit ddb335fe2c
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client defines.dm
-1
View File
@@ -60,7 +60,6 @@
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
+5 -6
View File
@@ -377,7 +377,6 @@
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)
@@ -669,7 +668,7 @@
/client/proc/on_varedit()
var_edited = TRUE
/////////////////
// DARKMODE UI //
/////////////////
@@ -706,7 +705,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()
@@ -747,15 +746,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
-2
View File
@@ -225,10 +225,8 @@
set category = "Special Verbs"
set desc = "This button will allow you to stop other people giving you 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)
code/modules/karma/karma.dm
+1 -1
View File
@@ -85,7 +85,7 @@ var/list/karma_spenders = list()
log_game("Illegal karma spending attempt detected from [key] to [M.key]. Using the same IP!")
to_chat(src, "<span class='warning'>You can't spend karma on someone connected from the same IP.</span>")
return FALSE
if(!M.client.wants_karma)
if(M.get_preference(DISABLE_KARMA))
to_chat(src, "<span class='warning'>That player has turned off incoming karma.")
return FALSE
return TRUE