Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts: # code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
parent 7e20f4f884 8e442b5472
commit 06181f51ae
708 changed files with 22153 additions and 13237 deletions
@@ -553,7 +553,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 			A.power_equip = power_equip
 			A.power_environ = power_environ
 			INVOKE_ASYNC(A, .proc/power_change)
-	update_icon()
+	update_appearance()

 /area/proc/usage(chan)
 	switch(chan)