Reverts ZAS

This reverts commit fd09ea6ce8. and https://github.com/Baystation12/Baystation12/pull/681
This commit is contained in:
Ren Erthilo
2012-04-10 17:38:44 +01:00
parent 076b899718
commit ae5ea54af1
22 changed files with 248 additions and 347 deletions

View File

@@ -1857,16 +1857,6 @@ var/global/BSACooldown = 0
J.spawn_positions = -1
message_admins("[key_name_admin(usr)] has removed the cap on security officers.")
return
if(href_list["vsc"])
if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
if(href_list["vsc"] == "airflow")
vsc.ChangeSettingsDialog(usr,vsc.settings)
if(href_list["vsc"] == "plasma")
vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
if(href_list["vsc"] == "load")
LoadTweaks()
if(href_list["vsc"] == "save")
SaveTweaks()
if (href_list["rnd_max"])
for(var/obj/machinery/computer/rdconsole/C in world)
for(var/datum/tech/T in C.files.known_tech)
@@ -2094,13 +2084,7 @@ var/global/BSACooldown = 0
if(lvl >= 5)
dat += "<A href='?src=\ref[src];create_mob=1'>Create Mob</A><br>"
// if(lvl == 6 )
if(lvl >= 3 )
dat += "<br><A href='?src=\ref[src];vsc=airflow'>Edit Airflow Settings</A><br>"
dat += "<A href='?src=\ref[src];vsc=plasma'>Edit Plasma Settings</A><br>"
dat += "<br><A href='?src=\ref[src];vsc=load'>Load Settings</A><br>"
dat += "<A href='?src=\ref[src];vsc=save'>Save Settings</A><br>"
usr << browse(dat, "window=admin2;size=210x340")
usr << browse(dat, "window=admin2;size=210x180")
return
/*
/obj/admins/proc/goons()

View File

@@ -226,7 +226,6 @@
verbs += /proc/release
verbs += /client/proc/toggleprayers
verbs += /client/proc/editappear
verbs += /client/proc/Zone_Info
if (holder.level >= 2)//Admin Candidate********************************************************************
verbs += /client/proc/cmd_admin_add_random_ai_law
@@ -917,4 +916,4 @@
C.CarbonCopy2(NewObj)
else
NewObj.vars[V] = vars[V]
return NewObj
return NewObj

View File

@@ -40,7 +40,7 @@
active_tiles += group.members.len
var/hotspots = 0
for(var/obj/fire/fire in world)
for(var/obj/effect/hotspot/hotspot in world)
hotspots++
var/output = {"<B>AIR SYSTEMS REPORT</B><HR>
@@ -74,7 +74,7 @@
var/burning = 0
if(istype(target, /turf/simulated))
var/turf/simulated/T = target
if(locate(/obj/fire) in T)
if(T.active_hotspot)
burning = 1
usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"