cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-21 20:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm
This commit is contained in:
PsiOmega
2015-07-26 10:21:36 +02:00
parent 0e71eb1a34 ba467899f4
commit bd6ec4a98e
16 changed files with 125 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/ToRban.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/proc/ToRban_update()
spawn(0)
log_misc("Downloading updated ToR data...")
var/http[] = world.Export("http://exitlist.torproject.org/exit-addresses")
var/http[] = world.Export("https://check.torproject.org/exit-addresses")
var/list/rawlist = file2list(http["CONTENT"])
if(rawlist.len)