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

2019-12-28 23:41:10 +01:00
parent 37441437d1 7e5e241bd2
commit 7837688426
84 changed files with 15426 additions and 12269 deletions
@@ -29,7 +29,7 @@
 	name = linked_pod.name
 	. = ..()

-/mob/living/simple_animal/pet/gondola/gondolapod/proc/update_icon()
+/mob/living/simple_animal/pet/gondola/gondolapod/update_icon_state()
 	if(opened)
 		icon_state = "gondolapod_open"
 	else