TGS Test Merge (#6363)

code/__DEFINES/defenses.dm

@@ -22,6 +22,12 @@
 #define DEFENSE_BELL_TOWER 4
 #define DEFENSE_TESLA_COIL 5
 
+// Defines for /obj/structure/machinery/defenses/sentry/premade/deployable/colony/landing_zone
+#define TURRET_BATTERY_STATE_OK 0
+#define TURRET_BATTERY_STATE_LOW 1
+#define TURRET_BATTERY_STATE_CRITICAL 2
+#define TURRET_BATTERY_STATE_DEAD 3
+
 // What range the generator has to be in or defenses has to be in.
 #define GEN_SEARCH_RANGE 5
 #define GEN_PLASTEEL_COST 10

code/__DEFINES/misc.dm

@@ -25,6 +25,7 @@
 #define SMOKE_RANK_MED 3
 #define SMOKE_RANK_HIGH 4
 #define SMOKE_RANK_BOILER 5
+#define SMOKE_RANK_MAX 6
 
 // What kind of function to use for Explosions falling off.
 

code/game/area/BigRed.dm

@@ -515,27 +515,35 @@
 	is_resin_allowed = FALSE
 	ceiling_muffle = FALSE
 	base_muffle = MUFFLE_LOW
+	is_landing_zone = TRUE
 
 /area/bigredv2/outside/telecomm/lz2_cave
 	name = "\improper Central Grounds Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/n_cave
 	name = "\improper North Cave Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/warehouse
 	name = "\improper Warehouse Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/security
 	name = "\improper Security Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/store
 	name = "\improper General Store Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/admin
 	name = "\improper Administrative Communications Relay"
+	is_landing_zone = FALSE
 
 /area/bigredv2/outside/telecomm/engi
 	name = "\improper Engineering Communications Relay"
+	is_landing_zone = FALSE
 
 
 /area/bigredv2/outside/engineering

code/game/area/Corsat.dm

@@ -523,7 +523,6 @@
 /area/corsat/omega/hangar
 	name = "\improper Landing Bay Omega"
 	icon_state = "omega_hangar"
-	is_landing_zone = TRUE
 
 /area/corsat/omega/hangar/office
 	name = "\improper Omega Hangar Office"

code/game/area/DesertDam.dm

@@ -216,6 +216,7 @@
 /area/desert_dam/building/substation/northwest
 	name = "Command Substation"
 	icon_state = "northewestern_ss"
+	is_landing_zone = TRUE
 /area/desert_dam/building/substation/northeast
 	name = "Command Substation"
 	icon_state = "northeastern_ss"

code/game/area/LV522_Chances_Claim.dm

@@ -48,6 +48,11 @@
 	name = "Chance's Claim - Landing Zone One Tunnels"
 	ceiling = CEILING_METAL
 
+/area/lv522/landing_zone_1/tunnel/far
+	name = "Chance's Claim - Landing Zone One Tunnels"
+	ceiling = CEILING_METAL
+	is_landing_zone = FALSE
+
 /area/shuttle/drop1/lv522
 	name = "Chance's Claim - Dropship Alamo Landing Zone"
 	icon_state = "shuttle"

code/game/area/Prison_Station_FOP.dm

@@ -90,6 +90,7 @@
 /area/prison/security/checkpoint/hangar
 	name = "\improper Main Hangar Traffic Control"
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/prison/storage
 	icon_state = "engine_storage"
@@ -211,6 +212,7 @@
 	name = "\improper Hangar-Barracks Maintenance"
 	icon_state = "maint_e_shuttle"
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/prison/canteen
 	name = "\improper Canteen"
@@ -457,6 +459,7 @@
 /area/prison/monorail/east
 	name = "\improper East Monorail Station"
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/prison/monorail/west
 	name = "\improper West Monorail Station"
@@ -467,10 +470,12 @@
 /area/prison/hanger/main
 	name = "\improper Main Hanger"
 	icon_state = "hangar_alpha"
+	is_landing_zone = TRUE
 
 /area/prison/hanger/research
 	name = "\improper Research Hanger"
 	icon_state = "hangar_beta"
+	is_landing_zone = TRUE
 
 /area/prison/hangar_storage/main
 	name = "\improper Main Hangar Storage"
@@ -480,9 +485,11 @@
 	name = "\improper Research Hangar Storage"
 	icon_state = "toxstorage"
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/prison/hangar_storage/research/shuttle
 	name = "Corporate Shuttle"
+	is_landing_zone = FALSE
 
 /area/prison/telecomms
 	name = "\improper Telecommunications"

code/game/area/Sulaco.dm

@@ -14,6 +14,7 @@
 	flags_area = AREA_NOTUNNEL
 	is_landing_zone = TRUE
 	ceiling = CEILING_REINFORCED_METAL
+	base_lighting_alpha = 0
 
 /area/shuttle/drop1/Enter(atom/movable/O, atom/oldloc)
 	if(istype(O, /obj/structure/barricade))
@@ -24,6 +25,7 @@
 	name = "\improper Dropship Alamo"
 	icon_state = "shuttlered"
 	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
 
 /area/shuttle/drop1/LV624
 	name = "\improper Dropship Alamo"
@@ -71,11 +73,13 @@
 	flags_area = AREA_NOTUNNEL
 	is_landing_zone = TRUE
 	ceiling = CEILING_REINFORCED_METAL
+	base_lighting_alpha = 0
 
 /area/shuttle/drop2/sulaco
 	name = "\improper Dropship Normandy"
 	icon_state = "shuttle"
 	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
 
 /area/shuttle/drop2/LV624
 	name = "\improper Dropship Normandy"

code/game/area/kutjevo.dm

@@ -203,19 +203,22 @@
 	icon_state = "Colony_int"
 	ceiling = CEILING_METAL
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/kutjevo/interior/complex/Northwest_Flight_Control
 	name =  "Kutjevo Complex - Northwest Flight Control Room"
 	icon_state = "Colony_int"
 	ceiling = CEILING_METAL
 	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
 
 /area/kutjevo/interior/complex/Northwest_Security_Checkpoint
 	name = "Kutjevo Complex - Northwest Security Checkpoint"
 	icon_state = "Colony_int"
 	ceiling = CEILING_METAL
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_SEC
+	is_landing_zone = TRUE
 
 //Out buildings + foremans
 /area/kutjevo/interior/power

code/game/area/prison.dm

@@ -57,6 +57,7 @@
 	name = "\improper control room"
 	icon_state = "bridge"
 	minimap_color = MINIMAP_AREA_COMMAND
+	is_landing_zone = TRUE
 
 /area/prison/hallway/central_ring
 	name = "\improper central ring"

code/game/area/prison_v3_fiorina.dm

@@ -183,6 +183,7 @@
 
 /area/fiorina/station/telecomm/lz1_tram
 	name = "Fiorina - LZ1 Aux Port Communications Relay"
+	is_landing_zone = TRUE
 
 /area/fiorina/station/telecomm/lz1_engineering
 	name = "Fiorina - Engineering Primary Communications Relay"

code/game/area/shiva.dm

@@ -239,6 +239,10 @@
 	name = "Shiva's Snowball - Blue Warehouse"
 	icon_state = "hangars1"
 
+/area/shiva/interior/warehouse/caves
+	name = "Shiva's Snowball - Blue Warehouse Ice Cave"
+	icon_state = "caves1"
+
 /area/shiva/interior/valley_huts
 	name = "Shiva's Snowball - Valley Bunker 1"
 	icon_state = "hangars1"
@@ -251,17 +255,14 @@
 	name = "Shiva's Snowball - Valley Disposals"
 	icon_state = "hangars3"
 
-/area/shiva/interior/warehouse/caves
-	name = "Shiva's Snowball - Blue Warehouse Ice Cave"
-	icon_state = "caves1"
-
 /area/shiva/interior/garage
 	name = "Shiva's Snowball - Cargo Tug Repair Station"
 	icon_state = "hangars2"
 
 /area/shiva/interior/lz2_habs
 	name = "Shiva's Snowball - Argentinian Research Headquarters"
 	icon_state = "bar1"
+	is_landing_zone = TRUE
 
 /area/shiva/interior/aux_power
 	name = "Shiva's Snowball - Auxiliary Generator Station"

code/game/area/varadero.dm

@@ -84,6 +84,7 @@
 	requires_power = FALSE
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_LZ
+	is_landing_zone = TRUE
 
 /area/varadero/exterior/lz1_console/two
 	name = "New Varadero - Palm Airfield"
@@ -98,19 +99,24 @@
 	icon_state = "lz1"
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_LZ
+	is_landing_zone = TRUE
 
 /area/varadero/exterior/lz2_near
 	name = "New Varadero - Palm Airfield"
 	icon_state = "lz2"
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_LZ
+	is_landing_zone = TRUE
 
 /area/varadero/exterior/pontoon_beach
 	name = "New Varadero - Rockabilly Beach"
 	icon_state = "varadero0"
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_JUNGLE
 
+/area/varadero/exterior/pontoon_beach/lz
+	is_landing_zone = TRUE
+
 /area/varadero/exterior/eastbeach
 	name = "New Varadero - East Beach"
 	is_resin_allowed = FALSE
@@ -157,6 +163,7 @@
 	is_resin_allowed = FALSE
 	minimap_color = MINIMAP_AREA_JUNGLE
 	sound_environment = SOUND_ENVIRONMENT_ROOM
+	is_landing_zone = TRUE
 
 /area/varadero/interior/cargo
 	name = "New Varadero - Cargo"