Moved several globals into the config controller, updated eample config appropriately.

This commit is contained in:
Zuhayr
2014-12-25 21:10:30 +10:30
parent 844c795c7a
commit 8978747e53
27 changed files with 187 additions and 180 deletions
+4 -4
View File
@@ -93,16 +93,16 @@
/mob/proc/emote_dead(var/message)
if(client.prefs.muted & MUTE_DEADCHAT)
src << "\red You cannot send deadchat emotes (muted)."
src << "<span class='danger'>You cannot send deadchat emotes (muted).</span>"
return
if(!(client.prefs.toggles & CHAT_DEAD))
src << "\red You have deadchat muted."
src << "<span class='danger'>You have deadchat muted.</span>"
return
if(!src.client.holder)
if(!dsay_allowed)
src << "\red Deadchat is globally muted"
if(!config.dsay_allowed)
src << "<span class='danger'>Deadchat is globally muted.</span>"
return
+1 -1
View File
@@ -1379,7 +1379,7 @@
if(eye_blurry) client.screen += global_hud.blurry
if(druggy) client.screen += global_hud.druggy
if(tinted_weldhelh)
if(config.welder_vision)
var/found_welder
if(istype(glasses, /obj/item/clothing/glasses/welding))
var/obj/item/clothing/glasses/welding/O = glasses
@@ -38,7 +38,7 @@ var/const/MAX_ACTIVE_TIME = 400
Attach(M)
/obj/item/clothing/mask/facehugger/New()
if(aliens_allowed)
if(config.aliens_allowed)
..()
else
del(src)
@@ -83,7 +83,7 @@
set desc = "Lay an egg to produce huggers to impregnate prey with."
set category = "Abilities"
if(!aliens_allowed)
if(!config.aliens_allowed)
src << "You begin to lay an egg, but hesitate. You suspect it isn't allowed."
verbs -= /mob/living/carbon/human/proc/lay_egg
return
+4 -4
View File
@@ -392,14 +392,14 @@ var/list/slot_equipment_priority = list( \
set name = "Respawn"
set category = "OOC"
if (!( abandon_allowed ))
usr << "\blue Respawn is disabled."
if (!( config.abandon_allowed ))
usr << "<span class='notice'>Respawn is disabled.</span>"
return
if ((stat != 2 || !( ticker )))
usr << "\blue <B>You must be dead to use this!</B>"
usr << "<span class='notice'><B>You must be dead to use this!</B></span>"
return
if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic") //BS12 EDIT
usr << "\blue Respawn is disabled for this roundtype."
usr << "<span class='notice'>Respawn is disabled for this roundtype.</span>"
return
else
var/deathtime = world.time - src.timeofdeath
+7 -4
View File
@@ -162,8 +162,11 @@
if(href_list["SelectedJob"])
if(!enter_allowed)
usr << "\blue There is an administrative lock on entering the game!"
if(!config.enter_allowed)
usr << "<span class='notice'>There is an administrative lock on entering the game!</span>"
return
else if(ticker && ticker.mode && ticker.mode.explosion_in_progress)
usr << "<span class='danger'>The station is currently exploding. Joining would go poorly.</span>"
return
if(client.prefs.species != "Human")
@@ -293,8 +296,8 @@
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "\red The round is either not ready, or has already finished..."
return 0
if(!enter_allowed)
usr << "\blue There is an administrative lock on entering the game!"
if(!config.enter_allowed)
usr << "<span class='notice'>There is an administrative lock on entering the game!</span>"
return 0
if(!IsJobAvailable(rank))
src << alert("[rank] is not available. Please try another.")
+4 -4
View File
@@ -44,16 +44,16 @@
/mob/proc/say_dead(var/message)
if(say_disabled) //This is here to try to identify lag problems
usr << "\red Speech is currently admin-disabled."
usr << "<span class='danger'>Speech is currently admin-disabled.</span>"
return
if(!src.client.holder)
if(!dsay_allowed)
src << "\red Deadchat is globally muted"
if(!config.dsay_allowed)
src << "<span class='danger'>Deadchat is globally muted.</span>"
return
if(client && !(client.prefs.toggles & CHAT_DEAD))
usr << "\red You have deadchat muted."
usr << "<span class='danger'>You have deadchat muted.</span>"
return
say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], <span class='message'>\"[message]\"</span>", src)