Merge branch 'master' into Overmap-Ports

This commit is contained in:
Captain277
2021-09-19 18:06:19 -07:00
32 changed files with 220 additions and 157 deletions

View File

@@ -1013,177 +1013,177 @@
//TFF 28/8/19 - cleanup of areas placement
/area/crew_quarters/sleep/vistor_room_1
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_2
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_3
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_4
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_5
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_6
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_7
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_8
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_9
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_10
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_11
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_12
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_1
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_2
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_3
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_4
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_5
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_6
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_7
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_8
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_9
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_10
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_3/holo
name = "\improper Dorm 3 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_5/holo
name = "\improper Dorm 5 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_7/holo
name = "\improper Dorm 7 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm1
name = "\improper Visitor Lodging 1"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm2
name = "\improper Visitor Lodging 2"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm3
name = "\improper Visitor Lodging 3"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm4
name = "\improper Visitor Lodging 4"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_basic
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_desert
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_seating
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_beach
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_garden
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_boxing
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_snow
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_space
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/holodeck/holodorm/source_off
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
flags = RAD_SHIELDED
//soundproofed = TRUE
/area/ai_core_foyer
@@ -1494,7 +1494,6 @@ area/shuttle/mining_outpost/shuttle
flags = BLUE_SHIELDED
/area/supply
flags = BLUE_SHIELDED
// Add rad shielding to maintenance and construction sites
/area/vacant

View File

@@ -55,7 +55,6 @@
/area/tether/surfacebase/tcomms/chamber
name = "\improper Telecomms Central Compartment"
icon_state = "tcomsatcham"
flags = BLUE_SHIELDED
/area/maintenance/substation/tcomms
name = "\improper Telecomms Substation"