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

grug hates merge conflicts

Browse Source
This commit is contained in:
Detective Google
2020-01-12 15:19:44 -06:00
parent f6c5f81a83
commit c7dcd0c8a3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+1 -5
View File
@@ -1,16 +1,12 @@
/* /*
### This file contains a list of all the areas in your station. Format is as follows: ### This file contains a list of all the areas in your station. Format is as follows:
/area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want) /area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want)
name = "NICE NAME" (not required but makes things really nice) name = "NICE NAME" (not required but makes things really nice)
icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi')
icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
requires_power = FALSE (defaults to true) requires_power = FALSE (defaults to true)
music = null (defaults to nothing, look in sound/ambience for music) music = null (defaults to nothing, look in sound/ambience for music)
NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0 NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0
*/ */
@@ -1353,4 +1349,4 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/tcommsat/lounge /area/tcommsat/lounge
name = "Telecommunications Satellite Lounge" name = "Telecommunications Satellite Lounge"
icon_state = "tcomsatlounge" icon_state = "tcomsatlounge"