manual merge

2017-04-29 07:57:16 -05:00
parent bcab389ca2
commit 0cf401934b
4 changed files with 7 additions and 16 deletions
@@ -161,8 +161,8 @@
 			return locate(world.maxx,y,z)
 	return get_turf(src)

-/obj/machinery/bsa/full/New(loc,cannon_direction = WEST)
-	..()
+/obj/machinery/bsa/full/Initialize(mapload, cannon_direction = WEST)
+	. = ..()
 	top_layer = top_layer || mutable_appearance(icon, layer = ABOVE_MOB_LAYER)
 	switch(cannon_direction)
 		if(WEST)