cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Macro Replacements. (#3574)

Browse Source 
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
This commit is contained in:
Cameron653
2017-07-19 12:47:23 -05:00
committed by Anewbe
parent a3319de4f4
commit e158fcd3cc
132 changed files with 686 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+2 -2
View File
@@ -154,7 +154,7 @@
if(href_list["late_join"])
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "\red The round is either not ready, or has already finished..."
usr << "<font color='red'>The round is either not ready, or has already finished...</font>"
return
LateChoices()
@@ -318,7 +318,7 @@
if (src != usr)
return 0
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "\red The round is either not ready, or has already finished..."
usr << "<font color='red'>The round is either not ready, or has already finished...</font>"
return 0
if(!config.enter_allowed)
usr << "<span class='notice'>There is an administrative lock on entering the game!</span>"
code/modules/mob/new_player/poll.dm
+13 -13
View File
@@ -103,7 +103,7 @@
break
if(!found)
usr << "\red Poll question details not found."
usr << "<font color='red'>Poll question details not found.</font>"
return
switch(polltype)
@@ -360,7 +360,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
@@ -373,7 +373,7 @@
break
if(!validoption)
usr << "\red Poll option is not valid."
usr << "<font color='red'>Poll option is not valid.</font>"
return
var/alreadyvoted = 0
@@ -387,11 +387,11 @@
break
if(!multichoice && alreadyvoted)
usr << "\red You already voted in this poll."
usr << "<font color='red'>You already voted in this poll.</font>"
return
if(multichoice && (alreadyvoted >= multiplechoiceoptions))
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."
usr << "<font color='red'>You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.</font>"
return
var/adminrank = "Player"
@@ -402,7 +402,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Vote successful."
usr << "<font color='blue'>Vote successful.</font>"
usr << browse(null,"window=playerpoll")
@@ -427,7 +427,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/alreadyvoted = 0
@@ -440,7 +440,7 @@
break
if(alreadyvoted)
usr << "\red You already sent your feedback for this poll."
usr << "<font color='red'>You already sent your feedback for this poll.</font>"
return
var/adminrank = "Player"
@@ -460,7 +460,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Feedback logging successful."
usr << "<font color='blue'>Feedback logging successful.</font>"
usr << browse(null,"window=playerpoll")
@@ -485,7 +485,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
@@ -498,7 +498,7 @@
break
if(!validoption)
usr << "\red Poll option is not valid."
usr << "<font color='red'>Poll option is not valid.</font>"
return
var/alreadyvoted = 0
@@ -511,7 +511,7 @@
break
if(alreadyvoted)
usr << "\red You already voted in this poll."
usr << "<font color='red'>You already voted in this poll.</font>"
return
var/adminrank = "Player"
@@ -522,5 +522,5 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_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()
usr << "\blue Vote successful."
usr << "<font color='blue'>Vote successful.</font>"
usr << browse(null,"window=playerpoll")