Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311

2018-01-01 07:00:34 -06:00
parent 86c5f3cb0b 6bafa75ee8
commit 168519c328
123 changed files with 2367 additions and 3835 deletions
@@ -493,7 +493,7 @@
 	color = null

 /obj/item/device/flashlight/glowstick/random/Initialize()
-	. = ..()
+	..()
 	var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
 	new T(loc)
 	return INITIALIZE_HINT_QDEL