Merge and compile fixes, changelog too.

This commit is contained in:
Erthilo
2012-05-19 02:39:50 +01:00
parent 0cec252e5b
commit 4406fca8c2
4 changed files with 17 additions and 14 deletions
+1 -1
View File
@@ -97,7 +97,7 @@ obj/structure/door_assembly
name = "Research Airlock Assembly"
icon_state = "door_as_res1"
glass_base_icon_state = "door_as_gres"
glass_type = /obj/machinery/door/airlock/glass_research
glass_type = /obj/machinery/door/airlock/glass/glass_research
airlock_type = /obj/machinery/door/airlock/research
anchored = 1
density = 1