Upstream 2406a

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
 

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

modular_zubbers/modules/antagonists/sentient_disease/code/disease_abilities.dm

@@ -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

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

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"