cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor span refactoring (#19177)

Browse Source 
Minor span refactoring
This commit is contained in:
Fluffy
2024-05-19 16:37:29 +00:00
committed by GitHub
parent 6387917444
commit 3dc4cce9c2
687 changed files with 4572 additions and 4295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+16 -16
View File
@@ -394,7 +394,7 @@ var/global/enabled_spooking = 0
if(FC.is_admin_channel)
dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen'><A href='?src=\ref[src];ac_show_channel=\ref[FC]'>[FC.channel_name]</A></FONT></B><BR>"
else
dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? ("<span class='warning'>***</span>") : null]<BR></B>"
dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? (SPAN_WARNING("***")) : null]<BR></B>"
dat+={"<BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>
"}
@@ -481,7 +481,7 @@ var/global/enabled_spooking = 0
else
for(var/channel in SSnews.network_channels)
var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel)
dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? ("<span class='warning'>***</span>") : null]<BR>"
dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? (SPAN_WARNING("***")) : null]<BR>"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>"
if(11)
dat+={"
@@ -495,7 +495,7 @@ var/global/enabled_spooking = 0
else
for(var/channel in SSnews.network_channels)
var/datum/feed_channel/FC = SSnews.GetFeedChannel(channel)
dat+="<A href='?src=\ref[src];ac_pick_d_notice=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? ("<span class='warning'>***</span>") : null]<BR>"
dat+="<A href='?src=\ref[src];ac_pick_d_notice=\ref[FC]'>[FC.channel_name]</A> [(FC.censored) ? (SPAN_WARNING("***")) : null]<BR>"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>"
if(12)
@@ -678,7 +678,7 @@ var/global/enabled_spooking = 0
if(confirm == "Cancel")
return
if(confirm == "Yes")
to_world("<span class='danger'>Restarting world!</span> <span class='notice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>")
to_world(SPAN_DANGER("Restarting world!</span> <span class='notice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"))
log_admin("[key_name(usr)] initiated a reboot.")
feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -814,11 +814,11 @@ var/global/enabled_spooking = 0
if(SSticker.current_state == GAME_STATE_PREGAME)
SSticker.current_state = GAME_STATE_SETTING_UP
log_admin("[usr.key] has started the game.")
message_admins("<span class='notice'>[usr.key] has started the game.</span>")
message_admins(SPAN_NOTICE("[usr.key] has started the game."))
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return 1
else
to_chat(usr, "<span class='warning'>Error: Start Now: Game has already started.</span>")
to_chat(usr, SPAN_WARNING("Error: Start Now: Game has already started."))
return 0
/datum/admins/proc/toggleenter()
@@ -831,7 +831,7 @@ var/global/enabled_spooking = 0
else
to_world("<B>New players may now enter the game.</B>")
log_admin("[key_name(usr)] toggled new player game entering.")
message_admins("<span class='notice'>[key_name_admin(usr)] toggled new player game entering.</span>", 1)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] toggled new player game entering."), 1)
world.update_status()
feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -857,7 +857,7 @@ var/global/enabled_spooking = 0
to_world("<B>You may now respawn.</B>")
else
to_world("<B>You may no longer respawn :(</B>")
message_admins("<span class='notice'>[key_name_admin(usr)] toggled respawn to [GLOB.config.abandon_allowed ? "On" : "Off"].</span>", 1)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] toggled respawn to [GLOB.config.abandon_allowed ? "On" : "Off"]."), 1)
log_admin("[key_name(usr)] toggled respawn to [GLOB.config.abandon_allowed ? "On" : "Off"].")
world.update_status()
feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -880,7 +880,7 @@ var/global/enabled_spooking = 0
if (ROUND_IS_STARTED)
SSticker.delay_end = !SSticker.delay_end
log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins("<span class='notice'>[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].</span>", 1)
message_admins(SPAN_NOTICE("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"]."), 1)
return //alert("Round end delayed", null, null, null, null, null)
GLOB.round_progressing = !GLOB.round_progressing
if (!GLOB.round_progressing)
@@ -896,7 +896,7 @@ var/global/enabled_spooking = 0
set desc="Toggle admin jumping"
set name="Toggle Jump"
GLOB.config.allow_admin_jump = !(GLOB.config.allow_admin_jump)
message_admins("<span class='notice'>Toggled admin jumping to [GLOB.config.allow_admin_jump].</span>")
message_admins(SPAN_NOTICE("Toggled admin jumping to [GLOB.config.allow_admin_jump]."))
feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/adspawn()
@@ -904,7 +904,7 @@ var/global/enabled_spooking = 0
set desc="Toggle admin spawning"
set name="Toggle Spawn"
GLOB.config.allow_admin_spawning = !(GLOB.config.allow_admin_spawning)
message_admins("<span class='notice'>Toggled admin item spawning to [GLOB.config.allow_admin_spawning].</span>")
message_admins(SPAN_NOTICE("Toggled admin item spawning to [GLOB.config.allow_admin_spawning]."))
feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/adrev()
@@ -912,7 +912,7 @@ var/global/enabled_spooking = 0
set desc="Toggle admin revives"
set name="Toggle Revive"
GLOB.config.allow_admin_rev = !(GLOB.config.allow_admin_rev)
message_admins("<span class='notice'>Toggled reviving to [GLOB.config.allow_admin_rev].</span>")
message_admins(SPAN_NOTICE("Toggled reviving to [GLOB.config.allow_admin_rev]."))
feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/immreboot()
@@ -922,7 +922,7 @@ var/global/enabled_spooking = 0
if(!usr.client.holder) return
if( alert("Reboot server?",,"Yes","No") == "No")
return
to_world("<span class='danger'>Rebooting world!</span> <span class='notice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>")
to_world(SPAN_DANGER("Rebooting world!</span> <span class='notice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"))
log_admin("[key_name(usr)] initiated an immediate reboot.")
feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -1158,7 +1158,7 @@ var/global/enabled_spooking = 0
else
to_world("<B>Guests may now enter the game.</B>")
log_admin("[key_name(usr)] toggled guests game entering [GLOB.config.guests_allowed?"":"dis"]allowed.")
message_admins("<span class='notice'>[key_name_admin(usr)] toggled guests game entering [GLOB.config.guests_allowed?"":"dis"]allowed.</span>", 1)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] toggled guests game entering [GLOB.config.guests_allowed?"":"dis"]allowed."), 1)
feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/output_ai_laws()
@@ -1316,14 +1316,14 @@ var/global/enabled_spooking = 0
if(check_rights(R_ADMIN|R_MOD, user))
if (target.paralysis == 0)
msg = "has paralyzed [key_name_admin(target)]."
target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <span class='warning'>[target] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.</span>", "<span class='warning'><b>You have been winded by a member of staff! Please stand by until they contact you!</b></span>")
target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <span class='warning'>[target] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.</span>", SPAN_WARNING("<b>You have been winded by a member of staff! Please stand by until they contact you!</b>"))
target.paralysis = 8000
else
if (alert(user, "The player is currently winded. Do you want to unwind him?", "Unwind player?", "Yes", "No") == "No")
return
target.paralysis = 0
msg = "has unparalyzed [key_name_admin(target)]."
target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <font color='green'>[target] has been unwinded by a member of staff!</font>", "<span class='warning'><b>You have been unwinded by a member of staff!</b></span>")
target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <font color='green'>[target] has been unwinded by a member of staff!</font>", SPAN_WARNING("<b>You have been unwinded by a member of staff!</b>"))
log_and_message_admins(msg, user)
feedback_add_details("admin_verb", "WIND")