From 9bc534f3d65cd272e3a6f32bc72840c3478cbacf Mon Sep 17 00:00:00 2001
From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:24:36 -0700
Subject: [PATCH] Variable Door Delay + Timer Based Animations (#84631)

## About The Pull Request

### Variable Door Delay

Door opening/closing delay times are currently static, but many doors do
not have animations that FIT the actual timings.

It would be better if subtypes cound declare how long each animation
takes, and how long it takes for opening to say, become passable and
such.

Let's do that.

### Timer Based Animations

Currently all doors use flick() to do their animations. This is fine
right NOW, but fucks with walleniong because we have to split most
things into segments to make layering work.

So rather then flick let's use client timers and update_icon_state to
achive our effects, alongside a proc that lets us do other effects (like
sound) on playing an animation

## Why It's Good For The Game

Door behavior and visuals better match up, wallening compatability
upstreaming.

## Changelog
:cl:
add: Most door animations now better line up with when they are/are not
passable.
/:cl:

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 code/__DEFINES/door.dm                        |  18 +++
 code/datums/wires/airlock.dm                  |   2 +-
 code/game/machinery/doors/airlock.dm          |  48 ++++++--
 code/game/machinery/doors/door.dm             | 113 ++++++++++++++----
 code/game/machinery/doors/firedoor.dm         |  37 ++++--
 code/game/machinery/doors/passworddoor.dm     |  42 +++++--
 code/game/machinery/doors/poddoor.dm          |  44 +++++--
 code/game/machinery/doors/shutters.dm         |  18 +++
 code/game/machinery/doors/windowdoor.dm       |  58 ++++++---
 code/game/objects/items/puzzle_pieces.dm      |  12 ++
 .../ruins/icemoonruin_code/library.dm         |  12 ++
 icons/obj/doors/blastdoor.dmi                 | Bin 2654 -> 2662 bytes
 icons/obj/doors/doorfireglass.dmi             | Bin 10216 -> 10234 bytes
 icons/obj/doors/doormorgue.dmi                | Bin 2344 -> 2444 bytes
 icons/obj/doors/puzzledoor/danger.dmi         | Bin 1478 -> 1530 bytes
 icons/obj/doors/puzzledoor/default.dmi        | Bin 1513 -> 1570 bytes
 icons/obj/doors/puzzledoor/wood.dmi           | Bin 2512 -> 2605 bytes
 icons/obj/doors/shutters.dmi                  | Bin 18204 -> 18213 bytes
 icons/obj/doors/shutters_radiation.dmi        | Bin 18358 -> 18363 bytes
 icons/obj/doors/shutters_window.dmi           | Bin 41099 -> 41106 bytes
 icons/obj/doors/windoor.dmi                   | Bin 65358 -> 65370 bytes
 tgstation.dme                                 |   1 +
 22 files changed, 325 insertions(+), 80 deletions(-)
 create mode 100644 code/__DEFINES/door.dm

diff --git a/code/__DEFINES/door.dm b/code/__DEFINES/door.dm
new file mode 100644
index 00000000000..198d38a3af6
--- /dev/null
+++ b/code/__DEFINES/door.dm
@@ -0,0 +1,18 @@
+// Door animation defines
+#define DOOR_OPENING_ANIMATION "opening"
+#define DOOR_CLOSING_ANIMATION "closing"
+#define DOOR_DENY_ANIMATION "deny"
+
+// Door animation STEP defines
+// These are used to mark points in the animtion when things in game should change
+#define DOOR_OPENING_PASSABLE "opening_passable"
+#define DOOR_OPENING_FINISHED "opening_finished"
+#define DOOR_CLOSING_UNPASSABLE "closing_unpassable"
+#define DOOR_CLOSING_FINISHED "closing_finished"
+
+#define AIRLOCK_OPENING_TRANSPARENT "airlock_opening_transparent"
+#define AIRLOCK_OPENING_PASSABLE "airlock_opening_passable"
+#define AIRLOCK_OPENING_FINISHED "airlock_opening_finished"
+#define AIRLOCK_CLOSING_OPAQUE "airlock_closing_opaque"
+#define AIRLOCK_CLOSING_UNPASSABLE "airlock_closing_unpassable"
+#define AIRLOCK_CLOSING_FINISHED "airlock_closing_finished"
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 8049f08d8dc..584e862eb5d 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -126,7 +126,7 @@
 			A.update_appearance()
 		if(WIRE_IDSCAN) // Pulse to disable emergency access and flash the red lights.
 			if(A.hasPower() && A.density)
-				A.do_animate("deny")
+				A.run_animation(DOOR_DENY_ANIMATION)
 				if(A.emergency)
 					A.emergency = FALSE
 					A.update_appearance()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 67f069c062c..33465809f42 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -591,13 +591,13 @@
 					floorlight.pixel_y = 0
 			. += floorlight
 
-/obj/machinery/door/airlock/do_animate(animation)
+/obj/machinery/door/airlock/run_animation(animation)
 	switch(animation)
-		if("opening")
+		if(DOOR_OPENING_ANIMATION)
 			update_icon(ALL, AIRLOCK_OPENING)
-		if("closing")
+		if(DOOR_OPENING_ANIMATION)
 			update_icon(ALL, AIRLOCK_CLOSING)
-		if("deny")
+		if(DOOR_DENY_ANIMATION)
 			if(!machine_stat)
 				update_icon(ALL, AIRLOCK_DENY)
 				playsound(src,doorDeni,50,FALSE,3)
@@ -607,6 +607,28 @@
 	if(airlock_state == AIRLOCK_DENY)
 		update_icon(ALL, AIRLOCK_CLOSED)
 
+/obj/machinery/door/airlock/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 0.6 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 0.6 SECONDS
+
+/obj/machinery/door/airlock/animation_segment_delay(animation)
+	switch(animation)
+		if(AIRLOCK_OPENING_TRANSPARENT)
+			return 0.1 SECONDS
+		if(AIRLOCK_OPENING_PASSABLE)
+			return 0.5 SECONDS
+		if(AIRLOCK_OPENING_FINISHED)
+			return 0.6 SECONDS
+		if(AIRLOCK_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(AIRLOCK_CLOSING_OPAQUE)
+			return 0.5 SECONDS
+		if(AIRLOCK_CLOSING_FINISHED)
+			return 0.6 SECONDS
+
 /obj/machinery/door/airlock/examine(mob/user)
 	. = ..()
 	if(closeOtherId)
@@ -1234,18 +1256,21 @@
 	SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced)
 	operating = TRUE
 	update_icon(ALL, AIRLOCK_OPENING, TRUE)
-	sleep(0.1 SECONDS)
+	var/transparent_delay = animation_segment_delay(AIRLOCK_OPENING_TRANSPARENT)
+	sleep(transparent_delay)
 	set_opacity(0)
 	if(multi_tile)
 		filler.set_opacity(FALSE)
 	update_freelook_sight()
-	sleep(0.4 SECONDS)
+	var/passable_delay = animation_segment_delay(AIRLOCK_OPENING_PASSABLE) - transparent_delay
+	sleep(passable_delay)
 	set_density(FALSE)
 	if(multi_tile)
 		filler.set_density(FALSE)
 	flags_1 &= ~PREVENT_CLICK_UNDER_1
 	air_update_turf(TRUE, FALSE)
-	sleep(0.1 SECONDS)
+	var/open_delay = animation_segment_delay(AIRLOCK_OPENING_FINISHED) - transparent_delay - passable_delay
+	sleep(open_delay)
 	layer = OPEN_DOOR_LAYER
 	update_icon(ALL, AIRLOCK_OPEN, TRUE)
 	operating = FALSE
@@ -1314,14 +1339,16 @@
 			filler.density = TRUE
 		flags_1 |= PREVENT_CLICK_UNDER_1
 		air_update_turf(TRUE, TRUE)
-	sleep(0.1 SECONDS)
+	var/unpassable_delay = animation_segment_delay(AIRLOCK_CLOSING_UNPASSABLE)
+	sleep(unpassable_delay)
 	if(!air_tight)
 		set_density(TRUE)
 		if(multi_tile)
 			filler.density = TRUE
 		flags_1 |= PREVENT_CLICK_UNDER_1
 		air_update_turf(TRUE, TRUE)
-	sleep(0.4 SECONDS)
+	var/opaque_delay = animation_segment_delay(AIRLOCK_CLOSING_OPAQUE) - unpassable_delay
+	sleep(opaque_delay)
 	if(dangerous_close)
 		crush()
 	if(visible && !glass)
@@ -1329,7 +1356,8 @@
 		if(multi_tile)
 			filler.set_opacity(TRUE)
 	update_freelook_sight()
-	sleep(0.1 SECONDS)
+	var/close_delay = animation_segment_delay(AIRLOCK_CLOSING_FINISHED) - unpassable_delay - opaque_delay
+	sleep(close_delay)
 	update_icon(ALL, AIRLOCK_CLOSED, 1)
 	operating = FALSE
 	delayed_close_requested = FALSE
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index b1fec07f422..9298859b64b 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -3,7 +3,7 @@
 	name = "door"
 	desc = "It opens and closes."
 	icon = 'icons/obj/doors/doorint.dmi'
-	icon_state = "door1"
+	icon_state = "door_closed"
 	base_icon_state = "door"
 	opacity = TRUE
 	density = TRUE
@@ -24,6 +24,8 @@
 	idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1
 	active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.2
 
+	/// The animation we're currently playing, if any
+	var/animation
 	var/visible = TRUE
 	var/operating = FALSE
 	var/glass = FALSE
@@ -252,7 +254,7 @@
 		if(requiresID() && check_access(I))
 			open()
 		else
-			do_animate("deny")
+			run_animation(DOOR_DENY_ANIMATION)
 		return
 
 /obj/machinery/door/Move()
@@ -282,7 +284,7 @@
 	else if(requiresID() && allowed(user))
 		open()
 	else
-		do_animate("deny")
+		run_animation(DOOR_DENY_ANIMATION)
 
 /obj/machinery/door/attack_hand(mob/user, list/modifiers)
 	. = ..()
@@ -310,7 +312,7 @@
 			close()
 		return TRUE
 	if(density)
-		do_animate("deny")
+		run_animation(DOOR_DENY_ANIMATION)
 
 /obj/machinery/door/allowed(mob/M)
 	if(emergency)
@@ -405,24 +407,67 @@
 		INVOKE_ASYNC(src, PROC_REF(open))
 
 /obj/machinery/door/update_icon_state()
-	icon_state = "[base_icon_state][density]"
-	return ..()
-
-/obj/machinery/door/proc/do_animate(animation)
+	. = ..()
 	switch(animation)
-		if("opening")
+		if(DOOR_OPENING_ANIMATION)
 			if(panel_open)
-				flick("o_doorc0", src)
+				icon_state = "o_door_opening"
 			else
-				flick("doorc0", src)
-		if("closing")
+				icon_state = "door_opening"
+		if(DOOR_CLOSING_ANIMATION)
 			if(panel_open)
-				flick("o_doorc1", src)
+				icon_state = "o_door_closing"
 			else
-				flick("doorc1", src)
-		if("deny")
+				icon_state = "door_closing"
+		if(DOOR_DENY_ANIMATION)
 			if(!machine_stat)
-				flick("door_deny", src)
+				icon_state = "door_deny"
+		else
+			icon_state = "[base_icon_state]_[density ? "closed" : "open"]"
+
+/obj/machinery/door/update_overlays()
+	. = ..()
+	if(panel_open)
+		. += mutable_appearance(icon, "panel_open")
+
+/// Returns the delay to use for the passed in animation
+/// We'll do our cleanup once the delay runs out
+/obj/machinery/door/proc/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 0.6 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 0.6 SECONDS
+		if(DOOR_DENY_ANIMATION)
+			return 0.3 SECONDS
+
+/// Returns the time required to hit particular points in an animation
+/// Used to manage delays for opening/closing and such
+/obj/machinery/door/proc/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.5 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 0.6 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 0.6 SECONDS
+
+/// Override this to do misc tasks on animation start
+/obj/machinery/door/proc/animation_effects(animation)
+	return
+
+/// Used to start a new animation
+/// Accepts the animation to start as an arg
+/obj/machinery/door/proc/run_animation(animation)
+	set_animation(animation)
+	addtimer(CALLBACK(src, PROC_REF(set_animation), null), animation_length(animation), TIMER_UNIQUE|TIMER_OVERRIDE)
+
+// React to our animation changing
+/obj/machinery/door/proc/set_animation(animation)
+	src.animation = animation
+	update_appearance()
 
 /// Public proc that simply handles opening the door. Returns TRUE if the door was opened, FALSE otherwise.
 /// Use argument "forced" in conjunction with try_to_force_door_open if you want/need additional checks depending on how sorely you need the door opened.
@@ -433,12 +478,14 @@
 		return FALSE
 	operating = TRUE
 	use_energy(active_power_usage)
-	do_animate("opening")
+	run_animation(DOOR_OPENING_ANIMATION)
 	set_opacity(0)
-	SLEEP_NOT_DEL(0.5 SECONDS)
+	var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE)
+	SLEEP_NOT_DEL(passable_delay)
 	set_density(FALSE)
 	flags_1 &= ~PREVENT_CLICK_UNDER_1
-	SLEEP_NOT_DEL(0.5 SECONDS)
+	var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay
+	SLEEP_NOT_DEL(open_delay)
 	layer = initial(layer)
 	update_appearance()
 	set_opacity(0)
@@ -470,12 +517,14 @@
 
 	operating = TRUE
 
-	do_animate("closing")
+	run_animation(DOOR_CLOSING_ANIMATION)
 	layer = closingLayer
-	SLEEP_NOT_DEL(0.5 SECONDS)
+	var/unpassable_delay = animation_segment_delay(DOOR_CLOSING_UNPASSABLE)
+	SLEEP_NOT_DEL(unpassable_delay)
 	set_density(TRUE)
 	flags_1 |= PREVENT_CLICK_UNDER_1
-	SLEEP_NOT_DEL(0.5 SECONDS)
+	var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay
+	SLEEP_NOT_DEL(close_delay)
 	update_appearance()
 	if(visible && !glass)
 		set_opacity(1)
@@ -556,6 +605,26 @@
 /obj/machinery/door/get_dumping_location()
 	return null
 
+/obj/machinery/door/morgue/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.5 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 1.5 SECONDS
+		if(DOOR_DENY_ANIMATION)
+			return 0.1 SECONDS
+
+/obj/machinery/door/morgue/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 1.4 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.5 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 1.5 SECONDS
+
 /obj/machinery/door/proc/lock()
 	return
 
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 30deaef9183..1de24c94a02 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -609,16 +609,37 @@
 	if(active)
 		addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE)
 
-/obj/machinery/door/firedoor/do_animate(animation)
-	switch(animation)
-		if("opening")
-			flick("[base_icon_state]_opening", src)
-		if("closing")
-			flick("[base_icon_state]_closing", src)
-
 /obj/machinery/door/firedoor/update_icon_state()
 	. = ..()
-	icon_state = "[base_icon_state]_[density ? "closed" : "open"]"
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			icon_state = "[base_icon_state]_opening"
+		if(DOOR_CLOSING_ANIMATION)
+			icon_state = "[base_icon_state]_closing"
+		if(DOOR_DENY_ANIMATION)
+			icon_state = "[base_icon_state]_deny"
+		else
+			icon_state = "[base_icon_state]_[density ? "closed" : "open"]"
+
+/obj/machinery/door/firedoor/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.2 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 1.2 SECONDS
+		if(DOOR_DENY_ANIMATION)
+			return 0.3 SECONDS
+
+/obj/machinery/door/firedoor/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 1.0 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.2 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 1.2 SECONDS
 
 /obj/machinery/door/firedoor/update_overlays()
 	. = ..()
diff --git a/code/game/machinery/doors/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm
index df8f7fa936a..bccc243381b 100644
--- a/code/game/machinery/doors/passworddoor.dm
+++ b/code/game/machinery/doors/passworddoor.dm
@@ -62,22 +62,44 @@
 		if(access_bypass || ask_for_pass(user))
 			open()
 		else
-			do_animate("deny")
+			run_animation(DOOR_DENY_ANIMATION)
 
 /obj/machinery/door/password/update_icon_state()
 	. = ..()
-	icon_state = density ? "closed" : "open"
-
-/obj/machinery/door/password/do_animate(animation)
+	//Deny animation would be nice to have.
 	switch(animation)
-		if("opening")
-			flick("opening", src)
+		if(DOOR_OPENING_ANIMATION)
+			icon_state = "opening"
+		if(DOOR_CLOSING_ANIMATION)
+			icon_state = "closing"
+		else
+			icon_state = density ? "closed" : "open"
+
+/obj/machinery/door/password/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.1 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 1.1 SECONDS
+
+/obj/machinery/door/password/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.5 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.1 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 1.1 SECONDS
+
+/obj/machinery/door/password/animation_effects(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
 			playsound(src, door_open, 50, TRUE)
-		if("closing")
-			flick("closing", src)
+		if(DOOR_CLOSING_ANIMATION)
 			playsound(src, door_close, 50, TRUE)
-		if("deny")
-			//Deny animation would be nice to have.
+		if(DOOR_DENY_ANIMATION)
 			playsound(src, door_deny, 30, TRUE)
 
 /obj/machinery/door/password/proc/ask_for_pass(mob/user)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 5e90d9dac18..ab18a63361c 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -211,18 +211,42 @@
 		return FALSE
 	return ..()
 
-/obj/machinery/door/poddoor/do_animate(animation)
-	switch(animation)
-		if("opening")
-			flick("opening", src)
-			playsound(src, animation_sound, 50, TRUE)
-		if("closing")
-			flick("closing", src)
-			playsound(src, animation_sound, 50, TRUE)
-
 /obj/machinery/door/poddoor/update_icon_state()
 	. = ..()
-	icon_state = density ? "closed" : "open"
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			icon_state = "opening"
+		if(DOOR_CLOSING_ANIMATION)
+			icon_state = "closing"
+		if(DOOR_DENY_ANIMATION)
+			icon_state = "deny"
+		else
+			icon_state = density ? "closed" : "open"
+
+/obj/machinery/door/poddoor/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.1 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 1.1 SECONDS
+
+/obj/machinery/door/poddoor/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.5 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.1 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 1.1 SECONDS
+
+/obj/machinery/door/poddoor/animation_effects(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			playsound(src, animation_sound, 50, TRUE)
+		if(DOOR_CLOSING_ANIMATION)
+			playsound(src, animation_sound, 50, TRUE)
 
 /obj/machinery/door/poddoor/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers)
 	if(density & !(resistance_flags & INDESTRUCTIBLE))
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 0df6024ca82..56e2f5a9743 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -11,6 +11,24 @@
 	recipe_type = /datum/crafting_recipe/shutters
 	animation_sound = 'sound/machines/shutter.ogg'
 
+/obj/machinery/door/poddoor/shutters/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.388 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 1.388 SECONDS
+
+/obj/machinery/door/poddoor/shutters/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.76 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.388 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.152 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 1.388 SECONDS
+
 /obj/machinery/door/poddoor/shutters/preopen
 	icon_state = "open"
 	density = FALSE
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 828177f90a8..0c897c68096 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -76,7 +76,15 @@
 
 /obj/machinery/door/window/update_icon_state()
 	. = ..()
-	icon_state = "[base_state][density ? null : "open"]"
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			icon_state = "[base_state]opening"
+		if(DOOR_CLOSING_ANIMATION)
+			icon_state = "[base_state]closing"
+		if(DOOR_DENY_ANIMATION)
+			icon_state = "[base_state]deny"
+		else
+			icon_state = "[base_state][density ? null : "open"]"
 
 	if(hasPower() && unres_sides)
 		set_light(l_range = 2, l_power = 1)
@@ -84,6 +92,24 @@
 
 	set_light(l_range = 0)
 
+/obj/machinery/door/window/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 0.9 SECONDS
+		if(DOOR_CLOSING_ANIMATION)
+			return 0.9 SECONDS
+
+/obj/machinery/door/window/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.7 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 0.9 SECONDS
+		if(DOOR_CLOSING_UNPASSABLE)
+			return 0.2 SECONDS
+		if(DOOR_CLOSING_FINISHED)
+			return 0.9 SECONDS
+
 /obj/machinery/door/window/update_overlays()
 	. = ..()
 
@@ -135,7 +161,7 @@
 				if(allowed(occupant))
 					open_and_close()
 					return
-			do_animate("deny")
+			run_animation(DOOR_DENY_ANIMATION)
 		return
 	if(!SSticker)
 		return
@@ -159,7 +185,7 @@
 		open_and_close()
 
 	else
-		do_animate("deny")
+		run_animation(DOOR_DENY_ANIMATION)
 
 	return
 
@@ -218,11 +244,13 @@
 	if(!operating) //in case of emag
 		operating = TRUE
 
-	do_animate("opening")
+	run_animation(DOOR_OPENING_ANIMATION)
 	playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE)
-	icon_state ="[base_state]open"
-	sleep(1 SECONDS)
+	var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE)
+	sleep(passable_delay)
 	set_density(FALSE)
+	var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay
+	sleep(open_delay)
 	air_update_turf(TRUE, FALSE)
 	update_freelook_sight()
 
@@ -261,14 +289,15 @@
 		return FALSE
 
 	operating = TRUE
-	do_animate("closing")
+	run_animation(DOOR_CLOSING_ANIMATION)
 	playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE)
-	icon_state = base_state
-
+	var/unpassable_delay = animation_segment_delay(DOOR_CLOSING_UNPASSABLE)
+	sleep(unpassable_delay)
 	set_density(TRUE)
 	air_update_turf(TRUE, TRUE)
 	update_freelook_sight()
-	sleep(1 SECONDS)
+	var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay
+	sleep(close_delay)
 
 	operating = FALSE
 	return TRUE
@@ -439,15 +468,6 @@
 	else
 		to_chat(user, span_warning("The door's motors resist your efforts to force it!"))
 
-/obj/machinery/door/window/do_animate(animation)
-	switch(animation)
-		if("opening")
-			flick("[base_state]opening", src)
-		if("closing")
-			flick("[base_state]closing", src)
-		if("deny")
-			flick("[base_state]deny", src)
-
 /obj/machinery/door/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
 		if(RCD_DECONSTRUCT)
diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm
index 847254d2785..7e7076e842c 100644
--- a/code/game/objects/items/puzzle_pieces.dm
+++ b/code/game/objects/items/puzzle_pieces.dm
@@ -86,6 +86,18 @@
 	puzzle_id = null //honestly these cant be closed anyway and im not fucking around with door code anymore
 	INVOKE_ASYNC(src, PROC_REF(try_puzzle_open), null)
 
+/obj/machinery/door/puzzle/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.0 SECONDS
+
+/obj/machinery/door/puzzle/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 0.8 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.0 SECONDS
+
 /obj/machinery/door/puzzle/Bumped(atom/movable/AM)
 	return !density && ..()
 
diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
index 1de9ce2dc72..2f3b6381f04 100644
--- a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
+++ b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
@@ -5,6 +5,18 @@
 	puzzle_id = "library"
 	open_message = "The door opens with a loud creak."
 
+/obj/machinery/door/puzzle/keycard/library/animation_length(animation)
+	switch(animation)
+		if(DOOR_OPENING_ANIMATION)
+			return 1.2 SECONDS
+
+/obj/machinery/door/puzzle/keycard/library/animation_segment_delay(animation)
+	switch(animation)
+		if(DOOR_OPENING_PASSABLE)
+			return 1.0 SECONDS
+		if(DOOR_OPENING_FINISHED)
+			return 1.2 SECONDS
+
 /obj/item/keycard/library
 	name = "golden key"
 	desc = "A dull, golden key."
diff --git a/icons/obj/doors/blastdoor.dmi b/icons/obj/doors/blastdoor.dmi
index 9457690cda365a95f35394da068bc7705453ea77..9c7bec103cefa175f85f47a337d68a0a157231dd 100644
GIT binary patch
delta 63
zcmV-F0Kos=6y_ALFaZIQlQ98qEQE_QCqKUctQ>AsenDy;6^+7fjv=bkQ&Vs$Q&w>G
Va{&hl0Q2ihu<NQ2#IwTzn+Wu286yAy

delta 55
zcmV-70LcI56y6lDFaZIIlQ98qBm`kVenDy;#Rg#4ZHVg3)D&FGloee4T)^H30BI9O
Nx>7HNT(ipon+RQA7FqxR

diff --git a/icons/obj/doors/doorfireglass.dmi b/icons/obj/doors/doorfireglass.dmi
index 250b5ca833a89c25b9b224511fa2b108e225319c..83156ae4351e1ba3ec6125e61ab6e5546dcc3a47 100644
GIT binary patch
delta 8648
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

delta 8654
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

diff --git a/icons/obj/doors/doormorgue.dmi b/icons/obj/doors/doormorgue.dmi
index c0ed1147325ce7f85ebf13209b77f11979151c8d..381e5c3385ef3a9ec00dc55270ea48e4c3308960 100644
GIT binary patch
delta 2395
zcmX|DYgALm7Czz7bBG**3wo~!O(0Yx+^P_yNFZPmMWKk4Dy>)^9t6Z9mRAB8gp(LW
zX+cn|qA0{il?q72st7_3iiijT^1kv2iUtUe2*eZ%;YRPe_s3o{`<pdu&&;>KJ-gT}
z%iJf^-_OfrnZ+^y08GB|_S_Bt1kpz`0QE@UA0cb>1LE%+uo=g3M@PqifB^l3ChOm$
z#|ixHemel}+upr;=h{gxU(9ZUD?`q5-kkZX)2iFW<g35^>QrXu=<<*H^`1KlcITcy
zd+zLsO}GB#&vItmGOO>d1MjmEXJ(CMWYdIYCfV@)LKb%I>f7(lu2)pjZ`pluc6;P!
zJ2@-jngM{MODJO<Z>$3VqeI_#@&ZyWOkTVt{K6GE(iNOI?UlB>lYMjui!v7U6dx~|
zxm+qU%mBlmuKK;+`m0r&%%}?$hCg;sjeR(7%1C!N&}kD=cU!%iA4}M(x?*mxPRo8a
z8NF#vv-{bbq)_<9e5}@RC_URf<l@mbp74kgAFn4M3$Cb1Fd*m$#tXnu6@laqt@nXW
z;gQQ-WmynYbn$)Ea#u_y1VQ%A2=r|ZiYiS}MGICdd5W&fM|4{t^iPh&P*&~at+;xg
za7G~mORen{V=YLWI2sN#h!7bEIN?#oZrp#4iduJ);s~FX?ZK+qHyaebNwp0JLKLr9
zOV-3eXYh8OK=g9ynZcV5ZO_8yIrcU4z;6q|GA9i7QIZrt)l_S<-g1V-Pq_RX@p%qq
z;SPdc(jm<`3r4VQyAgB}EZYy)4=eR|uw2O)r!=zoqSZT{a5HQ0`_xP~sDeAfZ7B~I
z8K+da6fHHBTnB>zio(DWbRJqqXOmS@w&XfHAE~8Fa=cPVHtujltw3aqn#5y-Z%udq
z+PQZ|WZJ#tu#1y7`)C`ZQr2oZI3tSfS#7UYs{=(BtV$*O+fxpbDxT9~s+9D;-T|%W
zY|%6xPIp_!tzm<9+c3y)BFcXprqMq}mWH-Sd&9~kSDa7GnSV7vQ;4RJ!YO(mEya<t
zkco5#g<H0Dh;7IXT&(6`jv#k}^dgjYIbykMV;0FxO&%HC;m~%HH-dHqQBrE6zLpnA
z4(RNlmxolM^mLSZdQmR$Z}x({{$ARb-d?*T0|z&AJoa=sT<@4PUrfN}_T#DXz^<6X
zw?`}RJ?3#94AzPR#%}m$ZG^5nlKLwth0hG0+A4&8{<RG33OJ8Fvt#3imn4sES>cBt
z+xGI$)`h}9a1``D!@~X|-U!Z&4nsAk#9?0_7Posbx%b)N6@9kM>C>c*=zefr?=&}b
zB#G_4Ud)I^nBv9(a_?Rg0DWb>hK}HmuUC>zZNvAMl2L<`$xc#sOgw$9Vvl)@^IhRn
zd=xuRxI0t`mYgMJ-K2RgE_M4;Y9dg6i%6qAs~Ju+R4qBo{Ix~1t=6<r3C_zO+oFqd
zKQ2E{5p2VSJzYpXG^$Oppn_=DE-<)UVEBi(h;;mC>S>_@pe!F?+6hoKAI{??Lo?fN
zzvQh2eHH84qDn1bhEb1rLwFYx#|-U3BHzEevRzDSk(S<y6cK}=LXc8IrX`9HCeIn{
z)-qwA@<jZDWeZ>);6!J~B;-=WU@#so<u}ot44@inghyOklc+I`GLh8QL|5hUO2C03
zC&=eIQZdDBTl7ej^2h0_6aNQE$S=CkF^<>iMGU)oObJ$V`<A?fDH}wzA5>wxBUX5K
z34043l1el(m!lRtRfDM&_a1qh(mqc!?PR^!1d%I0dMKK`(jy|Slb5mq$1Of?XN^nS
zQl0GP29aeoE|QH!NUgm@eTd%PM0dBM3YI4&y~MXbVX;+R%p36~lCq5NvS}fhS-n!S
z?^qcrkoZ$}5Cut=X|#UX$*SRbyl?nt4|gk;^I+LAr9?d|R?i-NBEqI}MwReeWD7qr
zBfQFo%i%CTJ~(rLWtX}&6<S&4`p7Y4l~i86{u8{o18x+JW)M0|^!oej0Ht`S<V2V>
zz1%HBT+f7Te<Wk07FG!|7Q)Y_fSHeN>B@*F;=!=rBr{o$DW9(ze8%0_Ravf2B^F|H
zCg3TTvuMd?l5F0E!GXM81oL8o0C9&sId4%S<}z@OHzIPpv4_ilByt>Y5{-pWm^G^<
z(eNE4UuOZ`mn)Ieew2L|*EKGBB<mUBsygd*SS$Rnb;TO+-$O%Qr4ErnOR*mc19SrU
z=+r%nRdsvJFT{)WvUm;kPe%$#o-VCsuef||(3<ySN%Iq3p^W45q6d-dou8B9-t2|%
zHk>2a2F4tAvNe*M2dV(g#UWyUEB!^$G<u7;5i0%`$`jW|Fe$!J9`6M*N-3$U>&B#)
zKw(2P3Jh$1cW?HtJT^{tCwElzUVB8`wH3O&0@;U^Q@x30q3K>Wd^EMW8CZc^yoUT4
zJuV?LKvLRe^@lCPnr#|VuV&j&g>F)~R(Y&PFhZ)Z3<*+ddb+6-`XVJfly=48iL^f~
z3eLUH0ezYMbt{v4So(TnhiRT8{?pIt30!iQBkP7$5_hf^nR&4GOlKa!mfV1+whm5m
zC)N29b=4XY7~j^+t(m{)DzeHSsA2pJXuhmt!uK<TFpc8gBHsC0p08K)uqN}N>Wf9F
z$0d6zcKM){^#jiN3B`?vtX%@F&S<DFjeDx1nYz!T>V}&j7mJygO1(Vank;)=H8m_4
zW=Pac?>CVfE5ncp(_j$n^{&G^lG#k>4X^NU)a(wkjZJ-pmss2DPckhn0oQz&3=vC{
zlF{^yUd-cElxWKCjStb*B5~jVMFF{QX+ge(W72m*AFYcNP4S$S1ONL3Vsx=s9QL&U
zzNhtyDbg$?Z-3{|Uwsov*JGw`nUi^D1=7F3>rd2^mdOjX{!O3Qoy>`HXH=K}ZRu)6
zNg>_6Xo#@3&J<?pYsCm2iSEy*U7))|m%!<RCy3`M6N0v8+_njcrs+wq`!Dx|$hf0w
zYU7C;6z^&?%rTePh1l>$xDDSsabZjFC+l{?nM#y??o0R-K#BQ%mZ|`9#DBgU1zZA~
z@39@gqHA5^?q4h{O>~J&TpaW$l++)^i-jMN-COD+)IvC~PNff4p3I~?82kiamXg(;
l$xuZ{7%Ae?cZd!y=w{HyGS&y_TOh#bo6UZnH#ee({{trQLn;6O

delta 2294
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
Optig1cD=tfAo;)Mt#!Bn

diff --git a/icons/obj/doors/puzzledoor/danger.dmi b/icons/obj/doors/puzzledoor/danger.dmi
index 89d19131cc189e759150619134c1c423279c4ad1..ed78272037e37cf11eaa1121f2de5a54d14204a7 100644
GIT binary patch
delta 1339
zcmV-B1;qNs3;GL?BmrrWB}_I^EixV+9x5s-9UUD2{{U!zq)%y+D?no>Cnvzb!1vGt
zd43D800001bW%=J06^y0W&i*Hm64=pf2z$dNX^U4OUJI*5-6IQlUNB7)&W5y9YX}<
z;>^j<FTi0YF58tAT>V_YUIPG0);~3t?Kd|700f>%L_t(&f$f-WbLt=vMlm#LY_%Ax
z@z&nHO#lCnyetG*V1dkZcI?b89~{TCk|PqrgZTX1belr!HlLr|TmYAMJ=LVCe_-YU
zc;64h{rxx$BfO6Kb%6K1+;$soE*Adq0NlL-e|Q}G?WW`AMqt>vwtw3D_q(Crs*am$
z0d?5zrllR9kM8ZX+Z{{?yj*m0d)Q5<vu*QbUf!KglP-`QH#Y*)i7Gfvt^-bP1>A?Y
z;Cv1pFmf{o$_1N_n~P4>40Q+0e>@iWb4dzR$IV6ea=l((oL{6k9j-4OH`fAE%20qS
zrh|kIc)93ax7+QjE12h~VEftu|I5g=fKtjAT=2g%9TarH%R%5xl?-hMtQ-X1LqYN%
z*$!Aa%z=+E2lS1CXQ}-US-BRFA95+k?o$aJ@NzAn?^9Qhu2fg(fS3P(e}|E(JuF};
z<>h(=Y6b8Mc==BdxcQDqHTHD8TnotZuC<2_csU4^_U+?nJ7DEHn#q2Agv64k7tJ@^
z9KxyWA-6$#8*O?sujA0)*>K6qg^90Zct!D=k&EB+f#36iD8KKYga|ikn(u)^+mqbU
zP=Pt7u7WrpI6ez;L@QOCfA4`pJCfW{UlDOkmkR29V7>@3r)#<AK%vbfchprxJfcel
zbv_UYWKXk1AmNz+=9B<+K7a-CEmbU#@>C$^gaCCukO@Tjo)AEs6!5$tkj8ULK-ES7
z@sfb5jX)xxx9y1l&i95U0)cxP2{;~6BoLnunD~wi;(WhQWPmxMf4&0o3wax)=L0sn
z;a`aJy`%US299a?g`QuiKOvkCEcxAr*Jy}QzIQYlV$U%}L+p4$oj`IvVB<R$!1>-$
zED$)RLBR8bI)UVTARhso@2L?8oE`zs3nP%659D(I=X+`n1WwNZ&kJ)PIUg|bJ-Q2U
zzF%m#e#8;=6^O@lf2qjN2eNe_%J;-NfH=7hcwSfsvh#s-C5-cZz7k?it%QNoD`9p%
zaFd6Tsy&RNd`}1<P6~Kl5J=Al$PuUsAYL4Snm~F!a2tV}?}$`mPpBGuLe<z4s@9%R
zmUqQ*zR!2Xm{Ysr!0BCac0Lg2f;8W!xgh3wF2J111;6J5fB(t(fM_-L{NHNq`M=fJ
z^Zy!wVfU1SJ<9jwH(OlT{NEOU{QjJS;}r5e`OV|xc&YEhDgl$<FFBacA>WhVoX?Jz
z1>`z`=|l>Iry0Az`IZ7Ezn27-d|wpUH0HpXyFk@OV9ED20aY7;Zwsh~fNBV=xeH8w
zPd6;)0w~|pe+CUMO#W{REcu?gK*;yBfae7PxkkX`_bj{G3xs@63wT}-fb7>6fc&0i
zH+zAQ?`Z+g3j%7LfX?rQ5eWIdCh+!M0h{m37kF<7ynj;w@_U-zP5<YR@5$>o`06<T
z`Mt0X_<UawsB*XqRtZ3UF9`U2Ul6ErSO?Y!-27prb!rczCEphXEH4YJ+K|))mUvwh
zu)Hj=YCmvufm_c3$nW%)EadyDz_&+0=l7|wD|Y#w{N~Z~qCme+pp*+jz9+xA4}ARk
xf-Lg&HKNzS=Koe>&;PB)p8uNy-1)!J{sA&&;fIjim=FK}002ovPDHLkV1m%Liw*z)

delta 1267
zcmV<P1PuH73&snOBmriTB}@Y+Cnu3{7#R1^16=U|Z~y=R0d!JMQvg8b*k%9#0FRNU
zXMd<QBuZ7X0d{4UK+)8k#7dB`4hS0Q7{VZ`2{;Te<Wg2}^>YDx6#x&ULPIS>T?haG
z1anD5K~!jg?U>Pa;vf))Nodm8YB5%$TitDa|Cd|{0S1@>X%DAf$c4w#kCIQ40ROPl
zsc9Rcwaw{Nn={4vQ-?J^_o&R7;$7GG&wtND-w*0@ke|K!-tkr2)aGpAFE5IlPsLwe
zhi=uhwfQX2uT9&$ZS41T->pPjn@a()U9ZQb?cR6h>$qNT=K<<+*7DVMJ?;;>O~+~Z
zcG!=y18-|{DZsYl9_z3l%>XsI7BGK=9S#RKKt(Q}fs{Zq-@}@mwIXFG2dK<_fqy^8
zpo3^@bJl*G&*u;0=P8cc^G92oO99Tg>i~O<TdoGE%UOF_tyUM)VVb-St4n(e|N8?j
z1%wc`!x7%4aVyjSb-5DwCn!TbKvk{;K3#|49_az9a`g;+xqB>M6!?_tdsvlA0sh68
z4$*tc)c|$56p-(!=@70|XEi`w&VOoeHu=p+q&5q+l-A{P22vf=FR07!L7?u5=Y|uJ
z$eiiw^7%+co?4k2fYZGDIhO+DxqTS)09Cn+X1p6-Rbq+Li{wphuEHtrRBlu0ZP4j$
z{v7)5Nr%g-oXznS4X+?xSLEzbA9&OUit_#Djj;{M6;*A6azkB@Z`22N?|+Q#NUo@A
zJCqx0dwi!pFdZ42NUo@A6Uq%WJ=|VUu$y@T5f20c9trHhc5E)1J5oV`nEL`D4+UI(
zpdjBz0v<;M07nH%>jRj8NX-D?Hwk3&y~Ke4<TDKf9JkaHD60?57#R3`p}+ugKy8oW
z`hdpp7ea0*{DqD~YI?Z(z<-VTUSn^H0XNi}V#^_Q0)_PfjiCVKhC%_yA$0<U^?`T>
zAjf9FaeM{}>jUvK06F#yIF3I9h4q0Mdv5{c3-#Ut#{mUzL1}#;S_eFitOJ0f>p*dR
zAY2K39<PLuV=G~CeW1!_RFdx_0godBfTIGX^#ODSQUZXJGw}NYzkhxrD#-WfnNVcT
zgd%q)EXeoaso3Z7sTgwXR9svi@N+@P!(8C=I2SzX1CRQ^qdst7^#S;nnl}~X`+({m
zj>lBC9A{pA0IpNZS_Sj{d;IUa(Q$PA-Do&|ea1k2z+0(RldCn%_s96Zr-S3@@YBI?
zTEOmxm;l_(Pyxq(EPrso1mKaXrhv}xgn-HSl)%DCfhO||xOh$rh|~-$JS8AfGhhY0
zQ#%k483B<I5E%hmA2_0~fy?(HoqGU|8)P^G^?@UH6a0LSUBGgLdYlk&^?@L}8UdT{
zBdRZ8IU!&<A>ir*L3%d=Hs427U%+xgz;Z&s)dz?fu=$>t0e{Pr0{?OXGQShg0L=IF
z1wJzZpBVv_-~IHiuMhKmNOcd#(d%cpeFjv1C)NR*?}>H5azY@<)mz}|1Ncg4^F1M8
zIU$hbY8|-T!)7E>n~}-)siioz8EH-nxcWe122uhGCj~U81^8VE+;AeQ`V7qZJ#{9O
z96ypdo)pN=07R!x#U|g6#HrYDboia+qyVT7V7UO~do&j~jt;+Ze7Ig!7P(#r@Yz4=
d1NTuM_z!~H8xI3Y_WJ+;002ovPDHLkV1nIfQ|$l%

diff --git a/icons/obj/doors/puzzledoor/default.dmi b/icons/obj/doors/puzzledoor/default.dmi
index 49a920613958008c10019315bfa2132b04169bbf..685fc448bdee0a2312b958b6443590f1e51dd271 100644
GIT binary patch
delta 1291
zcmV+m1@!vq3!)5=!~vC&#b<x2%`ZsJ%gjs1uGkVNnwpbX2@=);K_eYQ806y2$<Hsq
zVInTOl@(n5T)-X!0M@rY*ls<5qW}N|s7XXYRA_<inCo)dFc3zC1u<9&y(GP)O=?1b
zG-=-d`KpU0t)yMAC!kDciheL8XDuCsko`%#zRsE%(VE%oYi%wJmveu#Nn25w3(FUa
z3)k9ZJG{GCEar06%q;i+gZ$#+BwQHYEwF+`H($*f%kd6Q!o_%jVmdgUYXQY{P?w8F
zu0{%EQ=6X!(lv0oL{@QKE*cdL+hwBYI;hNZ0a)Qyab+%=tMz()<qO(2DOg`MQ}~A?
zuGa!m%22R`-%>Z1rUQSLfBf|M?bnOudbL_z6Nann#_*d_{^je<x9@MhUJEFtLP7Q&
zDboSVZ-4xJ`}IcP4isD_tJHPC^4lY>Hv;#*p!l7-4ytmq27dW9Q0`RrJFLpJfczz?
z0%<y^%e8?1ol*sB(?MPS58R9t^FUFV>lx4m_(SRN3C21&o?Cx`zQY8%-gnS<SO=%!
zb`A7>H?+;e#=q_Q-hYQRxtoE|wvXHRNBjg8xfYPSJzj7)>`VuBxe++*4^L0~y?H&P
zudaitTt_pxJN$muf9<7tJv<Mud&_6Fxe2Fo_hR_V%R#%oNW<;>-5(b&t8!uE>kexm
zURUJed_Ium_jZ3NMBJ+Kd~c{}Ey_KO6_7*fE5P{xE|BN@Tp;D80OXheaz0Q9C`Ldr
z0*VpH&j(Ne#Rw=yKrsUFfuRsc9w-n2z)^v~34uJG|DOV24d};q<X7OirI|qFfhGc;
zClm;z@!ZCDV36kffdT`_0Sy(AXLP8*1QLTZ-+P*TLIr;W3WLaV>MDx!0T*7O0L=HE
zLV?I3jRJvZ)C*+i11`Qp0hsSSg#wX78U+H+s2A|(14Di<X8`7VYz897XCQE52D0;k
zat*+IkF9~o@ih=Qu?Dj90UO_wUjfYb1C8S+9MDh!cuI$g@_eA!2a<e`>;r(K`#|8t
zK2V$w6gz)mlJAk75O8!S^gN&cxJJ_Rfm|TX_oV>jm_Xo!Kyf~h3#9qJ6o4EP2%Hco
z&IhX9jHs_5KOevzNEGuxqL>E~%P9eWJ}^21V*-GaGcYC)&Id4oBH!mX!<3gdL%=Zs
z?0jJJAjF2u_lBCbLAj@)0&)m_1$I8LeG~%Z=PZBU8*17X<(`6y$RUgs<@rD=kmvhc
zAmyb1;Hbd)eBgXO@IL1Qf@{_DKi6D-&o?Sz_Ntig@k=LhR=~w)R3PMggt`$1PW5er
z$8iFR5m1bPnj)YW0mTTYBL(aO10~>YCbWR#w17Md9J>Z)%o><6YhcQ+z{cm|iNzX(
zd{2KEczyzb@}bQbgnUmJcuosU`4!mwj!yx|_xJ#T69Ojx^8zNn7un4T#C(qr5I7+q
zrwG{mPRu~e_xJ#T69Ojt@d87>#{^=&#|H?U5Kz+u?o50}#s~SH9)ROh1n$vK*us22
zDlp0?2$=j%ZA3ob69Y`(69i0tCj>&iCkB6*z$XZp{7wjjd`}E8f%5|TX40a&K)e}I
z*PiBPr1Lv1;PO2^0MB^=IVRx3B|QMoj}hqKNnkbKJRky_u7963pg+O(5fRw-?==HD
zzvBWi-{Y4~;!_0b=6|kL&;MMjp8r{a+WDVpe*vg&oGs&qfF%F`002ovPDHLkV1gat
BW&Z#G

delta 1234
zcmV;@1TFib4CxDy!~u_y#b<x0H6%(^vH^BwmO#<eoWx3yunq_s=@`NwstGs@FyvBJ
zaP@Nmdldi=q(Vb2LtO{}00ebOL_t(&f$f-UbK)QrhDp#yL+f7Jy>xF$t=g^Y|Nng(
zAix3638Bi&&W?O=Y#)X^5<++nJDsY!B3fOYPNg}MoG;MERgc1)DZYPP-ssk>n(^Ds
za=GB^x>DTy5AvIvi*P1+yTm#y+r_%76~_m-2xrqBL}GyR`5+(?1C-^g=Ie<Lye`eJ
z0{$AfT_LNuEN8WFhRw=T)B_aep#bcmS8-v^>buQmb7wj<jn`pwS6_m^o8W^0=iGK!
z!MoHhxE$bY{{F*9nzMiUe!X7b6Nc;idJcb><exr2eECZ9K|ly$2MF$wkOQ2}AHRL4
zxfJ*T2DtTBsUF~L{y4#<z)v$k^qlGeigLLIewlk5?^Nm@7v+Nh|HY{eTn<o{4+6t;
zOm*1E0m|}!;AJEd2a3Xcn1P`KekdJ(!PEffb0yHVm_XZ^0lI${8{jfrt%0s<$JRgf
z=4;z^<{p;hdIoIUK5yM0?iUo~g8<*{@eYT>P7Y9(OM%1w@ba?X%g=-VsRt;^hiJxk
zhu^QmUwbY;53l3rUh%3lm*JG}j*=gbhr#v8C0E~fe{{Gk%9)C<JFJ0tU68YDeIP5}
zH!H>(l1nOEgK~dET@O$nAouDZ-}?d~4+VT43%sE|5DAEcfJg}B)(21lkq{6Gft&+H
zB;avG0B}?wH=h5W0vY*!z{pczxT45Ypt+^dQ!qc@D+~;LK2l%+IiR*jc6~tOaFqjr
zzyNYcO^@vQfW}Y&azmkj<B&Rm%=&=FPylj6p@8F%Ist!EADGVfmd7&yIW_~1<1>(1
zABfig<k%W;9A5*O^#O&wrvUPidQXAlfP$wWw>}W<10F~A0l?9HAiF*g?Svjjc0$0>
zoiMjP5DNG_7JwWR$gU5B0zQugAjbr<>jOnzMmhN&JCKOPfkY$^BpLZ0oq;I<!0Gcq
zM!xr7h9Q3sUxq%9Uxsg}5A;ur^(2>6wjSk%+8%GI4{V<q+mc*T*|sP*6!gfi5BLHh
z4+VT43ta01*ZRP<KH${{;67#cDv<93s(UydQ`u&56VEXLknd3e%Mq%tFmeJjSRWt+
zL_$C$1Vlo>)dwa7L_$C$1VloBuO|e|fr1jyoECr3oEG3$0ka0YQ#%l-5^JDJtbr=A
z224B;()(!O@_iFh-NSOi!0=fDh=I%ZO+-}>%LxO+X#raw2(qgYu=yUJ0>=pf%LxHj
z9|+RB5wQ6_qFTUmLcnrDz|{wc8L;`Dm;uYFTVOaL;OYa!8i4s86R?~Ru$&NZ^#MP<
z>+65Rd>>NP1918RDL&Q*h<(83dtx83d{SVNkM)6QhHVW;b7~_poVdUYKGp{a0h{j$
z0n3RC%-~~vfDo|xo)EB{xWEiPzKp0_pkF2px(hgt4?p*1r1Co@pz}Q~pgDbkG#~2&
zQ!_9np!w7<O!2WkfC;#KPY84u5|H^FhIdBQdYJF~Cq$rcyUVNrmEU1@R&5LO{q`9V
w*mjqi0h!-X0hjM_0mt$2XYp%&;94K}3*#`!EC+k(@Bjb+07*qoM6N<$f|?pU-2eap

diff --git a/icons/obj/doors/puzzledoor/wood.dmi b/icons/obj/doors/puzzledoor/wood.dmi
index f2b53e857393b8b5778e81daa924bb3cd09a90a6..58717aacf1e65193c2633058c347dcbfc80318c3 100644
GIT binary patch
delta 1790
zcmbW2do<K(7{}*lN~bbrlQy|*S*1}V8OEB$l$qA0#%5wzL`^m8HW5aSF+Y(@mWEg=
zGF^z|e$N!ziLqT=k_=-ErqyDMOXV7~a|~OZ?d;jJ|Gn??p6C1hJm2S!w{>HIa^iNN
zHE9PDdKtg2#JLiHRwq-E;d1>d_4W1bu*W742m}bU#}go!LGEekB`JA5lnmxQ*SC89
z^qDQEkgI^Wb}iXy?Mc<4dd<ybJe>|Gmicw%<@XK0k(*M2MChBb4{H=hLLl-KYwZ4`
zKcA0ETN^+)r5p`!tF}FYbv{vmIErn(W~EU6O7+_aT#9lD?8kh$s9jjs;tjwiLLM&H
z35U}YukVd;BCcx4Mj$Awd%)?iSy*p?MF#y1jXe0k@S!0&vnnJ#^>`+RdF&=sQ6UCy
zI+JJ#M}LUb3N2${geehQyTfl^5{DkDBQZuSJo;`lO+@WfE}6$B5aOWaK%|{%NK@+o
zAsUC*pm&D@S_ez#17%O-ly|V}Th`&UN}P0&`LA`U)2~dxY!i&y-d%L+iFa50vXBNf
zy6Oo`w)m{9<BelR8p5{m7KuP=W+d!>7|s_O;dK;S<quUCBa?LRWvDzN2a0f_%q)K!
z|8V2J0bA{P+o8M@G<?Qc9afH4hQ0a?Sap7lwxRD_eD~G6p6zUhhO{ykUYIff@vYxP
zYzCifC%4>XrrR_tb~a~l#BwrY7}4#zwKn_h=B&%V`z-W$i_oqX!8aRq8i4L_?;@6Y
z@&ip{%8@5vv%8-b>lfq_6B0SN52aTakH_!WOy=m-T;&I;<{;0l$pUOs2koCytQonJ
z%&x{pmo!~p(f!-WXWC7&O+buV@rNl|lU;k9le008OXExq9t<GPO~>Y;zdLh$X#gi@
zdw=3YUeEBW{Yg#y!`@;~XOdv|oqfHfrBP?+_%n0mfbVo~6?Jq0{_dwK59YBjM^sgL
z1vl6m5RRDSC<_4J`dm$d65On3+{(q$(z5bl$imzYp<=(#5%565#<?q!xqN^@{C?s!
z!4CC)x96@fZ5Ovcg_&qaHxp~&g+fCp6`C1FNtHyGcEMWaL8T(CvbOXJ32Y8T6y3fQ
z5HRg$GeN|v6+hy=4q5EHQ@LN?XVSQ?NsO1JspdY+#B&ae7L;t6k!HNST>ZL9uK}>4
zlid-u*e=ognp-7t&0X4~$J0ENQc^+Jl%r(Jlxf^Evz^tXW1OQhF`m5Q;Rmy+b(xb)
z9x5#zt={u155;&X%@U(FK80?3#u}Tou>B3Bb|`a$Ywn$nk!{V_VJyd-J5(ez?CtOr
zKk3WdAgHhurhxKe;mAHVBRa>+yUfk#E+4%>&bi-y4is5%yqD6S$qGU(+NreUOmuZz
z3^rAc3mpnPg{U1N$Z%ZD=V=bL=&GG{RcPi|H!&u7Pa01+`uvYcchS7PFhyPxX9d-!
zIlK)D3vNIO=$#8;i!oclbrkp+_!!d&#C!JPvVcg?`R&N%%7QKdT_S9$TU^Y^;7hzR
zUSR0f&}x1FJ6Olp>LmqI6-t@elMTDr4eO(}zy#UlnnzebkJ#YxxQ30IQiWRm=r@)M
zf}8)nOaj$vZ9Oe-QKc><pN}>Q2DF$L(b!RWKNjaJb}&NbKJUTbM@w6&bEC)XyAyNy
z5X!U)Z`@4=ATsx;>_?{<t+G*-!jM+fukcB+D`gSgLL`+hjmAi413$MlqTyF)xMaw|
zFP%T3jQ9OJ4TdIjt@?5X=1x@#AG4|KXQdc#_d<p9%o>gVK@Wb8{|WL*7Dt8MS&g+?
zKA3Kk3aHdJb^u*sgT`^ALd7O3!yvlIKL}G98gD>LxCbrelj8fmT{RM=G79d(;c%a6
z71E3<am})X`L^yQiT6O8OadMYQn!A%aQ=%;SQfli@R?yOl`$(A-&Cj=ORbZvZv9^j
tpN<j9+>6`$FW{YPu(A+VnkqUaaJ!;M_Yv#~y7UKwSmW^6!UG-=e*w($c`N_`

delta 1694
zcmbW2c{tR09LHzsaXgM`rOCOa(h55fIooliP0oy&Sj;0uO0GtZ%;c9WiY>>OqLHJ7
z8BFd5H8zv87+0cUGOomCMlwTV#@e2;YioC(XaD>>-}m!+zdoOTzNK5b<Wtna9jUwb
zmwVQL@z4!yl{7~wDn5wo0saXD0)fvX99=*blLMz#ha@~?qaRRYpl*w*0EhdYvgq#1
zdSa{AYa;=1UKs82Z@pJCGW~i3PaQ<OYPolet=<3vi7OwmwnUzexp(7gC?2)tuueDC
z4(fcvO)f4`(p~;)Ouzd<>#{3pJ8Qs+sNAD*SELPh=AN*vmV_1;6*ZyviIr0%6YZRj
z4oOitg3CbcD+k~Mu9iQXX>>cnFH*n3#BY*_h&L%~xXHP+Q7DRqn2mSQA?Bm4tN;Zn
z#&~+ltmQqNM~xOr$jGRAMK-F{IGvx+UChTP$iPf}-A4M@g$o?>6Y9*udW`X1YBI+@
zM@LaI&Wh&U<X1k-B+!evgQ?vomt)derx1WH4#EU{DXN_?a~*`TtXNBPbJlicR}7dr
zhBmRMmZ@)sm1ZdZYGlmYS));lp)RJiu^x;P4lO!nVKkX8XcNz4sM{Ha7k}({Hc<6O
z)PCpbASG-fq=`_uxqC2ldb0UWrO-hCbvb&ZJx@d~mhUbCM3>$6-zp(u9Ynkr9q6fc
zHt=$W;$$5xdCg<XJZnih$OoIEo$w(ZIa<&JecV<)H9Af`WK@ZsY4>jHK?V%M=Hv)0
zV!&x?SX+<yqgZ@!=tS8vuZmIM49)BDsmObCeZoPu7R`PuM~L918|g!|lb&+4+zIZ(
zdb;0G>(6z-JI=o2Cz9af9oj_Agnlf*@u=sCB%)y05a7PBn0U*BI3HnWxoOF?)4MN4
zGc{ow1<0?a(aZ+>tD=Q>qXbO%t#z2llI1y#Y#g~f_}t01-Zrw8Q`Z3`%D9a{*JpIT
zi_Z7K&_h`|yL+<-GBTeFcSSXj?XiJQ7lO`0RP=~?N*qQ(e+(nIJs>&;cnfibsCfOR
zkeq-EgyktMcAl(%Mxfj2G;F@GU;v=<_)$QD*b)<~P=^_)m|n0sezu~t2`kLxS=Pce
z>JMh}NEFo?Sw-awV-6hVKF%<$_WK9IL3H`Wc^g+q@S|_-AI?+wrC0dj#}vjnk$wxS
zbxf^SNsk(O1%@<sCvbg;(mJceMj!Ar!ExDKHwTA`O4Ax_AwPUPT$O*Ab$~^nx4`P>
zRvw3#UJv$@n58llI-iU|X<Ukvr%Axl`%2UsN?-PS7Ug_hs26M&sa35}X+*FEXdG!*
zh&-)CM5Yuk&ji!ne%LD%ZZba=As!*lccQ3@uRNT*xf>|;z&D6^g6)84Awr3{LdE2U
zZDMsdzD`&9?w)v8-C-N)9G9SsbY+W~Z98B%$69ZMKd2P@a~0RbKqeNk@$~Sn{5S^5
zTX8KROV8~Cx$`B@utWV7#n%{g-8}}E`r%gYi&+?Y{^vwHAdCMO$l!haf0zJ1Ra_;p
zAjNd0RYA?qf+PU|Z<fk&9*MWi1n1Abm^dEI)|VR6-J`#%fcUEduxhECwWe?;#8x&p
zEIDPXSz*Cr&94dn>8ojE|3^4SXsWsHE)(%bNZ_hjxt=w3hDcg1j`1n~5k92*2@ZTZ
z2WfT=$$pAdF@zw7$4HGgNrnNc`E?9Y%5a>HOW=U9O;~cFlvlyavU4fZ+nk^@`)cno
zwde3`EnKEQz1fnC{Q<S8_dNbuERr8d=K7LlRV2QSY;jo!1U?eY1j5<Roqr3gzJD`q
zW`|-Y?Pshj?}M{e;&gg&^hV1fK~R=9E_G6Az5SP@FWvuHzVa1k@BdtG5lH>TbB6^q
SP-gX;0UbHyXic#?e))GjonL|g

diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi
index 1cc727cdbf7a4d12616dc6516f6f32cc6a815177..5fd2b2a8213d5f86a4d6d87859ff9c8fd95a9ffa 100644
GIT binary patch
delta 65
zcmV-H0KWg6jsc~P0g!e9n2~pKE&yGYlb>Gzbc-Rv{rLr{c|+a(*d1?(8cC@sxRfa?
Xxca$(BOd_jlX%R~8k|G34gn5Ez)T#~

delta 56
zcmV-80LTBOjscvG0g!e9kCAtBC72*wonMfeH#A+1-N}Zi5t5pMOPR8QtDg%vq5+ux
ObJiYzJ6f|B0S-pLQW!4)

diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi
index 2e70b24a4aa2aacbb463e9099d48ccd5a58e86ae..37b8cf72cbca0a1ce1ecdbcc478e1901683a7bc1 100644
GIT binary patch
delta 50
zcmV-20L}llj{&=n0gz__myu|IAE3)}^79K&-46<jA?SW(1y?^8aO493ErEE<+>U`}
IvjPFMMl7EdKL7v#

delta 45
zcmV+|0Mh@vj{&xi0gz__l96bD8WSB8)G!z-?&eZfaP@NmM>PP2pma9OG`gO%2LZH3
Dn4=Np

diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi
index fcf8af5b94fd79e775ef385d4c8e4a0d930d90c5..b86fe675366c133f787600f0e045e158b8fa1dce 100644
GIT binary patch
delta 187
zcmV;s07U<b!2*)O0+1wsq<U0XbVOxyV{&P5bZKvH004NL)se9ZgD@0D=e)1D=vu_8
z&@NeuQXKRj#Jp-C=7|X{{re6bN}-)gmkS5ZaNwpmHRrZR-L-V(Em-l;sIr{Y&6+qv
zqbx|xY^OOsA;cjvG?LLtV3UwCb_>v`NL{vJ;Q)>OOOuto_0wlAuQ-r0?1nou@~k}W
pemWH?C$hfxk50lr_sh!u+es;!zDC`(^Z?SDc+Atv_Fu8e!Jpt-UrGP~

delta 180
zcmV;l089Up!2*lH0+1wsoqAMQbVOxyV{&P5bZKvH004NL)se9Z!Y~+w=loA`w5ycb
z7IeuXDUzXmhhTo&Kut;#6yM&#K?I$}<>25OzT-+9`lBA922EFv$psIIuBu7goXs;N
z+J?l;ZkqG6q--)nqBt!fu`Nhg7ZW5p66a_xoFK7%VPR$O{PdY8Yjz|oFXj%3x@z~E
ipGNmS?*FXA%KqCSCHhf84VoTgS##Di1YRYv(ZQd<TUF=)

diff --git a/icons/obj/doors/windoor.dmi b/icons/obj/doors/windoor.dmi
index 86893eb9c453ccdfbb67ceef5b7a50a6c494810e..117cd78e1348b40fe6a7696b27e5b02cbb07dcaa 100644
GIT binary patch
delta 397
zcmV;80doG%{sY?n1CS(tZhBN$bVOxyV{&P5bZKvH004NLt(4D>f-n%q&-5uKdL<hH
zch?ISgV}h{S0F5mZDXaR#WlYD9!&VNTd<~0PbA;`X6W}#m$2P^?T?Th_T&eZ=CXzq
z)^95k+<4V8NFj+yz>rhcK0b6?v<N9IM1JFSC8f#>t?}|L?yGozL4t}a4JoWia8ktu
zHKY)eph8jHA%!GNW(kp*5Dkj()LMy3AvLe5S^L?K6o*lFViE``oBuG`U~Sb^HduS>
zT48-Rlaihkg>e{75p+|ivl;O*M0BSwSI+(#2+#dhoU-QzD^8g|hZU#H&f-q#udkcQ
zic{v|vdA@-SB2JpW+x-F$Ll<WvfJuM^$Sw38~#9A?|CoxJb`5#qM4n?@~Y5j^Sxza
z8fEzsScYPt_4_Kk5Q{&0-!r%cV*qkUMk!=@zR9U_lXCVdHpYHa|1e_OPcR#ZjoFN6
r6SzIv9cIRgcf-|?CG3tFWQRTZ1@X<yVk={ZXaE2p07*o%l>xc^DPz9L

delta 397
zcmV;80doG@{sYeb1CS(tVtQ0qbVOxyV{&P5bZKvH004NLt(3cNgD@0^XZ#dL$%?7~
zX`6+mBB~gYS3nd_uoZ%lO^SH?4oF;5LmZ5lkp2tyr=Kl+9lygf1gDVvqL7Ri;KTlH
zN35Eq6$KwWmsk{8MyvKkR&j;k!zPbvR-~MZD3%g$KY6orH^fSRnULVao>&(V-%x@N
zF0oR~;|6^2Y;QKfQ71S96J9DUQId1XicGEj>_5r1o$hhR5xm4gtBaRd7<Q#tG-|)s
z`yJc0AF5>;i>uoBF*J5hZx_Y{6$#G?3YO952nEZiDMP_Bst2)Cnzk*$C|E{KIOdVW
z<StMfr#Hemp5#=2l-@F1_Y2Y$R@w$>Z?%`N(yIyF`L|n4?gEY0yBhWBD9tr%VjpPN
zSoRCxAN1=qFF`-B8?aAuo?L4_WmhR@k9|<~O>}Bqc&DBPeNbPwx_8O1wKLCL_PgTn
rWDCc00Kq9Fe{sI2Ee6{MIsgD507*naRCt{1y?<~N*O~XTtpTn5T>`mx

diff --git a/tgstation.dme b/tgstation.dme
index 5663065a768..2ea00d40eba 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -84,6 +84,7 @@
 #include "code\__DEFINES\DNA.dm"
 #include "code\__DEFINES\dna_infuser_defines.dm"
 #include "code\__DEFINES\do_afters.dm"
+#include "code\__DEFINES\door.dm"
 #include "code\__DEFINES\drone.dm"
 #include "code\__DEFINES\dye_keys.dm"
 #include "code\__DEFINES\dynamic.dm"