Merge pull request #676 from Citadel-Station-13/upstream-merge-26725

[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
This commit is contained in:
kevinz000
2017-05-07 19:37:35 -07:00
committed by GitHub
5 changed files with 81 additions and 29 deletions
@@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
/obj/item/stack/tile/brass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.brass_recipes
..()
. = ..()
pixel_x = 0
pixel_y = 0
@@ -13,8 +13,8 @@
var/turf_type = null
var/mineralType = null
/obj/item/stack/tile/New(loc, amount)
..()
/obj/item/stack/tile/Initialize(mapload, amount)
. = ..()
pixel_x = rand(-3, 3)
pixel_y = rand(-3, 3) //randomize a little