version pr-ready

cmss13-devs · Aug 21, 2023 · 3bcaf11 · 3bcaf11
1 parent e0f2943
commit 3bcaf11
Show file tree

Hide file tree

Showing 8 changed files with 60,859 additions and 59,161 deletions.
diff --git a/code/game/area/KhamiBarrens.dm b/code/game/area/KhamiBarrens.dm
@@ -1,4 +1,4 @@
-//Areas for the Kutjevo Refinery
+//Areas for the Khami Barrens
 
 /area/khami_barrens
 	name = "Khami Barrens"

diff --git a/code/game/turfs/walls/wall_icon.dm b/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

diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm
@@ -331,6 +331,11 @@
 	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
@@ -340,7 +345,9 @@
 	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

diff --git a/code/game/turfs/walls/walls.dm b/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, ...)
 	. = ..()

diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm
@@ -120,6 +120,12 @@
 	html_link = "images/0/0d/Kutjevo_a1.jpg"
 	color = "red"
 
+/obj/item/map/khami_barrens
+	name = "\improper Khami Barrens map"
+	desc = "An orbital scan of the Khami Barrens"
+	html_link = "images/0/0d/Kutjevo_a1.jpg" // PLACEHOLDER, REPLACE WHEN WIKI LINK IS MADE
+	color = "red"
+
 /obj/item/map/lv522_map
 	name = "\improper LV-522 Map"
 	desc = "An overview of LV-522 schematics."

diff --git a/icons/turf/walls/fake_minerals.dmi b/icons/turf/walls/fake_minerals.dmi
diff --git a/map_config/maps.txt b/map_config/maps.txt
@@ -62,3 +62,7 @@ endmap
 
 map whiskey_outpost_v2
 endmap
+
+map khami_barrens
+	minplayers 130
+endmap