Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763

[MIRROR] Configuration datum refactor
This commit is contained in:
LetterJay
2017-10-01 02:50:17 -04:00
committed by GitHub
138 changed files with 3709 additions and 3500 deletions
+1 -1
View File
@@ -280,7 +280,7 @@
if(can_hit_target(original, permutated))
Collide(original)
Range()
sleep(config.run_speed * 0.9)
sleep(CONFIG_GET(number/run_delay) * 0.9)
//Returns true if the target atom is on our current turf and above the right layer
/obj/item/projectile/proc/can_hit_target(atom/target, var/list/passthrough)
+3 -1
View File
@@ -276,7 +276,9 @@
to_chat(new_mob, "<span class='warning'>Your form morphs into that of a [randomize].</span>")
to_chat(new_mob, config.policies["polymorph"])
var/poly_msg = CONFIG_GET(keyed_string_list/policy)["polymorph"]
if(poly_msg)
to_chat(new_mob, poly_msg)
qdel(M)
return new_mob