Merge pull request #405 from SkyMarshal/master

Hacktool and Command Report bugfix.
This commit is contained in:
SkyMarshal
2012-02-12 11:49:04 -08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -537,7 +537,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
if (!src.canSynControl() && src.canSynHack(C))
src.synhack(user, C)
return
if(!src.canSynHack(C))
if(!src.canSynHack(C) && !synDoorHacked)
user << "The power is cut or something, I can't hack it!"
return
if(istype(C, /obj/item/device/hacktool/engineer))
+1 -1
View File
@@ -530,7 +530,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
src << "Only administrators may use this command."
return
var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
var/customname = input(usr, "Pick a title for the report.", "Title") as message|null
var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
if(!input)
return
if(!customname)