cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port

Browse Source 
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	maps/tgstation.dmm
This commit is contained in:
Chris
2014-10-31 12:01:56 -05:00
parent 10ecc2585d 2eb8ebcec6
commit 8a3e9b2428
165 changed files with 4146 additions and 2186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/controllers/configuration.dm
View File

@@ -147,6 +147,11 @@
var/assistantlimit = 0 //enables assistant limiting
var/assistantratio = 2 //how many assistants to security members
var/emag_energy = -1
var/emag_starts_charged = 1
var/emag_recharge_rate = 0
var/emag_recharge_ticks = 0
/datum/configuration/New()
. = ..()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -544,6 +549,14 @@
config.limbs_can_break = value
if("respawn_delay")
config.respawn_delay = value
if("emag_energy")
config.emag_energy = value
if("emag_starts_charged")
config.emag_starts_charged = value
if("emag_recharge_rate")
config.emag_recharge_rate = value
if("emag_recharge_ticks")
config.emag_recharge_ticks = value
else
diary << "Unknown setting in configuration: '[name]'"