From bfe1a4fb4a0e6ef23b70fb2a4db5f85eaec8b6be Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Tue, 9 Aug 2011 13:01:34 +0000 Subject: [PATCH] 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 --- code/defines/obj/supplypacks.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 1 + code/game/supplyshuttle.dm | 1 + code/modules/admin/admin_verbs.dm | 3 +-- code/modules/admin/verbs/MC.dm | 9 +++++++-- .../modules/mob/living/silicon/robot/robot.dm | 2 +- icons/effects/effects.dmi | Bin 188746 -> 188742 bytes 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 7b85697c1a1..0aa86ab1101 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -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 diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index ce6a9881035..0b0ddff535b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -70,6 +70,7 @@ wizard.original = wizard.current if(wizardstart.len == 0) wizard.current << "\red A starting location for you could not be found, please report this bug!" + return 0 else wizard.current.loc = pick(wizardstart) return 1 diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 78d0f26b53f..c3b0889d723 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -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 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b298ce628ce..024c563f31a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -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 diff --git a/code/modules/admin/verbs/MC.dm b/code/modules/admin/verbs/MC.dm index 346f98cbecf..ded7740c2c1 100644 --- a/code/modules/admin/verbs/MC.dm +++ b/code/modules/admin/verbs/MC.dm @@ -1,5 +1,10 @@ /client/proc/restartcontroller() set category = "Debug" set name = "Restart Master Controller" - - master_controller.process() \ No newline at end of file + 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 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7a0dd4caddc..55ba7512e65 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -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 diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index e99ff69e066051d917354b36c22d0121ee9d22d3..ee705bb59c5e2915ebe55f62ef6a4bdd36abfeac 100644 GIT binary patch delta 103 zcmV-t0GR*E!VAX23y>rMK(Qq>0u;`KXZHHOVym}x{0Ca|6hnpY^{az#0*7w`0k>}g z0t>+bxwm`60t*iX^z`&-)whh&0*wm?o}Qji)lyBjA>INN0~9NU&f?=9BB1~P002ov JPDHLkV1j6VE4Bat delta 107 zcmV-x0F?j6!VAj63y>rMLa`+@0v37%%DtZ1>-&nW-q!ISqh%c74(oF