shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revises the_station_areas list

Browse Source
This commit is contained in:
Leo
2017-11-24 18:12:44 -02:00
committed by CitadelStationBot
parent 9f7b3a11c3
commit 521277292d
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+4 -1
View File
@@ -1486,6 +1486,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"
<<<<<<< HEAD
/////////////////////////////////////////////////////////////////////
/*
@@ -1518,4 +1519,6 @@ GLOBAL_LIST_INIT(the_station_areas, list (
/area/ai_monitored/turret_protected/ai_upload, //do not try to simplify to "/area/ai_monitored/turret_protected" --rastaf0
/area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai,
))
))
=======
>>>>>>> 3d28b08... Merge pull request #32998 from ShizCalev/area-list