Mapping kutjevo 1

code/game/area/kutjevo.dm

@@ -11,6 +11,9 @@
 	temperature = 308.7 //kelvin, 35c, 95f
 	minimap_color = MINIMAP_AREA_ENGI
 
+<<<<<<< HEAD
+//---===| Essential Areas |===---
+=======
 /area/shuttle/drop1/kutjevo
 	name = "Kutjevo - Dropship Alamo Landing Zone"
 	icon_state = "shuttle"
@@ -22,13 +25,13 @@
 	icon_state = "shuttle2"
 	icon = 'icons/turf/area_kutjevo.dmi'
 	linked_lz = DROPSHIP_LZ2
+>>>>>>> 467102bd3f74aaffa2538c090ecd34be446c12c1
 
 /area/kutjevo/exterior
 	name = "Kutjevo - Exterior"
 	ceiling = CEILING_NONE
 	icon_state = "ext"
 
-
 /area/kutjevo/interior
 	name = "Kutjevo - Interior"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
@@ -46,7 +49,17 @@
 	name = "Kutjevo - Credits Room"
 	icon_state = "kutjevo"
 
-//exterior map areas
+//---=== Landing Zones ===---
+
+/area/shuttle/drop1/kutjevo
+	name = "Kutjevo - Dropship Alamo Landing Zone"
+	icon_state = "shuttle"
+	icon = 'icons/turf/area_kutjevo.dmi'
+
+/area/shuttle/drop2/kutjevo
+	name = "Kutjevo - Dropship Normandy Landing Zone"
+	icon_state = "shuttle2"
+	icon = 'icons/turf/area_kutjevo.dmi'
 
 /area/kutjevo/exterior/lz_pad
 	name = "Kutjevo Auxilliary Landing Zone"
@@ -64,6 +77,8 @@
 	is_landing_zone = TRUE
 	linked_lz = DROPSHIP_LZ1
 
+//---=== Exterior Areas ===---
+
 /area/kutjevo/exterior/lz_river
 	name = "Kutjevo - Power Station River"
 	icon_state = "lz_river"
@@ -75,13 +90,29 @@
 	unoviable_timer = FALSE
 
 /area/kutjevo/exterior/scrubland
+<<<<<<< HEAD
+	name = "Do not use."
+
+/area/kutjevo/exterior/scrubland/north
+	name = "Kutjevo - North Scrubland"
+	icon_state = "scrubland1"
+
+/area/kutjevo/exterior/scrubland/center
+	name = "Kutjevo - Center Scrubland"
+	icon_state = "scrubland2"
+
+/area/kutjevo/exterior/scrubland/south
+	name = "Kutjevo - South Scrubland"
+	icon_state = "scrubland3"
+=======
 	name = "Kutjevo - North Scrubland"
 	icon_state = "scrubland"
 	linked_lz = DROPSHIP_LZ2
 
 /area/kutjevo/exterior/scrubland/south
 	name = "Kutjevo - South Scrubland"
 	linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2)
+>>>>>>> 467102bd3f74aaffa2538c090ecd34be446c12c1
 
 /area/kutjevo/exterior/stonyfields
 	name = "Kutjevo - Stony Fields"

code/game/objects/effects/landmarks/survivor_spawner.dm

@@ -1,5 +1,7 @@
 /obj/effect/landmark/survivor_spawner
 	name = "special survivor spawner"
+	icon = 'icons/mob/humans/human.dmi'
+	icon_state = "human spriting template"
 	var/equipment = null
 	var/synth_equipment = null
 	var/CO_equipment = null

code/game/turfs/kutjevo.dm

@@ -189,6 +189,9 @@
 /turf/open/floor/kutjevo/colors/orange/inner_corner/north
 	dir = NORTH
 
+/turf/open/floor/kutjevo/colors/orange/inner_corner/south
+	dir = SOUTH
+
 /turf/open/floor/kutjevo/colors/orange/inner_corner/east
 	dir = EAST
 
@@ -247,21 +250,36 @@
 /turf/open/floor/kutjevo/colors/purple/edge/north
 	dir = NORTH
 
+/turf/open/floor/kutjevo/colors/purple/edge/south
+	dir = SOUTH
+
 /turf/open/floor/kutjevo/colors/purple/edge/east
 	dir = EAST
 
+/turf/open/floor/kutjevo/colors/purple/edge/west
+	dir = WEST
+
 /turf/open/floor/kutjevo/colors/purple/edge/northeast
 	dir = NORTHEAST
 
-/turf/open/floor/kutjevo/colors/purple/edge/west
-	dir = WEST
+/turf/open/floor/kutjevo/colors/purple/edge/northwest
+	dir = NORTHWEST
+
+/turf/open/floor/kutjevo/colors/purple/edge/southeast
+	dir = SOUTHEAST
+
+/turf/open/floor/kutjevo/colors/purple/edge/southwest
+	dir = SOUTHWEST
 
 /turf/open/floor/kutjevo/colors/purple/inner_corner
 	icon_state = "purp4"
 
 /turf/open/floor/kutjevo/colors/purple/inner_corner/north
 	dir = NORTH
 
+/turf/open/floor/kutjevo/colors/purple/inner_corner/south
+	dir = SOUTH
+
 /turf/open/floor/kutjevo/colors/purple/inner_corner/east
 	dir = EAST
 

code/modules/desert_dam/filtration/structures.dm

@@ -170,6 +170,7 @@
 	anchored = TRUE
 	bound_width = 32
 	bound_height = 64
+	layer = ABOVE_XENO_LAYER
 
 /obj/structure/filtration/machine_32x64/indestructible
 	unacidable = TRUE
@@ -192,6 +193,7 @@
 	unacidable = TRUE
 	unslashable = TRUE
 	breakable = FALSE
+	density = FALSE
 
 /obj/structure/filtration/machine_96x96/indestructible/ex_act(severity)
 	return