From 807a5c7d1e0a7ecb3930e49dc3721865791a0c60 Mon Sep 17 00:00:00 2001
From: Sonic121x <64410541+Sonic121x@users.noreply.github.com>
Date: Sat, 23 May 2020 20:48:39 +0800
Subject: [PATCH] Fix stuff that no one care about (#12340)

* Update bags.dm

* Fix instant crush

* tweak frame delay

tweak the 3 variant of shutters frame delay to 0.38 per frame,make it took roughly 10 tick to close completely.
---
 code/game/machinery/doors/door.dm       |   4 ++--
 code/game/objects/items/storage/bags.dm |   2 +-
 icons/obj/doors/shutters.dmi            | Bin 1660 -> 1660 bytes
 icons/obj/doors/shutters_radiation.dmi  | Bin 1477 -> 1477 bytes
 icons/obj/doors/shutters_window.dmi     | Bin 4957 -> 4957 bytes
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index c4c712ca25..98a888fa66 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -290,8 +290,6 @@
 	operating = TRUE
 	do_animate("closing")
 	layer = closingLayer
-	if(!safe)
-		crush()
 	sleep(5)
 	density = TRUE
 	sleep(5)
@@ -303,6 +301,8 @@
 	update_freelook_sight()
 	if(safe)
 		CheckForMobs()
+	else
+		crush()
 	return 1
 
 /obj/machinery/door/proc/CheckForMobs()
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 52802fa3df..5b7eb65d9b 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -61,7 +61,7 @@
 	switch(contents.len)
 		if(0)
 			icon_state = "[initial(icon_state)]"
-		if(0 to 11)
+		if(1 to 11)
 			icon_state = "[initial(icon_state)]1"
 		if(11 to 20)
 			icon_state = "[initial(icon_state)]2"
diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi
index 6f10860cfaff5b70830abe603b8df46c0b40dde1..816d1f94f9516f62a77b82522c8d52f22b30cbc7 100644
GIT binary patch
delta 26
icmeyv^M_}`TPEF-iSNZYe$*GA%Kfl<=4M{Td{zLk=L}f@

delta 26
icmeyv^M_}`TPB~<iSNZY619tdoi%Id+RV$C&k6vgi3=$J

diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi
index 36d232b197bc08aeef6656a6756f8d71da787e91..657b613b0ccdef3dfe1bf0c010cf1c6650fdf4fa 100644
GIT binary patch
delta 39
xcmV+?0NDS<3&jhN;2dnBGoXYCY6uJ&S1T*H`niB38UUEKbIPYxl=ZRv$pk@C5s&}?

delta 39
xcmV+?0NDS<3&jhN;2dPCGoXYCY6uJ&S1T*H`niB38UPS#a{7?CfjzPO$pklE5N!Ye

diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi
index 20197593c141d2881f46a68798ba5ba5e3baba1d..c99790c6cfebd67a3877f90fc377f2ac1cdd2529 100644
GIT binary patch
delta 48
zcmV-00MGy3Cfz2Gq$MqM29z*C_1w^Nb$&r=9<B&cR&e!mQE>6~<N^R#GIPq<o8aZK
G$&?Z#&KJD^

delta 48
zcmV-00MGy3Cfz2Gq$Nys29z*C_1w^Nb$&r=9<B&cR&e!mQE>6~<N^S($8!3CAjr3|
G$&?Z<n-}5$