Khami Barrens

code/__DEFINES/__game.dm

@@ -35,6 +35,7 @@ block( \
 #define MAP_SOROKYNE_STRATA "Sorokyne Strata"
 #define MAP_CORSAT "CORSAT" // Highpop only
 #define MAP_KUTJEVO "Kutjevo Refinery"
+#define MAP_KHAMI_BARRENS "Khami Barrens" // Highpop only
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only

code/game/area/KhamiBarrens.dm

@@ -0,0 +1,323 @@
+//Areas for the Khami Barrens
+
+/area/khami_barrens
+	name = "Khami Barrens"
+	icon = 'icons/turf/area_kutjevo.dmi'
+	//ambience = list('figuresomethingout.ogg')
+	icon_state = "khami_barrens"
+	can_build_special = TRUE //T-Comms structure
+	temperature = 308.7 //kelvin, 35c, 95f
+	lighting_use_dynamic = 1
+	minimap_color = MINIMAP_AREA_ENGI
+
+/area/shuttle/drop1/khami_barrens
+	name = "Khami Barrens - Dropship Alamo Landing Zone"
+	icon_state = "shuttle"
+	icon = 'icons/turf/area_kutjevo.dmi'
+	lighting_use_dynamic = 1
+
+/area/shuttle/drop2/khami_barrens
+	name = "Khami Barrens - Dropship Normandy Landing Zone"
+	icon_state = "shuttle2"
+	icon = 'icons/turf/area_kutjevo.dmi'
+	lighting_use_dynamic = 1
+
+/area/khami_barrens/exterior
+	name = "Khami Barrens - Exterior"
+	ceiling = CEILING_NONE
+	icon_state = "ext"
+
+
+/area/khami_barrens/interior
+	name = "Khami Barrens - Interior"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "int"
+	requires_power = 1
+
+/area/khami_barrens/interior/oob
+	name = "Khami Barrens -  Out Of Bounds"
+	ceiling = CEILING_MAX
+	icon_state = "oob"
+	is_resin_allowed = FALSE
+	flags_area = AREA_NOTUNNEL
+
+/area/khami_barrens/interior/oob/dev_room
+	name = "Khami Barrens - Credits Room"
+	is_resin_allowed = FALSE
+	flags_area = AREA_NOTUNNEL
+	icon_state = "khami_barrens"
+
+//exterior map areas
+
+/area/khami_barrens/exterior/lz_pad
+	name = "Khami Barrens - Passenger Landing Zone"
+	icon_state = "lz_pad"
+	weather_enabled = FALSE
+	unlimited_power = 1//ds computer
+	is_resin_allowed = FALSE
+	is_landing_zone = TRUE
+
+/area/khami_barrens/exterior/lz_dunes
+	name = "Khami Barrens - Cargo Landing Zone"
+	icon_state = "lz_dunes"
+	is_resin_allowed = FALSE
+	weather_enabled =  FALSE
+	unlimited_power = 1//DS Computer
+	is_landing_zone = TRUE
+
+/area/khami_barrens/exterior/scrubland
+	name = "Khami Barrens - Oasis Scrubland"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/lodge
+	name = "Khami Barrens - Hunting Lodge Exterior"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/scrubland/village
+	name = "Khami Barrens - North Village Scrubland"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/scrubland/village/west
+	name = "Khami Barrens - West Village Scrubland"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/scrubland/checkpoint
+	name = "Khami Barrens - Checkpoint Scrubland"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/scrubland/lodge
+	name = "Khami Barrens - Hunting Lodge Scrubland"
+	icon_state = "scrubland"
+
+/area/khami_barrens/exterior/stonyfields
+	name = "Khami Barrens - South Stony Barrens"
+	icon_state = "stone_fields"
+
+/area/khami_barrens/exterior/stonyfields/north
+	name = "Khami Barrens - North Stony Barrens"
+	icon_state = "stone_fields"
+
+/area/khami_barrens/exterior/driedoasis/basin
+	name = "Khami Barrens - Dried Oasis Basin"
+	icon_state = "rf_river"
+
+/area/khami_barrens/exterior/driedoasis/bridge
+	name = "Khami Barrens - Dried Oasis Bridge"
+	icon_state = "rf_bridge"
+
+/area/khami_barrens/exterior/driedoasis/gates
+	name = "Khami Barrens - Dried Oasis Flood Gates"
+	icon_state = "rf_river"
+
+/area/khami_barrens/exterior/ruins
+	name = "Khami Barrens - Ruins Exterior"
+	icon_state = "construction"
+
+/area/khami_barrens/exterior/village
+	name = "Khami Barrens - West Village Exterior"
+	icon_state = "construction2"
+
+/area/khami_barrens/exterior/village/east
+	name = "Khami Barrens - East Village Exterior"
+	icon_state = "construction3"
+
+//telecomms areas
+/area/khami_barrens/exterior/telecomm
+	name = "Khami Barrens - Communications Relay"
+	icon_state = "ass_line"
+	is_resin_allowed = FALSE
+	ceiling_muffle = FALSE
+	base_muffle = MUFFLE_LOW
+
+/area/khami_barrens/exterior/telecomm/lz1_north
+	name = "Khami Barrens - North LZ1 Communications Relay"
+
+/area/khami_barrens/exterior/telecomm/lz1_south
+	name = "Khami Barrens - South LZ1 Communications Relay"
+
+/area/khami_barrens/exterior/telecomm/lz2_north
+	name = "Khami Barrens - North LZ2 Communications Relay"
+
+/area/khami_barrens/exterior/telecomm/lz2_south
+	name = "Khami Barrens - South LZ2 Communications Relay"
+
+//interior areas + caves
+
+//Village Buildings
+/area/khami_barrens/interior/village
+	name = "Khami Barrens"
+	ceiling = CEILING_METAL
+	icon_state = "khami_barrens"
+
+/area/khami_barrens/interior/village/company_offices
+	name = "Khami Barrens - Village Company Offices West"
+	ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
+	icon_state = "foremans"
+
+/area/khami_barrens/interior/village/company_offices/reception
+	name = "Khami Barrens - Village Company Offices Reception"
+
+/area/khami_barrens/interior/village/company_offices/east
+	name = "Khami Barrens - Village Company Offices East"
+
+/area/khami_barrens/interior/village/shop
+	name = "Khami Barrens - Village Shop"
+	ceiling = CEILING_METAL
+	icon_state = "Colony_int"
+
+/area/khami_barrens/interior/village/botany
+	name = "Khami Barrens - Village Botany Bay"
+	icon_state = "botany0"
+	minimap_color = MINIMAP_AREA_RESEARCH
+
+/area/khami_barrens/interior/village/med
+	name = "Khami Barrens - North Village Clinic"
+	icon_state = "med0"
+	minimap_color = MINIMAP_AREA_MEDBAY
+
+/area/khami_barrens/interior/village/med/south
+	name = "Khami Barrens - South Village Clinic"
+	icon_state = "med2"
+
+/area/khami_barrens/interior/village/med/reception_storage
+	name = "Khami Barrens - Village Clinic Reception and Storage"
+	icon_state = "med3"
+
+/area/khami_barrens/interior/village/residence
+	name = "Khami Barrens - North Village Residence"
+	icon_state = "Colony_int"
+	ceiling = CEILING_METAL
+	is_resin_allowed = TRUE
+
+/area/khami_barrens/interior/village/residence/west
+	name = "Khami Barrens - West Village Residence"
+	icon_state = "Colony_int"
+
+/area/khami_barrens/interior/village/residence/east
+	name = "Khami Barrens - East Village Residence"
+	icon_state = "Colony_int"
+
+/area/khami_barrens/interior/village/residence/company
+	name = "Khami Barrens - West Village Company Residence"
+	icon_state = "Colony_int"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	is_resin_allowed = TRUE
+
+/area/khami_barrens/interior/village/residence/company/east
+	name = "Khami Barrens - East Village Company Residence"
+	icon_state = "Colony_int"
+
+/area/khami_barrens/interior/village/engineering
+	name = "Khami Barrens - North Village Engineering"
+	icon_state = "Colony_int"
+	ceiling = CEILING_METAL
+	is_resin_allowed = TRUE
+	minimap_color = MINIMAP_AREA_ENGI
+
+/area/khami_barrens/interior/village/engineering/south
+	name = "Khami Barrens - South Village Engineering"
+	icon_state = "Colony_int"
+
+/area/khami_barrens/interior/village/engineering/power
+	name = "Khami Barrens - Village Engineering Powerstation"
+	icon_state = "power"
+
+//Out buildings & Caves
+
+/area/khami_barrens/interior/checkpoint
+	name = "Khami Barrens - Checkpoint"
+	ceiling = CEILING_METAL
+	icon_state = "int"
+	minimap_color = MINIMAP_AREA_SEC
+
+/area/khami_barrens/interior/hunting_lodge
+	name = "Khami Barrens - Hunting Lodge"
+	ceiling = CEILING_METAL
+	icon_state = "construction_int"
+
+/area/khami_barrens/interior/marksman_residence
+	name = "Khami Barrens - Marksman's Residence"
+	ceiling = CEILING_METAL
+	icon_state = "int"
+
+/area/khami_barrens/interior/rancher_residence
+	name = "Khami Barrens - Rancher's Residence"
+	ceiling = CEILING_METAL
+	icon_state = "int"
+
+/area/khami_barrens/interior/landing_zone
+	name = "Khami Barrens - Passenger Landing Zone Interior"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "int"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/landing_zone_arrivals/north
+	name = "Khami Barrens - Passenger Landing Zone Arrivals North"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "int"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/landing_zone_arrivals/south
+	name = "Khami Barrens - Passenger Landing Zone Arrivals South"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "int"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/research_caves
+	name = "Khami Barrens - Research Caves"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "colony_caves_0"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/research_caves/checkpoint
+	name = "Khami Barrens - Research Caves Checkpoint"
+	ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
+	icon_state = "colony_caves_2"
+	minimap_color = MINIMAP_AREA_SEC_CAVE
+
+/area/khami_barrens/interior/research_caves/research
+	name = "Khami Barrens - Caves Research"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "med5"
+	minimap_color = MINIMAP_AREA_RESEARCH_CAVE
+
+/area/khami_barrens/interior/tunnels
+	name = "Khami Barrens - Main Tunnel"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "colony_caves_3"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/tunnels/auxillary
+	name = "Khami Barrens - Auxillary Tunnels"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "colony_caves_2"
+
+/area/khami_barrens/interior/resin_caves
+	name = "Khami Barrens - North Resin Caves"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "colony_caves_0"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/resin_caves/deep
+	name = "Khami Barrens - South Resin Caves"
+	ceiling = CEILING_DEEP_UNDERGROUND
+	icon_state = "colony_caves_1"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/ruin_caves
+	name = "Khami Barrens - Interior Ruins"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "construction"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/ruin_caves/north
+	name = "Khami Barrens - North Ruin Caves"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "construction1"
+	minimap_color = MINIMAP_AREA_CAVES
+
+/area/khami_barrens/interior/ruin_caves/south
+	name = "Khami Barrens - South Ruin Caves"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	icon_state = "construction2"
+	minimap_color = MINIMAP_AREA_CAVES

code/game/objects/items.dm

@@ -239,7 +239,7 @@ cases. Override_icon_state should be a list.*/
 			if(MAP_ICE_COLONY, MAP_ICE_COLONY_V3, MAP_CORSAT, MAP_SOROKYNE_STRATA)
 				icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
 				item_state = new_item_state ? new_item_state : "s_" + item_state
-			if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO)
+			if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS)
 				icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
 				item_state = new_item_state ? new_item_state : "d_" + item_state
 			if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM)

code/game/turfs/open.dm

@@ -337,6 +337,9 @@
 /turf/open/gm/grass/grass2
 	icon_state = "grass2"
 
+/turf/open/gm/grass/grass_dried
+	icon_state = "grass_dried"
+
 /turf/open/gm/grass/grassbeach
 	icon_state = "grassbeach"
 

code/game/turfs/walls/wall_icon.dm

@@ -97,6 +97,8 @@
 	for(var/wb_type in blend_turfs)
 		for(var/nb_type in noblend_turfs)
 			if(istype(W, nb_type))
+				if(W.force_blend)
+					return TRUE
 				return FALSE
 		if(istype(W, wb_type))
 			return TRUE

code/game/turfs/walls/wall_types.dm

@@ -333,6 +333,11 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	damage_cap = HEALTH_WALL_REINFORCED//Strong, but only available to Hunters, can can still be blown up or melted by boilers.
 	baseturfs = /turf/open/floor/sandstone/runed
 
+
+/turf/closed/wall/mineral/sandstone/runed/force_blend
+	force_blend = 1
+
+
 /turf/closed/wall/mineral/sandstone/runed/attack_alien(mob/living/carbon/xenomorph/user)
 	visible_message("[user] scrapes uselessly against [src] with their claws.")
 	return
@@ -342,7 +347,9 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
 	desc = "A heavy wall of sandstone, with elegant carvings and runes inscribed upon its face."
 	icon = 'icons/turf/walls/runedstone.dmi'
 	icon_state = "runedstone"
-	walltype = "runedstone"
+
+/turf/closed/wall/mineral/sandstone/runed/decor/force_blend
+	force_blend = 1
 
 /turf/closed/wall/mineral/sandstone/runed/can_be_dissolved()
 	return 2

code/game/turfs/walls/walls.dm

@@ -43,6 +43,7 @@
 	var/list/noblend_turfs = list(/turf/closed/wall/mineral, /turf/closed/wall/almayer/research/containment) //Turfs to avoid blending with
 	var/list/blend_objects = list(/obj/structure/machinery/door, /obj/structure/window_frame, /obj/structure/window/framed) // Objects which to blend with
 	var/list/noblend_objects = list(/obj/structure/machinery/door/window) //Objects to avoid blending with (such as children of listed blend objects.
+	var/force_blend
 
 /turf/closed/wall/Initialize(mapload, ...)
 	. = ..()