[s]Exploit whack-a-mole

This commit is contained in:
CitadelStationBot
2017-04-25 01:31:50 -05:00
parent d0c28c0d51
commit 607868a5de
16 changed files with 66 additions and 36 deletions
+3 -3
View File
@@ -291,7 +291,7 @@
GLOB.abandon_allowed = respawn
/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
var/list/Lines = file2list(filename)
var/list/Lines = world.file2list(filename)
for(var/t in Lines)
if(!t)
@@ -785,7 +785,7 @@
/datum/configuration/proc/loadmaplist(filename)
var/list/Lines = file2list(filename)
var/list/Lines = world.file2list(filename)
var/datum/map_config/currentmap = null
for(var/t in Lines)
@@ -835,7 +835,7 @@
/datum/configuration/proc/loadsql(filename)
var/list/Lines = file2list(filename)
var/list/Lines = world.file2list(filename)
for(var/t in Lines)
if(!t)
continue
+2 -2
View File
@@ -625,8 +625,8 @@ SUBSYSTEM_DEF(ticker)
if(selected_tip)
m = selected_tip
else
var/list/randomtips = file2list("config/tips.txt")
var/list/memetips = file2list("config/sillytips.txt")
var/list/randomtips = world.file2list("config/tips.txt")
var/list/memetips = world.file2list("config/sillytips.txt")
if(randomtips.len && prob(95))
m = pick(randomtips)
else if(memetips.len)
+10
View File
@@ -0,0 +1,10 @@
diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks)
@@ -60,7 +60,7 @@ SUBSYSTEM_DEF(ticker)
var/list/round_start_events
/datum/controller/subsystem/ticker/Initialize(timeofday)
- var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n")
+ var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
login_music = pick(music)
if(!GLOB.syndicate_code_phrase)