Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Vetinari
2014-02-21 20:01:33 +11:00
69 changed files with 2240 additions and 2952 deletions
+8
View File
@@ -792,6 +792,14 @@ var/list/ghostteleportlocs = list()
name = "\improper Security Dormitories"
icon_state = "Sleep"
/area/crew_quarters/sleep/bedrooms
name = "\improper Dormitory Bedroom"
icon_state = "Sleep"
/area/crew_quarters/sleep/cryo
name = "\improper Cryogenic Storage"
icon_state = "Sleep"
/area/crew_quarters/sleep_male
name = "\improper Male Dorm"
icon_state = "Sleep"