Merge branch 'development' of https://github.com/Aurorastation/Aurora into master_languages

Conflicts:
	code/controllers/verbs.dm
	html/changelog.html

Signed-off-by: Jamini <mobiousjami@gmail.com>

code/modules/mob/new_player/new_player.dm

@@ -38,10 +38,15 @@
 
 		output += "<p><a href='byond://?src=\ref[src];observe=1'>Observe</A></p>"
 
+		//Station Directives
+		if(config.invasive_directives)
+			output += "<p><a href='byond://?src=\ref[src];showdirectives=1'>Station Directives</a></p>"
+
 		if(!IsGuestKey(src.key))
 			establish_db_connection()
 
 			if(dbcon.IsConnected())
+
 				var/isadmin = 0
 				if(src.client && src.client.holder)
 					isadmin = 1
@@ -59,7 +64,7 @@
 
 		output += "</div>"
 
-		src << browse(output,"window=playersetup;size=210x240;can_close=0")
+		src << browse(output,"window=playersetup;size=210x260;can_close=0")
 		return
 
 	Stat()
@@ -275,6 +280,9 @@
 						if(!isnull(href_list["option_[optionid]"]))	//Test if this optionid was selected
 							vote_on_poll(pollid, optionid, 1)
 
+		if(href_list["showdirectives"])
+			client.directiveslookup()
+
 	proc/IsJobAvailable(rank)
 		var/datum/job/job = job_master.GetJob(rank)
 		if(!job)	return 0