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

rej clean up

Browse Source 
more areas
This commit is contained in:
LetterJay
2017-05-30 20:08:53 -05:00
parent 24d6643623
commit adb7a9b6ff
11 changed files with 727 additions and 4240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas/misc.dm
+10 -3
View File
@@ -116,14 +116,21 @@
name = "Solitary Confinement"
icon_state = "brig"
/area/prison/cell_block/A
/area/prison/execution_room
name = "Prisoner Education Chamber"
icon_state = "armory"
/area/prison/cell_block/a
// /area/prison/cell_block/A
name = "Prison Cell Block A"
icon_state = "brig"
/area/prison/cell_block/B
/area/prison/cell_block/b
// /area/prison/cell_block/B
name = "Prison Cell Block B"
icon_state = "brig"
/area/prison/cell_block/C
/area/prison/cell_block/c
// /area/prison/cell_block/C
name = "Prison Cell Block C"
icon_state = "brig"
code/game/area/areas/misc.dm.rej
-22
View File
@@ -1,22 +0,0 @@
diff a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm (rejected hunks)
@@ -120,14 +120,17 @@
name = "Prisoner Education Chamber"
icon_state = "armory"
-/area/prison/cell_block/A
+/area/prison/cell_block/a
+// /area/prison/cell_block/A
name = "Prison Cell Block A"
icon_state = "brig"
-/area/prison/cell_block/B
+/area/prison/cell_block/b
+// /area/prison/cell_block/B
name = "Prison Cell Block B"
icon_state = "brig"
-/area/prison/cell_block/C
+/area/prison/cell_block/c
+// /area/prison/cell_block/C
name = "Prison Cell Block C"
icon_state = "brig"