TG Sync 12/15/17

s s
2017-12-15 03:28:09 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -16,7 +16,7 @@

 	var/list/cards = list()

-/obj/item/deck/New()
+/obj/item/deck/Initialize()
 	. = ..()

 	var/cardcolor
@@ -187,7 +187,7 @@
 	ASSERT(H)

 	usr.visible_message("\The [usr] plays \the [card.name].")
-	H.loc = get_step(usr,usr.dir)
+	H.forceMove(get_step(usr,usr.dir))

 	src.update_icon()