Permalink
Browse files

Some fixes/updates to get the server info system working

  • Loading branch information...
EmperorJon committed Jan 26, 2019
1 parent 57b1709 commit 3c498d437092d0b41b95a84bf31cda888cc8e5e4
@@ -3,7 +3,7 @@ GLOBAL_VAR_INIT(max_explosion_range, 14)


var/href_logfile = null
var/game_version = "Baystation12"
var/game_version = "Cassini"
var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
var/join_motd = null
@@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(clients) //all clients
GLOBAL_LIST_EMPTY(admins) //all clients whom are admins
GLOBAL_PROTECT(admins)
GLOBAL_LIST_EMPTY(ckey_directory) //all ckeys with associated client

GLOBAL_LIST_EMPTY(acceptedKeys) //all ckeys which have pressed the "I accept joining the server" button

GLOBAL_LIST_EMPTY(player_list) //List of all mobs **with clients attached**. Excludes /mob/new_player
GLOBAL_LIST_EMPTY(human_mob_list) //List of all human mobs and sub-types, including clientless
@@ -17,6 +17,8 @@

var/adminhelped = 0

var/datum/browser/infowindow

var/staffwarn = null

///////////////
@@ -35,7 +35,7 @@
set_sight(sight|SEE_TURFS)
GLOB.player_list |= src

if (client.ckey in acceptedKeys) //Check if they've already clicked the I ACCEPT info window thing, each round once.
if (client.ckey in GLOB.acceptedKeys) //Check if they've already clicked the I ACCEPT info window thing, each round once.
new_player_panel()
else
client.check_server_info()
@@ -12,7 +12,7 @@
<br>
[file2text("config/rules.html")]
<p><b>Map info:</b></p>
[using_map.motd]
[GLOB.using_map.map_info]
<br>
<br>
<div align='center'>
@@ -52,7 +52,7 @@ client/Topic(href, href_list[])
src.infowindow.close()
if(isnewplayer(src.mob))
var/mob/new_player/M = src.mob
if(!(src.ckey in acceptedKeys)) //If they've yet to view the info window they must be just joining so we note this then show them the normal menu.
if(!(src.ckey in GLOB.acceptedKeys)) //If they've yet to view the info window they must be just joining so we note this then show them the normal menu.
M.new_player_panel()
acceptedKeys.Add(src.ckey)
GLOB.acceptedKeys.Add(src.ckey)
..()
@@ -206,10 +206,10 @@ GUEST_BAN
# GITHUBURL https://github.com/example-user/example-repository

## Upstream Github address - just for things like "This is a modified fork of [Baystation]"
# UPSTREAMURL https://github.com/example-user/example-repository
UPSTREAMURL https://github.com/Baystation12/Baystation12/

## Upstream name
# UPSTREAM Baystation12
UPSTREAM Baystation12

## GitHub new issue address
# ISSUEREPORTURL https://github.com/example-user/example-repository/issues/new
@@ -1,4 +1,4 @@
<div align='center'><h1>Welcome to Europa, colonist.</h1></div>
<div align='center'><h1>Welcome to Cassini, colonist.</h1></div>
<br>
<div>
<strong>By continuing you agree to read the rules below</strong> and get familiar with our roleplaying expectations before diving in.
@@ -6,7 +6,7 @@
<br>
<li>- <strong>No ERP (cybersex).</strong> This extends to excessive public displays of affection like making out or grinding. We don't care how realistic it is for people on a colony to bump uglies.</li>
<br>
<li>- <strong>You are expected to be competent at a job that you sign up for.</strong> This doesn't mean people learning a job are unwelcome, but if you join as a doctor with no understanding of any aspect of medicine you can expect a jobban.</li>
<li>- <strong>You are expected to perform the job that you sign up for.</strong> This doesn't mean people learning a job are unwelcome, but if you join as a doctor and intend to do nothing all round but hide in maintenance, you can expect a jobban.</li>
<br>
<li>- <strong>Racism, sexism, questionable content and spamming on OOC mediums are not appreciated.</strong> If you're saying something you wouldn't in public, do it at your own peril.</li>
<br>
@@ -19,6 +19,7 @@ GLOBAL_LIST_EMPTY(all_maps)
/datum/map
var/name = "Unnamed Map"
var/full_name = "Unnamed Map"
var/map_info = "This map has no specific information"
var/path

var/list/station_levels = list() // Z-levels the station exists on

0 comments on commit 3c498d4

Please sign in to comment.