Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

code/modules/mapfluff/ruins/objects_and_mobs/cursed_slot_machine.dm

@@ -80,8 +80,8 @@
 	COOLDOWN_START(src, spin_cooldown, cooldown_length)
 
 	if(!prob(win_prob))
-		if(status_effect_on_roll && isnull(user.has_status_effect(/datum/status_effect/grouped/cursed)))
-			user.apply_status_effect(/datum/status_effect/grouped/cursed)
+		if(status_effect_on_roll)
+			user.apply_status_effect(/datum/status_effect/slot_machine_curse)
 
 		SEND_SIGNAL(user, COMSIG_CURSED_SLOT_MACHINE_LOST)
 		playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)

code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm

@@ -397,13 +397,13 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 	desc = "Stylish dark wood with extra reinforcement. Secured firmly to the floor to prevent tampering."
 	icon_state = "wood"
 	footstep = FOOTSTEP_WOOD
-	tiled_dirt = FALSE
+	tiled_turf = FALSE
 
 /turf/open/indestructible/hoteltile
 	desc = "Smooth tile with extra reinforcement. Secured firmly to the floor to prevent tampering."
 	icon_state = "showroomfloor"
 	footstep = FOOTSTEP_FLOOR
-	tiled_dirt = FALSE
+	tiled_turf = FALSE
 
 /turf/open/space/bluespace
 	name = "\proper bluespace hyperzone"