Merge branch 'master' into upstream-merge-31045

code/game/turfs/closed.dm

@@ -46,6 +46,21 @@
 			if("icon")
 				SStitle.icon = icon
 
+/turf/closed/indestructible/reebe
+	name = "void"
+	icon_state = "reebe"
+	opacity = FALSE
+	baseturf = /turf/closed/indestructible/reebe
+
+/turf/closed/indestructible/reebe/ratvar_act()
+	return
+
+/turf/closed/indestructible/reebe/narsie_act()
+	return
+
+/turf/closed/indestructible/reebe/CollidedWith(atom/movable/AM)
+	playsound(src, 'sound/effects/bamf.ogg', 25, TRUE)
+
 /turf/closed/indestructible/riveted
 	icon = 'icons/turf/walls/riveted.dmi'
 	icon_state = "riveted"
@@ -138,3 +153,16 @@
 	desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
 	icon = 'icons/turf/walls/hierophant_wall.dmi'
 	icon_state = "wall"
+
+/turf/closed/bullet_act(obj/item/projectile/Proj)
+	..()
+	if(!Proj.nodamage && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		var/mutable_appearance/bullet_hole = mutable_appearance('icons/effects/effects.dmi', "bullet_hole", BULLET_HOLE_LAYER)
+
+		var/random_x = rand(-13, 13)
+		bullet_hole.pixel_x += random_x
+
+		var/random_y = rand(-13, 13)
+		bullet_hole.pixel_y += random_y
+
+		add_overlay(bullet_hole, TRUE)

code/game/turfs/open.dm

@@ -67,6 +67,37 @@
 	desc = "A floor made of invulnerable notebook paper."
 	icon_state = "paperfloor"
 
+/turf/open/indestructible/clock_spawn_room
+	name = "cogmetal"
+	desc = "Brass plating that gently radiates heat. For some reason, it reminds you of blood."
+	icon_state = "reebe"
+	baseturf = /turf/open/indestructible/clock_spawn_room
+
+/turf/open/indestructible/clock_spawn_room/Entered()
+	..()
+	START_PROCESSING(SSfastprocess, src)
+
+/turf/open/indestructible/clock_spawn_room/Destroy()
+	STOP_PROCESSING(SSfastprocess, src)
+	. = ..()
+
+/turf/open/indestructible/clock_spawn_room/process()
+	if(!port_servants())
+		STOP_PROCESSING(SSfastprocess, src)
+
+/turf/open/indestructible/clock_spawn_room/proc/port_servants()
+	. = FALSE
+	for(var/mob/living/L in src)
+		if(is_servant_of_ratvar(L))
+			. = TRUE
+			L.forceMove(get_turf(pick(GLOB.servant_spawns)))
+			visible_message("<span class='warning'>[L] vanishes in a flash of red!</span>")
+			L.visible_message("<span class='warning'>[L] appears in a flash of red!</span>", \
+			"<span class='bold cult'>sas'so c'arta forbici</span><br><span class='danger'>You're yanked away from [src]!</span>")
+			playsound(src, 'sound/magic/enter_blood.ogg', 50, TRUE)
+			playsound(L, 'sound/magic/exit_blood.ogg', 50, TRUE)
+			flash_color(L, flash_color = "#C80000", flash_time = 10)
+
 /turf/open/Initalize_Atmos(times_fired)
 	excited = 0
 	update_visuals()

code/game/turfs/simulated/chasm.dm

@@ -128,8 +128,7 @@
 	. = ..()
 	drop_x = x
 	drop_y = y
-	if(z+1 <= world.maxz)
-		drop_z = z+1
+	drop_z = z - 1
 	var/turf/T = locate(drop_x, drop_y, drop_z)
 	T.visible_message("<span class='boldwarning'>The ceiling gives way!</span>")
 	playsound(T, 'sound/effects/break_stone.ogg', 50, 1)

code/game/turfs/simulated/floor/misc_floor.dm

@@ -142,11 +142,8 @@
 	name = "clockwork floor"
 	desc = "Tightly-pressed brass tiles. They emit minute vibration."
 	icon_state = "plating"
-<<<<<<< HEAD
-=======
 	baseturf = /turf/open/floor/clockwork
 	var/uses_overlay = TRUE
->>>>>>> 5b73196... Reebe is fancier now (#31045)
 	var/obj/effect/clockwork/overlay/floor/realappearence
 
 /turf/open/floor/clockwork/Initialize()
@@ -224,6 +221,12 @@
 		animate(src, color = previouscolor, time = 8)
 		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
 
+/turf/open/floor/clockwork/reebe
+	name = "cogplate"
+	desc = "Warm brass plating. You can feel it gently vibrating, as if machinery is on the other side."
+	icon_state = "reebe"
+	baseturf = /turf/open/floor/clockwork/reebe
+	uses_overlay = FALSE
 
 /turf/open/floor/bluespace
 	slowdown = -1

code/game/turfs/simulated/wall/misc_walls.dm

@@ -57,7 +57,6 @@
 	girder_type = /obj/structure/destructible/clockwork/wall_gear
 	baseturf = /turf/open/floor/clockwork/reebe
 	var/obj/effect/clockwork/overlay/wall/realappearence
-	var/obj/structure/destructible/clockwork/cache/linkedcache
 
 /turf/closed/wall/clockwork/Initialize()
 	..()

code/game/turfs/turf.dm

@@ -444,7 +444,7 @@
 /turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, forceop = FALSE)
 	// Remove all atoms except observers, landmarks, docking ports
 	var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
-	var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(ignore_typecache), ignored_atoms)
+	var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(), ignored_atoms | ignore_typecache)
 	allowed_contents -= src
 	for(var/i in 1 to allowed_contents.len)
 		var/thing = allowed_contents[i]