From 114cfbb20839c9a349b0cb3fe0d8a302bc96534b Mon Sep 17 00:00:00 2001 From: Sparkezel <53384660+Sparkezel@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:55:11 +0100 Subject: [PATCH] Bitflags urgent (cult cannot make runes/ build structures in maint, blobbo cant place core in library and few other spots) fix (#57393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stanisław <1haslo4@gmail.com> --- code/game/area/areas/centcom.dm | 8 +++---- code/game/area/areas/holodeck.dm | 1 - code/game/area/areas/mining.dm | 2 +- code/game/area/areas/shuttles.dm | 8 +++---- code/game/area/space_station_13_areas.dm | 23 ++++++++----------- code/modules/mining/equipment/survival_pod.dm | 2 +- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 3fee6da7e98..52b5b5f330f 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -11,7 +11,7 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT + area_flags = UNIQUE_AREA | NOTELEPORT flags_1 = NONE /area/centcom/control @@ -123,7 +123,7 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT + area_flags = UNIQUE_AREA | NOTELEPORT flags_1 = NONE network_root_id = "MAGIC_NET" @@ -132,7 +132,7 @@ name = "Abductor Ship" icon_state = "yellow" requires_power = FALSE - area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT + area_flags = UNIQUE_AREA | NOTELEPORT has_gravity = STANDARD_GRAVITY flags_1 = NONE network_root_id = "ALIENS" @@ -143,7 +143,7 @@ icon_state = "syndie-ship" requires_power = FALSE has_gravity = STANDARD_GRAVITY - area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT + area_flags = UNIQUE_AREA | NOTELEPORT flags_1 = NONE ambience_index = AMBIENCE_DANGER network_root_id = SYNDICATE_NETWORK_ROOT diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index 7cdd0d09c7b..4b6934799c0 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -3,7 +3,6 @@ icon_state = "Holodeck" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED flags_1 = NONE - area_flags = VALID_TERRITORY | UNIQUE_AREA sound_environment = SOUND_ENVIRONMENT_PADDED_CELL var/obj/machinery/computer/holodeck/linked diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 7b17281a432..a832a541428 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -16,7 +16,7 @@ outdoors = TRUE flags_1 = NONE ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS | CULT_PERMITTED sound_environment = SOUND_AREA_STANDARD_STATION min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 22af9dcb780..1d17c4afc7f 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -106,19 +106,19 @@ /area/shuttle/pod_1 name = "Escape Pod One" - area_flags = BLOBS_ALLOWED + area_flags = NONE /area/shuttle/pod_2 name = "Escape Pod Two" - area_flags = BLOBS_ALLOWED + area_flags = NONE /area/shuttle/pod_3 name = "Escape Pod Three" - area_flags = BLOBS_ALLOWED + area_flags = NONE /area/shuttle/pod_4 name = "Escape Pod Four" - area_flags = BLOBS_ALLOWED + area_flags = NONE /area/shuttle/mining name = "Mining Shuttle" diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index 68efb09170a..461b9fc52d4 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -153,7 +153,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance name = "Generic Maintenance" ambience_index = AMBIENCE_MAINT - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED airlock_wires = /datum/wires/airlock/maint sound_environment = SOUND_AREA_TUNNEL_ENCLOSED @@ -234,7 +234,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/science/xenobiology name = "Xenobiology Maintenance" icon_state = "xenomaint" - area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE + area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED //Maintenance - Generic @@ -480,11 +480,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/commons name = "Crew Quarters" sound_environment = SOUND_AREA_STANDARD_STATION + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED /area/commons/dorms name = "Dormitories" icon_state = "dorms" - area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA /area/commons/dorms/barracks name = "Sleep Barracks" @@ -648,7 +648,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station mood_bonus = 5 mood_message = "I love being in the library!\n" mood_trait = TRAIT_INTROVERT - area_flags = CULT_PERMITTED + area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA sound_environment = SOUND_AREA_LARGE_SOFTFLOOR /area/service/library/lounge @@ -675,7 +675,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/service/library/abandoned name = "Abandoned Library" icon_state = "abandoned_library" - area_flags = CULT_PERMITTED /area/service/chapel icon_state = "chapel" @@ -716,7 +715,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/service/janitor name = "Custodial Closet" icon_state = "janitor" - area_flags = CULT_PERMITTED + area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/service/hydroponics @@ -760,7 +759,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/atmos name = "Atmospherics" icon_state = "atmos" - area_flags = CULT_PERMITTED /area/engineering/atmos/upper name = "Upper Atmospherics" @@ -768,7 +766,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/atmospherics_engine name = "Atmospherics Engine" icon_state = "atmos_engine" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED /area/engineering/lobby name = "Engineering Lobby" @@ -777,7 +775,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/supermatter name = "Supermatter Engine" icon_state = "engine_sm" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engineering/break_room @@ -810,7 +808,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/storage/tcomms name = "Telecomms Storage" icon_state = "tcom" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED //Engineering - Construction @@ -995,7 +993,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/virology name = "Virology" icon_state = "virology" - area_flags = CULT_PERMITTED /area/medical/morgue name = "Morgue" @@ -1261,7 +1258,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/science/test_area name = "Toxins Test Area" icon_state = "tox_test" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED /area/science/mixing name = "Toxins Mixing Lab" @@ -1270,7 +1267,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/science/mixing/chamber name = "Toxins Mixing Chamber" icon_state = "tox_mix_chamber" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED /area/science/genetics name = "Genetics Lab" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index dd2083d729f..5c1664b5659 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -5,7 +5,7 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - area_flags = BLOBS_ALLOWED | UNIQUE_AREA + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED flags_1 = CAN_BE_DIRTY_1 //Survival Capsule