Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull

code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm

@@ -35,3 +35,39 @@
 		/obj/item/gunbox/blueshield,
 		/obj/item/gunbox/blueshield/secondary
 		)
+
+/obj/structure/closet/secure_closet/security_pilot
+	name = "security pilot's locker"
+	req_access = list(access_secpilot)
+	icon = 'icons/obj/closet_yw.dmi'
+	icon_state = "secpilot1"
+	icon_closed = "secpilot"
+	icon_locked = "secpilot1"
+	icon_opened = "secpilotopen"
+	icon_broken = "secpilotbroken"
+	icon_off = "secpilotoff"
+	storage_capacity = 2.5 * MOB_MEDIUM
+
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/parachute,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/clothing/head/pilot/alt,
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/suit/storage/toggle/yw/secjacket,
+		/obj/item/clothing/under/rank/khi/sec/pilot,
+		/obj/item/clothing/gloves/fingerless,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/clothing/accessory/storage/webbing/combatpilot,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
+		/obj/item/clothing/head/soft/sec/corp,
+		/obj/item/clothing/accessory/holster/armpit,
+		/obj/item/weapon/gun/energy/taser,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/device/radio
+		)

code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm

@@ -0,0 +1,21 @@
+/obj/structure/closet/shuttleemerg //wall mounted fire closet
+	name = "emergency repairs closet"
+	desc = "It's a storage unit for emergency repair supplies."
+	icon = 'icons/obj/closet_yw.dmi'
+	icon_state = "engicloset"
+	icon_closed = "engicloset"
+	icon_opened = "engicloset_open"
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+	starts_with = list(
+		/obj/item/weapon/module/power_control,
+		/obj/item/weapon/storage/toolbox/mechanical ,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/storage/briefcase/inflatable,
+		/obj/item/clothing/head/helmet/space/emergency,
+		/obj/item/clothing/suit/space/emergency)

code/game/objects/structures/crates_lockers/largecrate_yw.dm

@@ -0,0 +1,9 @@
+/obj/structure/largecrate/piano
+	name = "piano crate"
+	starts_with = list(/obj/structure/device/piano)
+	desc = "*Grand piano may end up being a minimoog."
+
+/obj/structure/largecrate/piano/Initialize() //This is nessesary to get a random one each time.
+	starts_with = list(pick(/obj/structure/device/piano/minimoog,
+					/obj/structure/device/piano))
+	return ..()

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()