Haha, okay... this will break Kilo

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
parent 501019ef75 214cd92fef
commit 4af2eee9dd
516 changed files with 8987 additions and 4205 deletions
@@ -1383,3 +1383,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/tcommsat/lounge
 	name = "Telecommunications Satellite Lounge"
 	icon_state = "tcomsatlounge"
+
+/area/crew_quarters/fitness/pool
+	name = "Pool Area"
+	icon_state = "pool"