cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-22 20:07:45 +02:00
parent 8c55d1cc3f 38f6ff2404
commit 48af4c881c
339 changed files with 12177 additions and 5535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/configuration.dm
View File

@@ -237,7 +237,8 @@ var/list/gamemode_cache = list()
var/static/dooc_allowed = 1
var/static/dsay_allowed = 1
var/persistence_enabled = 1
var/persistence_disabled = FALSE
var/persistence_ignore_mapload = FALSE
var/allow_byond_links = 0
var/allow_discord_links = 0
@@ -583,8 +584,11 @@ var/list/gamemode_cache = list()
if("protect_roles_from_antagonist")
config.protect_roles_from_antagonist = 1
if ("persistence_enabled")
config.persistence_enabled = 1
if("persistence_disabled")
config.persistence_disabled = TRUE // Previously this forcibly set persistence enabled in the saves.
if("persistence_ignore_mapload")
config.persistence_ignore_mapload = TRUE
if ("probability")
var/prob_pos = findtext(value, " ")

2
code/controllers/subsystems/persistence.dm
View File

@@ -19,7 +19,7 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/track_value(var/atom/value, var/track_type)
if(config.persistence_enabled == 0) //if the config is not set to persistent nothing will save or load.
if(config.persistence_disabled) //if the config is set to persistence disabled, nothing will save or load.
return
var/turf/T = get_turf(value)