diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index ec16efb1886..aefc93b901e 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -485,7 +485,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
world << "Ion Storm Main Done"
- */
-
-// command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
-// world << sound('ionstorm.ogg')
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index f7f2e1b51a7..051ea415a11 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -773,6 +773,22 @@
var/client/cl = MO.client
cl.cmd_admin_subtle_message(M)
+ if (href_list["adminplayerobservejump"])
+ var/mob/M = locate(href_list["adminplayerobservejump"])
+ if(src && src.owner)
+ if(istype(src.owner,/client))
+ var/client/cl = src.owner
+ cl.admin_observe()
+ sleep(2)
+ cl.jumptomob(M)
+ else if(ismob(src.owner))
+ var/mob/MO = src.owner
+ if(MO.client)
+ var/client/cl = MO.client
+ cl.admin_observe()
+ sleep(2)
+ cl.jumptomob(M)
+
if (href_list["jumpto"])
if(rank in list("Badmin", "Game Admin", "Game Master"))
@@ -1367,6 +1383,10 @@
if (src.rank in list("Badmin","Game Admin", "Game Master"))
IonStorm()
message_admins("[key_name_admin(usr)] triggered an ion storm")
+ var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
+ if(show_log == "Yes")
+ command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+ world << sound('ionstorm.ogg')
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index ec4dd02482f..86b856edcb7 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -15,7 +15,7 @@
for (var/mob/M in world)
if (M.client && M.client.holder)
- M << "\blue HELP: [key_name(src, M)] (PP) (VV) (SM): [msg]"
+ M << "\blue HELP: [key_name(src, M)] (PP) (VV) (SM) (JMP) (CA):[msg]"
usr << "Your message has been broadcast to administrators."
log_admin("HELP: [key_name(src)]: [msg]")
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 2fb9d9843c2..9248fcf93f1 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -39,7 +39,13 @@
if(config.allow_admin_jump)
log_admin("[key_name(usr)] jumped to [key_name(M)]")
message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
- usr.loc = get_turf(M)
+ if(src.mob)
+ var/mob/A = src.mob
+ var/turf/T = get_turf(M)
+ if(T && isturf(T))
+ A.loc = T
+ else
+ A << "This mob is not located in the game world."
else
alert("Admin jumping disabled")
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 968bb9fdbec..ec332482ed2 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -13,9 +13,11 @@
if (usr.muted)
return
+ var/icon/cross = icon('storage.dmi',"bible")
+
for (var/mob/M in world)
if (M.client && M.client.holder && M.client.seeprayers)
- M << "\blue PRAY: [key_name(src, M)] (PP) (VV) (SM): [msg]"
+ M << "\blue \icon[cross] PRAY: [key_name(src, M)] (PP) (VV) (SM)(PP) (VV) (SM): [msg]"
usr << "Your prayers have been received by the gods."
//log_admin("HELP: [key_name(src)]: [msg]")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 6ffaf828dba..29710b3ce21 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -159,6 +159,11 @@
log_admin("[key_name(src)] has added a random AI law.")
message_admins("[key_name_admin(src)] has added a random AI law.", 1)
+ var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
+ if(show_log == "Yes")
+ command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+ world << sound('ionstorm.ogg')
+
IonStorm(0)
/*
@@ -468,8 +473,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
-// command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
-// world << sound('ionstorm.ogg')
+
+ var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
+ if(show_log == "Yes")
+ command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+ world << sound('ionstorm.ogg')
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in world)
set category = "Special Verbs"
@@ -759,6 +767,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
src << "Only administrators may use this command."
return
+ var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+ if(confirm != "Yes") return
+
if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction")
var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
if(choice == "Confirm")
@@ -783,6 +794,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
src << "Only administrators may use this command."
return
+ var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+ if(confirm != "Yes") return
+
emergency_shuttle.recall()
return