Going back to BS12 ZAS, permanently

This commit is contained in:
ZomgPonies
2013-11-08 09:51:22 -05:00
parent 950011d4d8
commit 0e201cc4a5
33 changed files with 3205 additions and 3019 deletions
+16 -1
View File
@@ -573,7 +573,7 @@ var/list/admin_verbs_mod = list(
for (var/mob/V in hearers(mob.control_object))
V.show_message("<b>[mob.control_object.name]</b> says: \"" + msg + "\"", 2)
feedback_add_details("admin_verb","OT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/*
/client/proc/kill_air() // -- TLE
set category = "Debug"
set name = "Kill Air"
@@ -587,6 +587,21 @@ var/list/admin_verbs_mod = list(
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] used 'kill air'.")
message_admins("\blue [key_name_admin(usr)] used 'kill air'.", 1)
*/
/client/proc/kill_air() // -- TLE
set category = "Debug"
set name = "Kill Air"
set desc = "Toggle Air Processing"
if(air_processing_killed)
air_processing_killed = 0
usr << "<b>Enabled air processing.</b>"
else
air_processing_killed = 1
usr << "<b>Disabled air processing.</b>"
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] used 'kill air'.")
message_admins("\blue [key_name_admin(usr)] used 'kill air'.", 1)
/client/proc/deadmin_self()
set name = "De-admin self"
+5 -5
View File
@@ -2526,13 +2526,13 @@
else if(href_list["vsc"])
if(check_rights(R_ADMIN|R_SERVER))
if(href_list["vsc"] == "airflow")
/* vsc.ChangeSettingsDialog(usr,vsc.settings)
vsc.ChangeSettingsDialog(usr,vsc.settings)
if(href_list["vsc"] == "plasma")
vsc.ChangeSettingsDialog(usr,vsc.plc.settings) */
zas_settings.ChangeSettingsDialog(usr,zas_settings.settings)
vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
// zas_settings.ChangeSettingsDialog(usr,zas_settings.settings)
if(href_list["vsc"] == "default")
//vsc.SetDefault(usr)
zas_settings.SetDefault(usr)
vsc.SetDefault(usr)
// zas_settings.SetDefault(usr)
// player info stuff
if(href_list["add_player_info"])
+2 -2
View File
@@ -876,8 +876,8 @@
var/total_plasmaloss = 0
for(var/obj/item/I in src)
if(I.contaminated)
//total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
total_plasmaloss += zas_settings.Get("CONTAMINATION_LOSS")
total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
// total_plasmaloss += zas_settings.Get("CONTAMINATION_LOSS")
if(status_flags & GODMODE) return 0 //godmode
adjustToxLoss(total_plasmaloss)