From cdeeefccac1d6a60152a55a6cc718142bf0a51e1 Mon Sep 17 00:00:00 2001
From: Waterpig <wtryoutube@seznam.cz>
Date: Sun, 2 Jun 2024 13:39:31 +0200
Subject: [PATCH] Upstream 2406a

---
 .../antagonists/disease/disease_abilities.dm  |   0
 ...reenshot_humanoids__datum_species_moth.png | Bin 1700 -> 1682 bytes
 .../code/modules/dynamic/midround_rulesets.dm |   3 ---
 .../surgery/organs/internal/lungs/_lungs.dm   |   5 -----
 .../code/disease_abilities.dm                 |  21 ------------------
 .../more_crushers/code/miningweapons.dm       |   5 -----
 tgstation.dme                                 |   1 -
 7 files changed, 35 deletions(-)
 delete mode 100644 code/modules/antagonists/disease/disease_abilities.dm
 delete mode 100644 modular_zubbers/modules/antagonists/sentient_disease/code/disease_abilities.dm

diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png
index 986a5b8cbe8c139019966627f03ee3f9bf6bde01..15de6eb624a4fa17d79b150076fa3c7f4e29367d 100644
GIT binary patch
delta 1387
zcmV-x1(f=v4U!FzBvTYnOjJd{z`$_`2W<fZb`cCAAt5IxCyRYulZ0aB&6(Q6k|H1>
z|Ns9iC?{u<oy@j~Q2+v20Rs^^VMhP~FK%aExVRNfb(B#iN0F3~K`J6mNs)AZ5~ZoO
zo{n&DOC-z9(eCc<ba8@__#qiHTA!egYl@1VKR7BcDjzN>A0HbO2so9ClRg1~f4fOU
zK~z|Ut(Fa2+DH_ICkX<<Z3Z&I5Df~gp<PgPHMrffRQagLRH?Mu&;S2F_DqNx$V~QW
zpN=F9oVjoAB<eYY{H~$tx*kt4(|%ef#L#jZ(PSg18NZ-MN-m$z=i+rguVY1_SS%K@
zbkj65bW$jpMYB{;>n3zlt#6k8e<+za@(MjK>Ot640iIbUv{<s#0E!1d&1b6ma>24p
z%PN!=3n<kM!_X;J5Om!D!73P<F4r|t4}wA`)Bqu0z?rIaTtn2$by5)o@k1+8-KK^n
z8Zf9W)tOTjo5U8Y4wKby(TI=RxFsVn*Qq)VrPRT@n<g;327;z*2HmRJf08ROhgDt2
z@f^pkGD!=z0RaA@3=IGy-2!u6RzVlciQZE!Fk2S{+(J>Wr(5t)=ZQkRJP^F~2E+rX
z*#<T28g8VXYQbaPw&%I7cwxpQ0Nnl^>f;bMG6ksb?rpQU1Gc@lTTcPXdf9F?{bs|)
zEDd;Gf3b&Ku+MN4+1`u#fAe)fxm>0@O#qrZ6!UdJ(0cjmPdtSEeFud0tCy|zs@|dW
z;IMmecyxHsJv^Ya6RZJ_TdluD2Y8Gprzfpe8|O#$<TMC6oiONyfg6OqAnbI4Re;|(
zJ3c<f{{O~t^7^0GuW=**exnftK?6H*v4?2h@YeumXK&)i*zW(^e;?p@+C&=wR5W8i
zbNMk@|MvXiLICjmT?W8lFh~NRpPx5G835wkz~{FK!Y~|-#}{uV9-cq*(j7qWcF+Cu
zcRpjxe}`GOI|_#hJp|!$JiVIE$ZRSAeE}FI^)B!BMm}_Z)Wdv)?;Z(UTw#3qelne4
z!DM=Ua(#_s$dh`PfA@N$9w!{<9*;WUk1dd!oB8<i!)y`(CbJKh<N3`ES<$<EGzv#U
zGQ@eryQ{hwx3`PM$BzplPK(=HvOeZ>{%QE>j@;qQ=kt_K$n@%Jy0|Cz3o()Ee8{2W
zEY-<mI*qr0$uH=?VTc5vDgI+W4XP>P0a+%1T$o)S=G5_kf5ZtOt3Ep(z`r+41cVH|
zSTr{>^gPPVlBw(=4-qTWJ?72LVn#k7d5D<+SifmycVHo5D4!HHs8&Qk_^ev+8Tp~8
zQH6Vp0084Lt*o19nFtB$e4q(J*6$M4M7<_&;R}U8MFPm!qXBQlh3FSaJ=~KT9PY2`
zQ0x&Yi({E?f2RmXRRN%!Ra~m>fVvgNsQ^@u)&aJmZE?!oiX+V@(SYw&TrAqs3_A_b
zwc1Y9K^7qDV5g?(DL~}^HsuvB9WI^#@cs&?wk#k-{tx?iCFvvyU@j7ZEFeVw5Br}8
zZ&Cw1cY=f<3kZ?_!}Y$3HowX1zlrUAg*i$B!qWc_e-3xQGi0P6Z7JXf+_(LG7t7KC
zVd?*2P{$_O=}I_A3=iM8>sXcw2oL@*%+qD7;a~+IqJu992oL`6yV&KLH77@8+`c3r
zJotYESPKVhfWg3j2nY!w_J1D{gL(hgLEn!9!qfM|*#CXuTGM4XPy+gWKMn{_34_P}
z-{Xh~S<@&SNb3m^(IHwWI#|sIk^c{2pZAK|XxzhFhw^|B`Tv~=2N{HWks<C>0Rd5F
t84hNu`q?r=B(u%>ipc!cfH)&0$A8bZ*K_hxjuZd@002ovPDHLkV1g$_jS>I=

delta 1406
zcmV-^1%djK4Wtc_Bv27hOjJd{z`$_`2W<fZN0F3v5ey+AAtxs%Ubwg~Zf7D*Ng^O2
z+QX9N&6zAHCufqK%(jS&eO*xi0$BkAlZ0XsIblZt0ToSklu;&;K`N1Veg>Y7aBoW_
zlLrAICCkmx?(Xh0TA!t<wsdiVppR>cik?3>DlaM@E-4=$8x)*=cfFHA0fB$eNkl<Z
zScR=u3tQSq6rDUE6L5<I1ks?-8rlU#SHX45QVrCpQfaknpa1`d?70Klkj${(?$?V6
zL(bfjJCEcX8T(aX*|yCb3Wk>TpK-=qE0^~u@;S@Z<Bq}|J&wrda=>%ByrD?GAmFA^
z_<2r|_l*R^;H)6<3&pi!!C!wtpu$X0_^nXHVIuJ74BUjXXQe{1SS*y*4fwh*umHk;
zX38&DN~L0{R4E%e2w}UfYYSmuux%F%rHX6WdfcLXFc@$qTrjLxa26&U_n>?|&Z@*f
zA5qoffp9G<z!iZO=U$Bli6PcJ-9iN$Lh)l7H*^fxW;M?fLU{PrEH!@*>R_;J%M}~-
zKywG~@ftRokF8eYni2vR1bCuc3j}Vq1nd!BMHSpr-<cA4U=stTkn-(p2|n^@r_rAe
zhV*U=XaVYhE8L)tiL^5%_}t(0eaE3cv@+W@pd}PrBE&%xnIULw?`-l#1$=X7yOAL%
z+vT9y3R}$ptt`Rw#*2R)Ou;Uv=Y8iz<9V8(TrP{P76@8f0_`+G)PDKucPzs0E<N#`
zS1;S0WxOlI-hOXy|6qTwx4$PuH%bv4w%dPD1z5(T<D+)FgYy%5bR0$9Za*6IBPZ$)
zqJFm<Efa*zlf%P9jQ>v@N2h<Cp5jOlgw19YMNN#r!5CD#8K!>-PEKAgma#MZdpN@J
za}XU6AfvS)Xw82n^WU7EpA!Mr-{Bw_jYdfV;Adw|N&^9%oA~`E!4UVylgasO>;R5W
zwgTY2-dT9|HpDwOe2Z4EH}1y?ybp$piQ{1d`f3P6B8ZcCPxc1m5O_EqpgqR5Ck9D(
zm|VQ$^uEMITpoX2UgC&l67R{uU_6ja;yjS50{K(|ySkcAF5Y7fh=BX=FDBEgE4GC9
z<apd4$1KKqEPKm1#r5@U_Tj^f(P?&l&C)TQ%8&8K8+L=UoK7=1W4E6^-OldV-HaMq
zT*eYO&RU$^-`?KeKd^^;YWxrU7X&!~OTYt|y8siG!5)9GxkJeH@iZFqJ+GfL*oS${
z9l|Pt750JAdo7RGDmThEAkWF0)md#Kcm$I=vvo2L+)RLMe+~Y?OaO2VolGTiQG8Y`
zt*)R14<k$j!WGsU48ms<!Dsk~HA@)On+yPir&y|(@)@g?iZBUge_#=VW#XqU7Uf&|
z621rkf*gN<kwE~o1a2h0X!4<+!j({eQ-w4}xGafoc93B>s1bpXyy^&Z1;VLvDTttU
zkR}LRYeNd@R6VUfQ32hnI_R`vxj~k|w(47|f>i{nf~~q`X9$%32SQf;6;>9i<5#5!
zbOu4`Kjh!hxRWFSci<3o20`gR<X>r%nE)Uhg3f;+DE)`(eWfzL>GQwQ@V-JEH3ng>
z|9kt}-$`A5bhHFNAUd7z+vt`x2y^}KM-2>;A1|4MMEJPgX`oxiAUx_niKoMt&A}1@
zS%*+#5FYhEr2i*U(wqz>+@Z!GJnFw9NST8a!Dtjd8iWL}(EkuGJnsKn1;cP*5Pn{d
z7y51=s+}@72S$S7FkBdf`02V_=>I@s3LRw*wE2vYbx<9tf@Oc8^gqT3?hLsq?l8z$
zZxEFJ-;g<2!Ei?&;>KhUU}fg!;K7vtF!vBiZ<Fq!#NSM?@CeEH2Yrme(aq32WB>pF
M07*qoM6N<$f{_B0jQ{`u

diff --git a/modular_zubbers/code/modules/dynamic/midround_rulesets.dm b/modular_zubbers/code/modules/dynamic/midround_rulesets.dm
index d4154ff5a0f..d529e8ef043 100644
--- a/modular_zubbers/code/modules/dynamic/midround_rulesets.dm
+++ b/modular_zubbers/code/modules/dynamic/midround_rulesets.dm
@@ -27,9 +27,6 @@
 /datum/dynamic_ruleset/midround/from_ghosts/revenant
 	repeatable = FALSE
 
-/datum/dynamic_ruleset/midround/from_ghosts/sentient_disease
-	repeatable = FALSE
-
 /datum/dynamic_ruleset/midround/pirates
 	repeatable = FALSE
 
diff --git a/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm b/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm
index 63f126ee3b4..041004272c2 100644
--- a/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm
+++ b/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm
@@ -20,11 +20,6 @@
 				if(32 to INFINITY)
 					to_chat(breather, span_warning("The smell of rotting carcasses is unbearable!"))
 					breather.add_mood_event("miasma", /datum/mood_event/miasma/heavy)
-					if(prob(miasma_pp))
-						var/datum/disease/advance/floorfood/miasma/miasma_disease = new
-						if(breather.CanContractDisease(miasma_disease))
-							breather.AirborneContractDisease(miasma_disease, TRUE)
-						breather.vomit(VOMIT_CATEGORY_DEFAULT)
 	else
 		breather.clear_mood_event("miasma")
 
diff --git a/modular_zubbers/modules/antagonists/sentient_disease/code/disease_abilities.dm b/modular_zubbers/modules/antagonists/sentient_disease/code/disease_abilities.dm
deleted file mode 100644
index 7afe7d84367..00000000000
--- a/modular_zubbers/modules/antagonists/sentient_disease/code/disease_abilities.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-// NEW SYMPTOM
-/datum/disease_ability/symptom/mild/hidden
-	name = "Adaption" //Symptom to increase Sentient Virus base Stealth+Resistance
-	symptoms = list(/datum/symptom/hidden)
-	cost = 0 //Cost is 0 because the virus will already have this by default.
-	required_total_points = 0 //Available at start if refunded.
-	start_with = TRUE //Starts the virus with the symptom. For balancing reasons.
-	short_desc = "Hightens your stealth and resistance."
-	long_desc = "An adaptation that allows for greater stealth and resistance."
-
-// Overrides
-/datum/disease_ability/action/infect
-	cost = 0
-	required_total_points = 0
-	start_with = TRUE
-
-/datum/disease_ability/symptom/medium
-	required_total_points = 6
-
-/datum/disease_ability/symptom/powerful
-	required_total_points = 10
diff --git a/modular_zubbers/modules/more_crushers/code/miningweapons.dm b/modular_zubbers/modules/more_crushers/code/miningweapons.dm
index 55ec2588078..5b71b460409 100644
--- a/modular_zubbers/modules/more_crushers/code/miningweapons.dm
+++ b/modular_zubbers/modules/more_crushers/code/miningweapons.dm
@@ -31,7 +31,6 @@
 	light_system = OVERLAY_LIGHT_DIRECTIONAL
 	light_range = 5
 	light_on = FALSE
-	charged = TRUE
 	charge_time = 10
 	detonation_damage = 35
 	backstab_bonus = 20
@@ -72,7 +71,6 @@
 	light_system = OVERLAY_LIGHT_DIRECTIONAL
 	light_range = 8
 	light_on = FALSE
-	charged = TRUE
 	charge_time = 15
 	detonation_damage = 35
 	backstab_bonus = 20
@@ -118,7 +116,6 @@
 	light_system = OVERLAY_LIGHT_DIRECTIONAL
 	light_range = 5
 	light_on = FALSE
-	charged = TRUE
 	charge_time = 20
 	detonation_damage = 70
 	backstab_bonus = 0
@@ -126,7 +123,6 @@
 
 /obj/item/kinetic_crusher/hammer/Initialize(mapload)
 	. = ..()
-	AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20)
 
 /obj/item/kinetic_crusher/hammer/attack(mob/living/target, mob/living/user)
 	var/relative_direction = get_cardinal_dir(src, target)
@@ -169,7 +165,6 @@
 	light_system = OVERLAY_LIGHT_DIRECTIONAL
 	light_range = 4
 	light_on = FALSE
-	charged = TRUE
 	charge_time = 2
 	detonation_damage = 40
 	backstab_bonus = 120
diff --git a/tgstation.dme b/tgstation.dme
index 61f71a34129..8c4cb515e83 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8811,7 +8811,6 @@
 #include "modular_zubbers\master_files\skyrat\modules\opposing_force\code\opposing_force_subsystem.dm"
 #include "modular_zubbers\master_files\skyrat\modules\verbs\code\subtle.dm"
 #include "modular_zubbers\modules\antagonists\nightmare\nightmare_species.dm"
-#include "modular_zubbers\modules\antagonists\sentient_disease\code\disease_abilities.dm"
 #include "modular_zubbers\modules\arcades\assets\arcade.dm"
 #include "modular_zubbers\modules\arcades\code\loot\arcade_weights_classic.dm"
 #include "modular_zubbers\modules\arcades\code\loot\arcade_weights_mechanical.dm"