cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 19:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2017-11-11 20:57:28 +02:00
parent 73a10d20e2 7f0aca683a
commit 7dc02be204
68 changed files with 276321 additions and 133747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
-1
View File
@@ -19,7 +19,6 @@ var/warrant_uid = 0
available_on_ntnet = 1
required_access_download = access_hos
required_access_run = access_security
usage_flags = PROGRAM_ALL
nanomodule_path = /datum/nano_module/program/digitalwarrant/
/datum/nano_module/program/digitalwarrant/