From 17dc19ef6d5544dba82014f917d18b8ee0a9eced Mon Sep 17 00:00:00 2001
From: StrangeWeirdKitten
 <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Tue, 3 Dec 2024 10:46:36 -0700
Subject: [PATCH] fixes loadout runtime

Update human.dm

Update self_ignition.dm

fixes screenshot tests
---
 code/datums/components/self_ignition.dm       |   2 +-
 code/modules/mob/living/carbon/human/human.dm |  20 +++++++++++++++++
 .../screenshots/screenshot_digi_leg_test.png  | Bin 1692 -> 1577 bytes
 html/changelogs/AutoChangeLog-pr-2265.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2589.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2590.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2591.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2592.yml     |   7 ------
 html/changelogs/AutoChangeLog-pr-2598.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2601.yml     |   4 ----
 html/changelogs/AutoChangeLog-pr-2603.yml     |   4 ----
 html/changelogs/archive/2024-12.yml           |  21 ++++++++++++++++++
 .../modules/loadout/categories/glasses.dm     |   5 -----
 tgstation.dme                                 |   1 +
 14 files changed, 43 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2265.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2589.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2590.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2591.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2592.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2598.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2601.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2603.yml
 create mode 100644 html/changelogs/archive/2024-12.yml

diff --git a/code/datums/components/self_ignition.dm b/code/datums/components/self_ignition.dm
index db03b62d172..a1635bcf715 100644
--- a/code/datums/components/self_ignition.dm
+++ b/code/datums/components/self_ignition.dm
@@ -33,7 +33,7 @@
 	if (HAS_TRAIT(owner, TRAIT_STASIS))
 		return
 
-	if (owner.is_atmos_sealed(additional_flags = PLASMAMAN_PREVENT_IGNITION, check_hands = TRUE, ignore_chest_pressureprot = TRUE))
+	if (owner.is_atmos_sealed(additional_flags = PLASMAMAN_PREVENT_IGNITION, check_hands = TRUE, alt_flags = TRUE))
 		if (!owner.on_fire)
 			REMOVE_TRAIT(owner, TRAIT_IGNORE_FIRE_PROTECTION, REF(parent))
 		return
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index eafb85912b0..b11dd119e7f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1125,6 +1125,26 @@
 
 	add_traits(list(TRAIT_NO_DNA_SCRAMBLE, TRAIT_BADDNA, TRAIT_BORN_MONKEY), SPECIES_TRAIT)
 
+/mob/living/carbon/human/proc/is_atmos_sealed(additional_flags = null, check_hands = FALSE, alt_flags = FALSE)
+	var/chest_covered = FALSE
+	var/head_covered = FALSE
+	var/hands_covered = FALSE
+	for (var/obj/item/clothing/equipped in get_equipped_items())
+		// We don't really have space-proof gloves, so even if we're checking them we ignore the flags
+		if ((equipped.body_parts_covered & HANDS) && num_hands >= default_num_hands)
+			hands_covered = TRUE
+		if (!alt_flags && !isnull(additional_flags) && !(equipped.clothing_flags & additional_flags))
+			continue
+		if ((equipped.clothing_flags & (STOPSPRESSUREDAMAGE | (alt_flags ? additional_flags : NONE))) && (equipped.body_parts_covered & CHEST))
+			chest_covered = TRUE
+		if ((equipped.clothing_flags & (STOPSPRESSUREDAMAGE | (alt_flags ? additional_flags : NONE))) && (equipped.body_parts_covered & HEAD))
+			head_covered = TRUE
+	if (!chest_covered)
+		return FALSE
+	if (!hands_covered && check_hands)
+		return FALSE
+	return head_covered || HAS_TRAIT(src, TRAIT_NOFIRE_SPREAD)
+
 /mob/living/carbon/human/species/abductor
 	race = /datum/species/abductor
 
diff --git a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png
index 1ca452de089462485c7e4d6204dd14452995206d..a8e3dfe648afb2c5db7704c3f67ad3abd30fa9c1 100644
GIT binary patch
delta 1325
zcmZvcdo+}J7{}jXcFnZz!Y(zV+)B!bG74kR4rN`cO&5|}YDRX;T86=EX4lBkF(!@;
zozYo}A~Qv{hMEyl>yi<TlGJpW%rrBUOLX4%w_Wyh&YrW+U(e_JdA|QXr;W}VmN=}w
z9uc~8i&QFwN+3uMK|<)mlu25ln^0k4p-3d!K&BR#l=k)Y@ppNzh03Aj1P2EPm$hp>
zph&2<U#8V+q4m(&^Q{jBC&3fhQ{lM<*)5f%rJI}0zd$lbJH~m)JhX!UxCq7yLV~C}
z53@CU)LB(zQ%k39MI<|YtLrI@I{LE%w(V`6XUAJ~VE6LXS8v!&*2c}pK6kU4mi5I=
z*%6bzWf3G^K6l^4({~aSd)*21lZmnJgzD(QUa^A5C%@$s+OShPiuhL#PB{rIVQ+J}
zp<s>C{^BmYarT5s<F<eS7_ancdCI?KZ`+jWiqlIzmw%5G#&J0JfJ^(GwlVs>4ul%w
zt8cl7Gna*D9+cLkxg;@;(`_n{_c_=bg=`-SYA8zINJ?l<t4!u(R}QSVz$8uvVqL7c
zSodo45b8jk55XMg?%WfATUq%{+?0+b5ZVtKC=H)WaFa6@OW>8RT*FMi>VjYRb=S^h
z3Y1*vlv0h$<{1SBGtHfR*_&)kYuA^pbml}4Mlx2svL~4?4e7`=dj-M@${b7I?%Y~2
z;JD_jXY8MTdYz8jnKFx|U$?v3SJctV6X}(`^{xfj=S(8T%m}Y12`0Od!<Xm_BD01@
zDhdner@k)>fN5riUat9)Eaau8jWW@mn<#b5FG<|9y?m%`sp8G)yg7WTVh6S*iq!cN
zm3SU^(2|X>Ygjk`n~{WrI?$cp<c#Gu+=$Pq`R?b0Eqsb$Gb_ifq15CEiyw9-pzfrZ
zH7B(!czb6`t1~nF9?P2Av1BvVAyvG|yMLFSj#Pnzul}9enexaYAt1&!q&eUJg~^U<
z366tiqqx+q5tf+#Bt3-HwM-IH<mec|ceS>Pp2L>wPPyl3U5srzEEo2>3LCMP@BUZ?
zyA5JnCqh#Zf03uh@l{oLr=*G(+vfbRL{Ch=6Iab63ax`g5e8P^kD#OU_$fb``mi6-
zOAgDuycoL-ob)ynzf?|lv1bs*6`Mrf45FHwyWdTkTkv1VaJOUCgNE5|O}BV2MMh8q
z#t)drHT!V4Kdd9%FgX4#ui8X}PBh8Yno`XrRM~#P#aY|hvq%Zs2xW}gBNRf08eAd|
z1Ax&EgZN|hphpn_c-_2N7#?4R#8xXTHKvj&OC$;i5I!obiV56%-8+W5FX&e(y_ej{
zN2tI8jq<>ws4}fPeaA&(<`wUrkEuMRZ7lO~Q%bn?k-uo~(l<-_zGG@2zBqQb|4^3K
zx}#4<_p3ox)I<(l@<`?r{iKT+C!EO~Pm9%6wh6}<HoS&s+m^$pebp-Q!u{N2mDppQ
z=o#-)lrgFir_0kltMHBF7TqkIAxT~(*A_5uj*~A>sDW-iMm`P`6<--;H7jltCc%q0
zD#o4Rv7zJktXeSA^N_8d@gNWpP7_}jSY(V+c(h_A+HqT{pI3u+zCs}t<%G`U1ndVb
z!bCq}-XdiPhybJl!Jr1!zX0qJ-l9o8%A296DAJFz9_0Ni8$V0Y7pWqiLG>Fy^e~@p
zKVj2nBt-)nqCX7h&BDVJf5c$-|Df+MEd8(cpM`5dB*2USK1%ykTAUby-{GxkH^nls
RbL+=X7_ucSs43t8=O1|Mq2~Yq

delta 1441
zcmV;S1z!5844e&+Br>s3OjJd{z`y`S004^s04e|g(EtGa003zK0001#zqW~qiLkJ+
zH8??zkdw^J%m8Enkxe-pVrFyz2><{D0NS3C`O(Jz;L+;8wBfI&ynAtxvoHjN27Pyt
z>WhB`9Z5t%RA_<iSq+z(I1~+;glWg9KorEb+Z|d^1b5d?X?Obnf7rg@I69JWor8P!
zoH-kh1ij>4$Ol~BW$aBA?__&@oO5>L2_d{2vwMA<N$LAHQpy|Om-1i0IgxWI=+o|9
z9cPmJgx}Jq-Lv8EhTwFB@P#zR)K>icAe?`3-{*9Z^rameem4wni*JexWOoB`COpYG
zm!5FoBc%veYUIMlEk1VPLV6SG!igvC45R5N2xS;h?ZU@|k6pNs6X8w7#1j)ML#U=f
zph6V{Qx#h9aWvI4Q}i?%TjNWbrW0bJ+QLAQi6Ef(R9hJ4vuGN(1o1SQ&20o8O)r01
zBQ(uyofHOYN+bydpQ@lsp!I?RYpscBp|vGG#hsXmOr2zyy77|{oqk9cF-p1&alBZJ
z7CMe%P4yy<y9AsO1C0U2XS_?G!cq7{VD>r$Q94R>Oa!r}y~sk~Gg>I-3OMa`2$C>i
z&jjtSmnBV?EL}utnnsJ1Ez{IO!0CSi%ru>Nyh~v4<cT1$;LGJWjiYEjpGQ%gj+e_W
zfuMWHewzBCI|c?%LZuR=!o-5lX?jxc%=EtMP9tt^wzBOaX>PdZcN6p1hmW6r`~3T-
zj~^`fz1Hb+xujW2+f?iOa{_t_2{XphjIyvik~q(lQd!b&EjaahdMK<r1p9wpkizpl
zVOwUVWYqnJAP6!m&eC{atkGKnbMj`S?F42KCs|^avps;;G`?|US!D+TnxWjxRX0J#
zvmS!6rrx2glYsl})56(BDkGfw$k9c5-V)4R1T;G-JY9jXKQqi2B!1E}2AaA*rIqZu
z019rFv*Vd0WJY7mXp|lC%^-iL`;Dd0lgvC&4S}@FDk+kzCCJWi6VC+c(_HOBq?M?D
z+yn<aA%etu0?dr@e5RS6&Cf^K^g9**i}=zKQ2i?WB>p`S+@CS{hr+({ucr5Xs$YR0
z3EFa~-fBVme^`5{?@h_`+yxDOKWO6@tHQ-F^!=cXzb=YmZD+XT{Q!UHd-g6bZdbQO
zURW>Sg7*WU@7epZSglq?X}<*get`7-9ov)zeKywkm%JZf{lB3xaKyi$J=Xt9m1WtB
z_qWITKM2<V?`e<p|8Trt{}08X{=Wj=tN(}MQ2!6bq5dC=pX&drHu}GMiPH+spYfc2
zRj+G*qW`OUThp)l<q?1Ry4)P`a-E;ysQpp@6aGgn#Gik?JYrLp`4KP6a~!ol>i=rD
z+ip4E?shK^*yPNdVbJ3Frh}vQ?4bXvUA6mGf1_>Z05gcnjl=eP{a<aXhwr=Z4^(#u
zXo4he9Jb%<|Eg|&Jk$?An)5!~FDB;3Vf(%QZ>p;Px%*jHRbzi8aO1H3UjH|LH_dLl
zYpAvpIC0eep#Pi4ZB29Su@m3i4tj9V{zU)(dTg5J@mD84Dfd>sTXE3-BK@D!137=%
zo|XRg7wZ3fwOX&&jJ~T?{)+Y&>;JqgH=7NkZ+WVWE^hxe%K!esf9@X)@&}OrFx($N
z{=;B@0QnE>3jTipd_MsBf29AR{{Zs;NdF`M0p<UZ{zv`;%Ksz%kNgLi|3~^C`41@n
zkMuwCA7K6;>3`%u!2Cbb|HyxU`G4deApZg8|B-)y{0Er-NB#lwA8`I3`3J~<XgT`x
z|HwZ;{sYYaBmV&T4>13a`~&1a!2Cb*50L)=^Z&>{K>j@g$p1tC0QnEBH~$a)1LQxL
v;>`c!_Xp%ZJjb`?|F7jQxbpu){e^!3>zCF<5<=dA00000NkvXXu0mjfPpS3L

diff --git a/html/changelogs/AutoChangeLog-pr-2265.yml b/html/changelogs/AutoChangeLog-pr-2265.yml
deleted file mode 100644
index 4b1ff8b6f69..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2265.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
-  - rscadd: "The Persistence land crawler has been deployed to local mineral rich areas."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2589.yml b/html/changelogs/AutoChangeLog-pr-2589.yml
deleted file mode 100644
index db1c74c546e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2589.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jinshee"
-delete-after: True
-changes:
-  - rscadd: "Added new snout \"Mandibles (Top)\""
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2590.yml b/html/changelogs/AutoChangeLog-pr-2590.yml
deleted file mode 100644
index df0df208b72..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2590.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BurgerBB"
-delete-after: True
-changes:
-  - bugfix: "Moves Lizard Full Stub horns to beard because of overlay issues."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2591.yml b/html/changelogs/AutoChangeLog-pr-2591.yml
deleted file mode 100644
index ed923651ed6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2591.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
-  - balance: "Can't kinetic crusher mark space dragons anymore"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2592.yml b/html/changelogs/AutoChangeLog-pr-2592.yml
deleted file mode 100644
index 94a7ea8bc45..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2592.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "sippykot"
-delete-after: True
-changes:
-  - balance: "ration tickets capacity doubled"
-  - rscadd: "added blood bag and glucose as options to the regular ration ticket"
-  - rscadd: "added blood tea and soda + lemonade as drink option for luxury ration ticket"
-  - rscadd: "added chewing gum as option for the luxury ration ticket"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2598.yml b/html/changelogs/AutoChangeLog-pr-2598.yml
deleted file mode 100644
index e24799c9bfd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2598.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
-  - balance: "Minor reduction to the strength of scrubber overflows"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2601.yml b/html/changelogs/AutoChangeLog-pr-2601.yml
deleted file mode 100644
index 27d700ee22e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2601.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TealSeer"
-delete-after: True
-changes:
-  - bugfix: "Fixed a few disposal pipes on boxstation."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2603.yml b/html/changelogs/AutoChangeLog-pr-2603.yml
deleted file mode 100644
index 6f93afb8e1f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2603.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Odairu"
-delete-after: True
-changes:
-  - bugfix: "map vote respects current pop"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
new file mode 100644
index 00000000000..50297d1d0d7
--- /dev/null
+++ b/html/changelogs/archive/2024-12.yml
@@ -0,0 +1,21 @@
+2024-12-01:
+  Arturlang:
+  - balance: Can't kinetic crusher mark space dragons anymore
+  BurgerBB:
+  - bugfix: Moves Lizard Full Stub horns to beard because of overlay issues.
+  Jinshee:
+  - rscadd: Added new snout "Mandibles (Top)"
+  LT3:
+  - balance: Minor reduction to the strength of scrubber overflows
+  Odairu:
+  - bugfix: map vote respects current pop
+  TealSeer:
+  - bugfix: Fixed a few disposal pipes on boxstation.
+  shellspeed1:
+  - rscadd: The Persistence land crawler has been deployed to local mineral rich areas.
+  sippykot:
+  - balance: ration tickets capacity doubled
+  - rscadd: added blood bag and glucose as options to the regular ration ticket
+  - rscadd: added blood tea and soda + lemonade as drink option for luxury ration
+      ticket
+  - rscadd: added chewing gum as option for the luxury ration ticket
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm
index 67d15ed6e2c..0d2112c484b 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm
@@ -71,11 +71,6 @@
 	name = "White Eyepatch"
 	item_path = /obj/item/clothing/glasses/eyepatch/white
 
-/datum/loadout_item/glasses/medical_eyepatch
-	name = "Medical Eyepatch"
-	item_path = /obj/item/clothing/glasses/eyepatch/medical
-
-
 /datum/loadout_item/glasses/fakeblindfold
 	name = "Fake Blindfold"
 	item_path = /obj/item/clothing/glasses/trickblindfold
diff --git a/tgstation.dme b/tgstation.dme
index fa3a7cbb224..f4ea22415ea 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1335,6 +1335,7 @@
 #include "code\datums\components\security_vision.dm"
 #include "code\datums\components\seethrough.dm"
 #include "code\datums\components\seethrough_mob.dm"
+#include "code\datums\components\self_ignition.dm"
 #include "code\datums\components\shell.dm"
 #include "code\datums\components\shielded.dm"
 #include "code\datums\components\shovel_hands.dm"