cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/login.dm
-1
View File
@@ -3,7 +3,6 @@
if(join_motd)
to_chat(src, "<div class=\"motd\">[join_motd]</div>")
if(!mind)
mind = new /datum/mind(key)
mind.active = 1
code/modules/mob/new_player/new_player.dm
-13
View File
@@ -121,12 +121,10 @@
to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo
observer.started_as_observer = 1
close_spawn_windows()
var/obj/O = locate("landmark*Observer-Start")
to_chat(src, "\blue Now teleporting.")
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)
@@ -147,14 +145,12 @@
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...")
return
if(client.prefs.species in whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))
return 0
LateChoices()
@@ -166,13 +162,11 @@
if(!enter_allowed)
to_chat(usr, "\blue There is an administrative lock on entering the game!")
return
if(client.prefs.species in whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))
return 0
AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
@@ -214,7 +208,6 @@
if( (id_max - id_min) > 100 ) //Basic exploit prevention
to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.")
return
for(var/optionid = id_min; optionid <= id_max; optionid++)
@@ -234,7 +227,6 @@
if( (id_max - id_min) > 100 ) //Basic exploit prevention
to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.")
return
for(var/optionid = id_min; optionid <= id_max; optionid++)
@@ -267,15 +259,12 @@
return 0
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, "\red The round is either not ready, or has already finished...")
return 0
if(!enter_allowed)
to_chat(usr, "\blue There is an administrative lock on entering the game!")
return 0
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
return 0
job_master.AssignRole(src, rank, 1)
@@ -315,7 +304,6 @@
join_message = S.msg
else
to_chat(character, "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
character.loc = pick(latejoin)
join_message = "has arrived on the station"
else
@@ -431,7 +419,6 @@
to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo
if(mind)
mind.active = 0 //we wish to transfer the key manually
if(mind.assigned_role == "Clown") //give them a clownname if they are a clown
code/modules/mob/new_player/poll.dm
-14
View File
@@ -60,7 +60,6 @@
if(!found)
to_chat(usr, "\red Poll question details not found.")
return
switch(polltype)
@@ -318,7 +317,6 @@
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -332,7 +330,6 @@
if(!validoption)
to_chat(usr, "\red Poll option is not valid.")
return
var/alreadyvoted = 0
@@ -347,12 +344,10 @@
if(!multichoice && alreadyvoted)
to_chat(usr, "\red You already voted in this poll.")
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.")
return
var/adminrank = "Player"
@@ -364,7 +359,6 @@
insert_query.Execute()
to_chat(usr, "\blue Vote successful.")
usr << browse(null,"window=playerpoll")
@@ -390,7 +384,6 @@
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
return
var/alreadyvoted = 0
@@ -404,7 +397,6 @@
if(alreadyvoted)
to_chat(usr, "\red You already sent your feedback for this poll.")
return
var/adminrank = "Player"
@@ -419,14 +411,12 @@
if(!text_pass)
to_chat(usr, "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again.")
return
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.")
usr << browse(null,"window=playerpoll")
@@ -452,7 +442,6 @@
if(!validpoll)
to_chat(usr, "\red Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -466,7 +455,6 @@
if(!validoption)
to_chat(usr, "\red Poll option is not valid.")
return
var/alreadyvoted = 0
@@ -480,7 +468,6 @@
if(alreadyvoted)
to_chat(usr, "\red You already voted in this poll.")
return
var/adminrank = "Player"
@@ -492,5 +479,4 @@
insert_query.Execute()
to_chat(usr, "\blue Vote successful.")
usr << browse(null,"window=playerpoll")