cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into playingWithTravis

Browse Source
This commit is contained in:
Kelenius
2016-03-23 17:12:11 +03:00
parent 7fb2c0d467 c792efa2ed
commit e883863f4b
311 changed files with 5435 additions and 5458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/Processes/garbage.dm
View File

@@ -58,7 +58,7 @@ world/loop_checks = 0
if(A.loc != null)
testing("GC: [A] | [A.type] is located in [A.loc] instead of null")
if(A.contents.len)
testing("GC: [A] | [A.type] has contents: [list2text(A.contents)]")
testing("GC: [A] | [A.type] has contents: [jointext(A.contents)]")
if(searching.len)
for(var/atom/D in world)
LookForRefs(D, searching)

2
code/controllers/Processes/inactivity.dm
View File

@@ -6,7 +6,7 @@
if(config.kick_inactive)
for(var/client/C in clients)
if(!C.holder && C.is_afk(config.kick_inactive MINUTES))
if(!istype(C.mob, /mob/dead))
if(!istype(C.mob, /mob/observer/dead))
log_access("AFK: [key_name(C)]")
C << "<SPAN CLASS='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</SPAN>"
del(C) // Don't qdel, cannot override finalize_qdel behaviour for clients.

8
code/controllers/configuration.dm
View File

@@ -265,7 +265,7 @@ var/list/gamemode_cache = list()
if(type == "config")
switch (name)
if ("resource_urls")
config.resource_urls = text2list(value, " ")
config.resource_urls = splittext(value, " ")
if ("admin_legacy_system")
config.admin_legacy_system = 1
@@ -337,7 +337,7 @@ var/list/gamemode_cache = list()
config.generate_asteroid = 1
if ("asteroid_z_levels")
config.asteroid_z_levels = text2list(value, ";")
config.asteroid_z_levels = splittext(value, ";")
//Numbers get stored as strings, so we'll fix that right now.
for(var/z_level in config.asteroid_z_levels)
z_level = text2num(z_level)
@@ -696,7 +696,7 @@ var/list/gamemode_cache = list()
config.starlight = value >= 0 ? value : 0
if("ert_species")
config.ert_species = text2list(value, ";")
config.ert_species = splittext(value, ";")
if(!config.ert_species.len)
config.ert_species += "Human"
@@ -707,7 +707,7 @@ var/list/gamemode_cache = list()
config.aggressive_changelog = 1
if("default_language_prefixes")
var/list/values = text2list(value, " ")
var/list/values = splittext(value, " ")
if(values.len > 0)
language_prefixes = values