Merge pull request #9764 from Ghommie/Ghommie-cit335

Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
parent 30a6df88c6 1e49ce76d3
commit 3015ec5c04
76 changed files with 149 additions and 118 deletions
@@ -410,7 +410,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 		for (var/child in entries)
 			winset(src, "[child]", "[entries[child]]")
 			if (!ispath(child, /datum/verbs/menu))
-				var/atom/verb/verbpath = child
+				var/procpath/verbpath = child
 				if (copytext(verbpath.name,1,2) != "@")
 					new child(src)

@@ -2328,9 +2328,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		character.Digitigrade_Leg_Swap(TRUE)

 	//let's be sure the character updates
-	character.update_body()
-	character.update_hair()
-	character.update_body_parts()
+	if(icon_updates)
+		character.update_body()
+		character.update_hair()
+		character.update_body_parts()

 /datum/preferences/proc/get_default_name(name_id)
 	switch(name_id)