Release Update

Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme

code/game/objects/structures/fitness_vr.dm

@@ -0,0 +1,79 @@
+/obj/structure/fitness/boxing_ropes
+	name = "Ropes"
+	desc = "Firm yet springy, perhaps this could be useful!"
+	icon = 'icons/obj/fitness_vr.dmi'
+	icon_state = "ropes"
+	density = 1
+	throwpass = 1
+	climbable = 1
+	layer = WINDOW_LAYER
+	anchored = 1
+	flags = ON_BORDER
+/obj/structure/fitness/boxing_ropes/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return TRUE
+	if(get_dir(mover, target) == turn(dir, 180))
+		return !density
+	return TRUE
+/obj/structure/fitness/boxing_ropes/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSTABLE))
+		return 1
+	if(get_dir(O.loc, target) == dir)
+		return 0
+	return 1
+
+/obj/structure/fitness/boxing_ropes_bottom
+	name = "Ropes"
+	desc = "Firm yet springy, perhaps this could be useful!"
+	icon = 'icons/obj/fitness_vr.dmi'
+	icon_state = "ropes"
+	density = 1
+	throwpass = 1
+	climbable = 1
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
+	anchored = 1
+	flags = ON_BORDER
+/obj/structure/fitness/boxing_ropes_bottom/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return TRUE
+	if(get_dir(mover, target) == turn(dir, 180))
+		return !density
+	return TRUE
+/obj/structure/fitness/boxing_ropes_bottom/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSTABLE))
+		return 1
+	if(get_dir(O.loc, target) == dir)
+		return 0
+	return 1
+
+
+
+/obj/structure/fitness/boxing_turnbuckle
+	name = "Turnbuckle"
+	desc = "A sturdy post that looks like it could support even the most heaviest of heavy weights!"
+	icon = 'icons/obj/fitness_vr.dmi'
+	icon_state = "turnbuckle"
+	density = 1
+	throwpass = 1
+	climbable = 1
+	layer = WINDOW_LAYER
+	anchored = 1
+	flags = ON_BORDER
+/obj/structure/fitness/boxing_turnbuckle/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return TRUE
+	if(get_dir(mover, target) == turn(dir, 180))
+		return !density
+	return TRUE
+/obj/structure/fitness/boxing_turnbuckle/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSTABLE))
+		return 1
+	if(get_dir(O.loc, target) == dir)
+		return 0
+	return 1
+
+/turf/simulated/fitness
+	name = "Mat"
+	icon = 'icons/turf/floors_vr.dmi'
+	icon_state = "fit_mat"

code/game/objects/structures/window.dm

@@ -442,6 +442,13 @@
 	//this way it will only update full-tile ones
 	overlays.Cut()
 	if(!is_fulltile())
+		// Rotate the sprite somewhat so non-fulltiled windows can be seen as needing repair.
+		var/full_tilt_degrees = 15
+		var/tilt_to_apply = abs((health / maxhealth) - 1)
+		if(tilt_to_apply && prob(50))
+			tilt_to_apply = -tilt_to_apply
+		adjust_rotation(LERP(0, full_tilt_degrees, tilt_to_apply))
+
 		icon_state = "[basestate]"
 		return
 	var/list/dirs = list()