From 3c498d437092d0b41b95a84bf31cda888cc8e5e4 Mon Sep 17 00:00:00 2001 From: Jonathon Douglas Date: Sat, 26 Jan 2019 18:53:44 +0000 Subject: [PATCH] Some fixes/updates to get the server info system working --- code/_global_vars/configuration.dm | 2 +- code/_global_vars/mobs.dm | 2 +- code/modules/client/client_defines.dm | 2 ++ code/modules/mob/new_player/login.dm | 2 +- code/modules/mob/new_player/server_info_window.dm | 6 +++--- config/example/config.txt | 4 ++-- config/example/motd.txt | 2 +- config/example/rules.html | 2 +- maps/~mapsystem/maps.dm | 1 + 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/code/_global_vars/configuration.dm b/code/_global_vars/configuration.dm index 862e22d344..5b397094f7 100644 --- a/code/_global_vars/configuration.dm +++ b/code/_global_vars/configuration.dm @@ -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 diff --git a/code/_global_vars/mobs.dm b/code/_global_vars/mobs.dm index 3e7b7289da..1daed87721 100644 --- a/code/_global_vars/mobs.dm +++ b/code/_global_vars/mobs.dm @@ -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 diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index ec68ad3893..1befad542f 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -17,6 +17,8 @@ var/adminhelped = 0 + var/datum/browser/infowindow + var/staffwarn = null /////////////// diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 5bfbf6ff12..60d723a791 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -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() diff --git a/code/modules/mob/new_player/server_info_window.dm b/code/modules/mob/new_player/server_info_window.dm index e71180fe94..38ff86c754 100644 --- a/code/modules/mob/new_player/server_info_window.dm +++ b/code/modules/mob/new_player/server_info_window.dm @@ -12,7 +12,7 @@
[file2text("config/rules.html")]

Map info:

- [using_map.motd] + [GLOB.using_map.map_info]

@@ -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) ..() \ No newline at end of file diff --git a/config/example/config.txt b/config/example/config.txt index 1057cc61ba..8217fe57bd 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -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 diff --git a/config/example/motd.txt b/config/example/motd.txt index 7c0d3245a1..6ec1972f3d 100644 --- a/config/example/motd.txt +++ b/config/example/motd.txt @@ -1,4 +1,4 @@ -

Welcome to Europa, colonist.

+

Welcome to Cassini, colonist.


By continuing you agree to read the rules below and get familiar with our roleplaying expectations before diving in. diff --git a/config/example/rules.html b/config/example/rules.html index fbc0e32566..b7362a4061 100644 --- a/config/example/rules.html +++ b/config/example/rules.html @@ -6,7 +6,7 @@
  • - No ERP (cybersex). 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.

    • -
  • - You are expected to be competent at a job that you sign up for. 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.
    • +
  • - You are expected to perform the job that you sign up for. 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.

  • - Racism, sexism, questionable content and spamming on OOC mediums are not appreciated. If you're saying something you wouldn't in public, do it at your own peril.

    • diff --git a/maps/~mapsystem/maps.dm b/maps/~mapsystem/maps.dm index 572900e36e..77a74098ba 100644 --- a/maps/~mapsystem/maps.dm +++ b/maps/~mapsystem/maps.dm @@ -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