Added an alert to the controller button. Be wary of pushing that thing unless you are sure that it has actually crashed and is not just running slow.

Other than that just a few minor fixes


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1998 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-08-09 13:01:34 +00:00
parent ca7aa9431c
commit bfe1a4fb4a
7 changed files with 12 additions and 6 deletions

View File

@@ -290,7 +290,7 @@
contains = list("/obj/item/weapon/storage/toolbox/mechanical",
"/obj/item/weapon/storage/toolbox/electrical",
"/obj/item/clothing/gloves/yellow",
"/obj/item/weapon/storage/toolbox/utilitybelt",
"/obj/item/weapon/storage/utilitybelt",
"/obj/item/clothing/suit/hazardvest",
"/obj/item/clothing/head/helmet/hardhat")
cost = 10

View File

@@ -70,6 +70,7 @@
wizard.original = wizard.current
if(wizardstart.len == 0)
wizard.current << "<B>\red A starting location for you could not be found, please report this bug!</B>"
return 0
else
wizard.current.loc = pick(wizardstart)
return 1

View File

@@ -199,6 +199,7 @@ var/ordernum=0
A:req_access = new/list()
A:req_access += text2num(SP.access)
for(var/B in SP.contains)
if(!B) continue
var/thepath = text2path(B)
var/atom/B2 = new thepath (A)
if(SP.amount && B2:amount) B2:amount = SP.amount

View File

@@ -7,7 +7,6 @@
// Debug
// verbs += /client/proc/radio_report //for radio debugging dont think its been used in a very long time
// verbs += /client/proc/air_status //does next to nothing
verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
// verbs += /client/proc/fix_next_move //has not been an issue in a very very long time
// verbs += /client/proc/Cell //More air things
@@ -157,7 +156,7 @@
verbs += /client/proc/make_sound
verbs += /client/proc/only_one
verbs += /client/proc/send_space_ninja
verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
if (holder.level >= 4)//Badmin********************************************************************
verbs += /obj/admins/proc/adrev //toggle admin revives

View File

@@ -1,5 +1,10 @@
/client/proc/restartcontroller()
set category = "Debug"
set name = "Restart Master Controller"
master_controller.process()
switch(alert("Are you sure? If the control is still running it will now be running twice.",,"Yes","No"))
if("Yes")
spawn(0)
master_controller.process()
if("No")
return 0
return

View File

@@ -698,7 +698,7 @@
if(wiresexposed)
overlays += "ov-openpanel +w"
else if(cell)
overlays += "ov-openpanel -c"
overlays += "ov-openpanel +c"
else
overlays += "ov-openpanel -c"
return