Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-03-03 03:08:41 -07:00
parent c21bd60929 fde24492b9
commit 1e99cd0bfe
485 changed files with 2456 additions and 2614 deletions
@@ -139,13 +139,6 @@
 /obj/effect/temp_visual/dir_setting/curse/hand
 	icon_state = "cursehand"

-/obj/effect/temp_visual/dir_setting/curse/hand/Initialize(mapload, set_dir, handedness)
-	. = ..()
-	update_icon()
-
-/obj/item/projectile/curse_hand/update_icon()
-	icon_state = "[icon_state][handedness]"
-
 /obj/effect/temp_visual/wizard
 	name = "water"
 	icon = 'icons/mob/mob.dmi'
@@ -474,7 +467,7 @@
 	else
 		update_icon()

-/obj/effect/constructing_effect/update_icon()
+/obj/effect/constructing_effect/update_icon_state()
 	icon_state = "rcd"
 	if (delay < 10)
 		icon_state += "_shortest"