cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace all BYOND text macros

Browse Source
This commit is contained in:
Markolie
2017-02-21 15:41:37 +01:00
parent fb1cef8029
commit 6982014a6e
286 changed files with 1303 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+5 -5
View File
@@ -131,7 +131,7 @@
observer.started_as_observer = 1
close_spawn_windows()
var/obj/O = locate("landmark*Observer-Start")
to_chat(src, "\blue Now teleporting.")
to_chat(src, "<span class='notice'>Now teleporting.</span>")
observer.loc = O.loc
observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
client.prefs.update_preview_icon(1)
@@ -151,7 +151,7 @@
if(href_list["late_join"])
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, "\red The round is either not ready, or has already finished...")
to_chat(usr, "<span class='warning'>The round is either not ready, or has already finished...</span>")
return
if(client.prefs.species in whitelisted_species)
@@ -168,7 +168,7 @@
if(href_list["SelectedJob"])
if(!enter_allowed)
to_chat(usr, "\blue There is an administrative lock on entering the game!")
to_chat(usr, "<span class='notice'>There is an administrative lock on entering the game!</span>")
return
if(client.prefs.randomslot)
@@ -285,10 +285,10 @@
if(src != usr)
return 0
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, "\red The round is either not ready, or has already finished...")
to_chat(usr, "<span class='warning'>The round is either not ready, or has already finished...</span>")
return 0
if(!enter_allowed)
to_chat(usr, "\blue There is an administrative lock on entering the game!")
to_chat(usr, "<span class='notice'>There is an administrative lock on entering the game!</span>")
return 0
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
code/modules/mob/new_player/poll.dm
+13 -13
View File
@@ -59,7 +59,7 @@
break
if(!found)
to_chat(usr, "\red Poll question details not found.")
to_chat(usr, "<span class='warning'>Poll question details not found.</span>")
return
switch(polltype)
@@ -316,7 +316,7 @@
break
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
to_chat(usr, "<span class='warning'>Poll is not valid.</span>")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -329,7 +329,7 @@
break
if(!validoption)
to_chat(usr, "\red Poll option is not valid.")
to_chat(usr, "<span class='warning'>Poll option is not valid.</span>")
return
var/alreadyvoted = 0
@@ -343,11 +343,11 @@
break
if(!multichoice && alreadyvoted)
to_chat(usr, "\red You already voted in this poll.")
to_chat(usr, "<span class='warning'>You already voted in this poll.</span>")
return
if(multichoice && (alreadyvoted >= multiplechoiceoptions))
to_chat(usr, "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.")
to_chat(usr, "<span class='warning'>You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.</span>")
return
var/adminrank = "Player"
@@ -358,7 +358,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
to_chat(usr, "\blue Vote successful.")
to_chat(usr, "<span class='notice'>Vote successful.</span>")
usr << browse(null,"window=playerpoll")
@@ -383,7 +383,7 @@
break
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
to_chat(usr, "<span class='warning'>Poll is not valid.</span>")
return
var/alreadyvoted = 0
@@ -396,7 +396,7 @@
break
if(alreadyvoted)
to_chat(usr, "\red You already sent your feedback for this poll.")
to_chat(usr, "<span class='warning'>You already sent your feedback for this poll.</span>")
return
var/adminrank = "Player"
@@ -416,7 +416,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
to_chat(usr, "\blue Feedback logging successful.")
to_chat(usr, "<span class='notice'>Feedback logging successful.</span>")
usr << browse(null,"window=playerpoll")
@@ -441,7 +441,7 @@
break
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
to_chat(usr, "<span class='warning'>Poll is not valid.</span>")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -454,7 +454,7 @@
break
if(!validoption)
to_chat(usr, "\red Poll option is not valid.")
to_chat(usr, "<span class='warning'>Poll option is not valid.</span>")
return
var/alreadyvoted = 0
@@ -467,7 +467,7 @@
break
if(alreadyvoted)
to_chat(usr, "\red You already voted in this poll.")
to_chat(usr, "<span class='warning'>You already voted in this poll.</span>")
return
var/adminrank = "Player"
@@ -478,5 +478,5 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
insert_query.Execute()
to_chat(usr, "\blue Vote successful.")
to_chat(usr, "<span class='notice'>Vote successful.</span>")
usr << browse(null,"window=playerpoll")