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

2020-04-21 01:53:41 +02:00
parent e0d219650f 79eb0f5838
commit c93f028a97
332 changed files with 1368 additions and 761 deletions
@@ -22,6 +22,9 @@

 	return ..()

+/obj/structure/closet/crate/critter/update_icon_state()
+	return
+
 /obj/structure/closet/crate/critter/closet_update_overlays(list/new_overlays)
 	. = new_overlays
 	if(opened)
@@ -35,4 +38,4 @@
 	if(tank)
 		return tank.air_contents
 	else
-		return loc.return_air()
+		return loc.return_air()