Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
This commit is contained in:
kevinz000
2017-08-22 04:04:21 -07:00
committed by GitHub
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
File diff suppressed because it is too large Load Diff
@@ -1,29 +0,0 @@
diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm (rejected hunks)
@@ -535,15 +535,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/toilet/fitness
name = "Fitness Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/female
name = "Female Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/male
name = "Male Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/restrooms
name = "Restrooms"
icon_state = "toilet"
@@ -1009,7 +1009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/execution/transfer
name = "Transfer Centre"
-
+
/area/security/execution/education
name = "Prisoner Education Chamber"
+1 -1
View File
@@ -58,7 +58,7 @@
'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\
'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\
'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
flags_1 = CAN_BE_DIRTY_1
flags = CAN_BE_DIRTY
var/list/firedoors
var/firedoors_last_closed_on = 0
+6 -6
View File
@@ -9,7 +9,7 @@
has_gravity = TRUE
noteleport = TRUE
blob_allowed = FALSE //Should go without saying, no blobs should take over centcom as a win condition.
flags_1 = NONE
flags = NONE
/area/centcom/control
name = "CentCom Docks"
@@ -37,7 +37,7 @@
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
has_gravity = TRUE
flags_1 = NONE
flags = NONE
/area/tdome/arena
name = "Thunderdome Arena"
@@ -76,7 +76,7 @@
requires_power = FALSE
has_gravity = TRUE
noteleport = TRUE
flags_1 = NONE
flags = NONE
//Abductors
/area/abductor_ship
@@ -85,7 +85,7 @@
requires_power = FALSE
noteleport = TRUE
has_gravity = TRUE
flags_1 = NONE
flags = NONE
//Syndicates
/area/syndicate_mothership
@@ -95,7 +95,7 @@
has_gravity = TRUE
noteleport = TRUE
blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win.
flags_1 = NONE
flags = NONE
/area/syndicate_mothership/control
name = "Syndicate Control Room"
@@ -115,7 +115,7 @@
icon_state = "yellow"
requires_power = FALSE
has_gravity = TRUE
flags_1 = NO_DEATHRATTLE_1
flags = NO_DEATHRATTLE
/area/ctf/control_room
name = "Control Room A"
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Holodeck"
icon_state = "Holodeck"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
flags_1 = 0
flags = 0
hidden = TRUE
var/obj/machinery/computer/holodeck/linked
+3 -3
View File
@@ -16,7 +16,7 @@
power_light = FALSE
outdoors = TRUE
ambientsounds = list('sound/ambience/ambimine.ogg')
flags_1 = NONE
flags = NONE
/area/mine/unexplored
name = "Mine"
@@ -30,7 +30,7 @@
power_light = FALSE
outdoors = TRUE
ambientsounds = list('sound/ambience/ambimine.ogg')
flags_1 = NONE
flags = NONE
/area/mine/lobby
name = "Mining Station"
@@ -86,7 +86,7 @@
/area/lavaland
icon_state = "mining"
has_gravity = TRUE
flags_1 = NONE
flags = NONE
/area/lavaland/surface
name = "Lavaland"