mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-03 22:12:38 +00:00
Added cancel button to teleport dialog, close button to PDA window and cancel button to telepathic mind projection
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -406,7 +406,7 @@
|
||||
dat += cart
|
||||
|
||||
dat += "</body></html>"
|
||||
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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user