diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm index 0401f7e0e89..836968acc8c 100644 --- a/code/game/gamemodes/wizard/spells.dm +++ b/code/game/gamemodes/wizard/spells.dm @@ -305,12 +305,13 @@ set category = "Spells" set name = "Teleport" set desc = "This spell teleports you to a type of area of your selection." + if(usr.stat) src << "Not when you are incapacitated." return + if(!usr.casting()) return - var/A - usr.verbs -= /mob/proc/teleport + /* var/list/theareas = new/list() for(var/area/AR in world) @@ -322,8 +323,11 @@ theareas[AR.name] = AR */ - A = input("Area to jump to", "BOOYEA", A) in teleportlocs + var/A = input("Area to jump to", "Teleport") as null|anything in teleportlocs + if (isnull(A)) + return + usr.verbs -= /mob/proc/teleport spawn(600) usr.verbs += /mob/proc/teleport @@ -349,7 +353,7 @@ if(L.len) usr.loc = pick(L) else - usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." + usr << "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." smoke.start() @@ -357,9 +361,11 @@ if(usr.stat) usr << "Not when you are incapacitated." return - var/A - A = input("Area to jump to", "BOOYEA", A) in teleportlocs + var/A = input("Area to jump to", "Teleport") as null|anything in teleportlocs + if (isnull(A)) + return + var/area/thearea = teleportlocs[A] var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 111ff5b8f18..70d519c1e86 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -406,7 +406,7 @@ dat += cart dat += "" - user << browse(dat, "window=pda;size=400x444;border=1;can_resize=1;can_close=0;can_minimize=0") + user << browse(dat, "window=pda;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") onclose(user, "pda", src) /obj/item/device/pda/Topic(href, href_list) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b791b9a9ba9..f6c44553d1d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2787,7 +2787,9 @@ It can still be worn/put on as normal. var/list/creatures = list() for(var/mob/living/carbon/h in world) creatures += h - var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures + var/mob/target = input ("Who do you want to project your mind to ?") as null|anything in creatures + if (isnull(target)) + return var/say = input ("What do you wish to say") if(mRemotetalk in target.mutations)