Merge pull request #526 from Citadel-Station-13/upstream-merge-26289

[MIRROR] Changed alternate appearances to /datum/atom_hud s
2017-04-25 21:39:14 -05:00
parent 993bea0342 feb3569d13
commit 6dc70fc02f
12 changed files with 126 additions and 177 deletions
@@ -37,7 +37,7 @@
 		I.override = 1
 		I.pixel_x -= owner.pixel_x
 		I.pixel_y -= owner.pixel_y
-		owner.add_alt_appearance("smallqueen", I, list(owner))
+		owner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic, "smallqueen", I)

 		small = 1
 	else
@@ -37,12 +37,6 @@

 	client.sethotkeys() //set mob specific hotkeys

-	if(viewing_alternate_appearances && viewing_alternate_appearances.len)
-		for(var/aakey in viewing_alternate_appearances)
-			for(var/aa in viewing_alternate_appearances[aakey])
-				var/datum/alternate_appearance/AA = aa
-				AA.display_to(list(src))
-
 	update_client_colour()
 	if(client)
 		client.click_intercept = null
@@ -29,6 +29,9 @@
 	prepare_huds()
 	can_ride_typecache = typecacheof(can_ride_typecache)
 	hook_vr("mob_new",list(src))
+	for(var/v in GLOB.active_alternate_appearances)
+		var/datum/atom_hud/alternate_appearance/AA = v
+		AA.onNewMob(src)
 	..()

 /atom/proc/prepare_huds()
@@ -0,0 +1,11 @@
+diff a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm	(rejected hunks)
+@@ -28,6 +28,9 @@
+ 		GLOB.living_mob_list += src
+ 	prepare_huds()
+ 	can_ride_typecache = typecacheof(can_ride_typecache)
+	for(var/v in GLOB.active_alternate_appearances)
+		var/datum/atom_hud/alternate_appearance/AA = v
+		AA.onNewMob(src)
+ 	..()
+ 
+ /atom/proc/prepare_huds()