Remove appendixes, infections and radiation. Breathe less often

ColonialMarinesALPHA.dme

@@ -173,7 +173,6 @@
 #include "code\datums\recipe.dm"
 #include "code\datums\skills.dm"
 #include "code\datums\diseases\addiction.dm"
-#include "code\datums\diseases\appendicitis.dm"
 #include "code\datums\diseases\beesease.dm"
 #include "code\datums\diseases\black_goo.dm"
 #include "code\datums\diseases\brainrot.dm"
@@ -1008,10 +1007,8 @@
 #include "code\modules\events\event_dynamic.dm"
 #include "code\modules\events\event_manager.dm"
 #include "code\modules\events\money_hacker.dm"
-#include "code\modules\events\radiation_storm.dm"
 #include "code\modules\events\rogue_drones.dm"
 #include "code\modules\events\spider_infestation.dm"
-#include "code\modules\events\spontaneous_appendicitis.dm"
 #include "code\modules\events\holidays\Christmas.dm"
 #include "code\modules\events\holidays\Holidays.dm"
 #include "code\modules\events\holidays\Other.dm"
@@ -1130,7 +1127,6 @@
 #include "code\modules\mob\living\carbon\human\life\handle_environment.dm"
 #include "code\modules\mob\living\carbon\human\life\handle_fire.dm"
 #include "code\modules\mob\living\carbon\human\life\handle_grabbed.dm"
-#include "code\modules\mob\living\carbon\human\life\handle_mutations_and_radiation.dm"
 #include "code\modules\mob\living\carbon\human\life\handle_organs.dm"
 #include "code\modules\mob\living\carbon\human\life\handle_pulse.dm"
 #include "code\modules\mob\living\carbon\human\life\handle_random_events.dm"

code/#define/chemistry.dm

@@ -47,11 +47,9 @@
 #define PROPERTY_TOXIC 				"toxic"
 #define PROPERTY_CORROSIVE 			"corrosive"
 #define PROPERTY_BIOCIDIC			"biocidic"
-#define PROPERTY_RADIOACTIVE		"radioactive"
 #define PROPERTY_HEMOLYTIC			"hemolytic"
 #define PROPERTY_HEMORRAGING		"hemorrhaging"
 #define PROPERTY_CARCINOGENIC		"carcinogenic"
-#define PROPERTY_NECROTIZING		"necrotizing"
 #define PROPERTY_HEPATOTOXIC		"hepatotoxic"
 #define PROPERTY_NEPHROTOXIC		"nephrotoxic"
 #define PROPERTY_PNEUMOTOXIC		"pneumotoxic"
@@ -85,7 +83,6 @@
 #define PROPERTY_NERVESTIMULATING 	"nerve-stimulating"
 #define PROPERTY_MUSCLESTIMULATING	"muscle-stimulating"
 #define PROPERTY_PAINKILLING		"painkilling"
-#define PROPERTY_ANTISEPTIC			"anti-septic"
 #define PROPERTY_HEPATOPEUTIC		"hepatopeutic"
 #define PROPERTY_NEPHROPEUTIC		"nephropeutic"
 #define PROPERTY_PNEUMOPEUTIC		"pneumopeutic"

code/#define/mobs.dm

@@ -5,20 +5,6 @@
 #define BORGTHERM 2
 #define BORGXRAY  4
 
-
-//=================================================
-/*
-	Germs and infections
-*/
-
-#define GERM_LEVEL_AMBIENT		110		//maximum germ level you can reach by standing still
-#define GERM_LEVEL_MOVE_CAP		200		//maximum germ level you can reach by running around
-
-#define INFECTION_LEVEL_ONE		100
-#define INFECTION_LEVEL_TWO		500
-#define INFECTION_LEVEL_THREE	800
-
-#define MIN_ANTIBIOTICS			0
 //=================================================
 
 #define HUMAN_STRIP_DELAY 40 //takes 40ds = 4s to strip someone.
@@ -28,7 +14,7 @@
 
 //Life variables
 #define HUMAN_MAX_OXYLOSS 1 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it.
-#define HUMAN_CRIT_MAX_OXYLOSS 1 //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 4 ticks.
+#define HUMAN_CRIT_MAX_OXYLOSS 1 //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 3 ticks.
 
 #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
 #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point

code/datums/datumvars.dm

@@ -921,7 +921,6 @@ client
 
 		EO.status = NOFLAGS
 		EO.perma_injury = 0
-		EO.germ_level = 0
 		EO.reset_limb_surgeries()
 		M.update_body(0)
 		M.updatehealth()

code/datums/disease.dm

@@ -115,10 +115,6 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 		else //no source and no mob affected. Rogue disease. Break
 			return
 
-	if(affected_mob && affected_mob.reagents)
-		if(affected_mob.reagents.has_reagent("spaceacillin"))
-			return // Don't spread if we have spaceacillin in our system.
-
 	var/check_range = airborne_range//defaults to airborne - range 2
 
 	if(how_spread != AIRBORNE && how_spread != SPECIAL)

code/datums/supply_packs/medical.dm

@@ -12,14 +12,12 @@ MEDICAL
 					/obj/item/reagent_container/glass/bottle/antitoxin,
 					/obj/item/reagent_container/glass/bottle/bicaridine,
 					/obj/item/reagent_container/glass/bottle/dexalin,
-					/obj/item/reagent_container/glass/bottle/spaceacillin,
 					/obj/item/reagent_container/glass/bottle/kelotane,
 					/obj/item/reagent_container/glass/bottle/tramadol,
 					/obj/item/storage/pill_bottle/inaprovaline,
 					/obj/item/storage/pill_bottle/antitox,
 					/obj/item/storage/pill_bottle/bicaridine,
 					/obj/item/storage/pill_bottle/dexalin,
-					/obj/item/storage/pill_bottle/spaceacillin,
 					/obj/item/storage/pill_bottle/kelotane,
 					/obj/item/storage/pill_bottle/tramadol,
 					/obj/item/storage/pill_bottle/quickclot,

code/game/atoms.dm

@@ -13,7 +13,6 @@ var/global/list/ghdel_profiling = list()
 	var/last_bumped = 0
 	var/flags_pass = 0
 	var/throwpass = 0
-	var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom.
 
 	//Effects
 	var/list/effects_list = list()

code/game/blood.dm

@@ -109,7 +109,6 @@
 	return 1
 
 /atom/proc/clean_blood()
-	germ_level = 0
 	if(istype(blood_DNA, /list))
 		qdel(blood_DNA)
 		blood_DNA = null
@@ -126,11 +125,9 @@
 	transfer_blood = 0
 
 /mob/living/carbon/human/clean_blood(clean_feet)
-	germ_level = 0
 	if(gloves)
 		if(gloves.clean_blood())
 			update_inv_gloves()
-		gloves.germ_level = 0
 	else
 		if(istype(blood_DNA, /list))
 			qdel(blood_DNA)

code/game/gamemodes/events.dm

@@ -1,19 +1,5 @@
 //this file left in for legacy support
 
-/proc/appendicitis()
-	for(var/mob/living/carbon/human/H in living_mob_list)
-		var/foundAlready = 0 // don't infect someone that already has the virus
-		for(var/datum/disease/D in H.viruses)
-			foundAlready = 1
-		if(H.stat == 2 || foundAlready)
-			continue
-
-		var/datum/disease/D = new /datum/disease/appendicitis
-		D.holder = H
-		D.affected_mob = H
-		H.viruses += D
-		break
-
 /proc/viral_outbreak(var/virus = null)
 //	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name]. All personnel must contain the outbreak.", "Biohazard Alert")
 //	world << sound('sound/AI/outbreak7.ogg')
@@ -60,29 +46,6 @@
 	spawn(rand(SECONDS_150, MINUTES_5)) //Delayed announcements to keep the crew on their toes.
 		marine_announcement("Confirmed outbreak of level 7 viral biohazard aboard [station_name]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak7.ogg')
 
-/proc/high_radiation_event()
-
-/* // Haha, this is way too laggy. I'll keep the prison break though.
-	for(var/obj/structure/machinery/light/L in machines)
-		if(L.z != 1) continue
-		L.flicker(50)
-
-	sleep(100)
-*/
-	for(var/mob/living/carbon/human/H in living_mob_list)
-		var/turf/T = get_turf(H)
-		if(!T)
-			continue
-		if(T.z != 1)
-			continue
-		if(istype(H,/mob/living/carbon/human))
-			H.apply_effect((rand(15,75)),IRRADIATE,0)
-			if (prob(5))
-				H.apply_effect((rand(90,150)),IRRADIATE,0)
-	sleep(100)
-	marine_announcement("High levels of radiation have been detected. Report to the Medical Bay if you begin to feel symptoms such as disorientation, nausea, or halucinations.", "Anomaly Alert", 'sound/AI/radiation.ogg')
-
-
 /proc/carp_migration() // -- Darem
 	for(var/obj/effect/landmark/C in landmarks_list)
 		if(C.name == "carpspawn")

code/game/machinery/adv_med.dm

@@ -272,7 +272,6 @@
 		"fireloss" = H.getFireLoss(),
 		"oxyloss" = H.getOxyLoss(),
 		"toxloss" = H.getToxLoss(),
-		"rads" = H.radiation,
 		"cloneloss" = H.getCloneLoss(),
 		"brainloss" = H.getBrainLoss(),
 		"knocked_out" = H.knocked_out,
@@ -312,7 +311,6 @@
 	dat += text("[]\t-Toxin Content %: []</font><br>", (occ["toxloss"] < 60 ? "<font color='blue'>" : "<font color='red'>"), occ["toxloss"])
 	dat += text("[]\t-Burn Severity %: []</font><br><br>", (occ["fireloss"] < 60 ? "<font color='blue'>" : "<font color='red'>"), occ["fireloss"])
 
-	dat += text("[]\tRadiation Level %: []</font><br>", (occ["rads"] < 10 ?"<font color='blue'>" : "<font color='red'>"), occ["rads"])
 	dat += text("[]\tGenetic Tissue Damage %: []</font><br>", (occ["cloneloss"] < 1 ?"<font color='blue'>" : "<font color='red'>"), occ["cloneloss"])
 	dat += text("[]\tApprox. Brain Damage %: []</font><br>", (occ["brainloss"] < 1 ?"<font color='blue'>" : "<font color='red'>"), occ["brainloss"])
 	dat += text("Knocked Out Summary %: [] ([] seconds left!)<br>", occ["knocked_out"], round(occ["knocked_out"] / 4))
@@ -341,8 +339,6 @@
 	for(var/datum/limb/e in occ["external_organs"])
 		var/AN = ""
 		var/open = ""
-		var/infected = ""
-		var/necrosis = ""
 		var/imp = ""
 		var/bled = ""
 		var/robot = ""
@@ -364,33 +360,11 @@
 			bled = "Bleeding:<br>"
 		if(e.status & LIMB_BROKEN)
 			AN = "[e.broken_description]:<br>"
-		if(e.status & LIMB_NECROTIZED)
-			necrosis = "Necrotizing:<br>"
 		if(e.status & LIMB_ROBOT)
 			robot = "Prosthetic:<br>"
 		if(e.surgery_open_stage)
 			open = "Open:<br>"
 
-		switch (e.germ_level)
-			if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
-				infected = "Mild Infection:<br>"
-			if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
-				infected = "Mild Infection+:<br>"
-			if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
-				infected = "Mild Infection++:<br>"
-			if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 100)
-				infected = "Acute Infection:<br>"
-			if (INFECTION_LEVEL_TWO + 100 to INFECTION_LEVEL_TWO + 200)
-				infected = "Acute Infection+:<br>"
-			if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
-				infected = "Acute Infection++:<br>"
-			if (INFECTION_LEVEL_THREE to INFECTION_LEVEL_THREE + 300)
-				infected = "Septic:<br>"
-			if (INFECTION_LEVEL_THREE to INFECTION_LEVEL_THREE + 600)
-				infected = "Septic+:<br>"
-			if (INFECTION_LEVEL_THREE to INFINITY)
-				infected = "Septic++:<br>"
-
 		var/unknown_body = 0
 		if (e.implants.len)
 			for(var/I in e.implants)
@@ -409,10 +383,10 @@
 			else
 				imp += "Unknown body present:<br>"
 
-		if(!AN && !open && !infected & !imp && !necrosis && !bled && !internal_bleeding && !lung_ruptured)
+		if(!AN && !open && !imp && !bled && !internal_bleeding && !lung_ruptured)
 			AN = "None:"
 		if(!(e.status & LIMB_DESTROYED))
-			dat += "<td>[e.display_name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][necrosis][imp][internal_bleeding][lung_ruptured]</td>"
+			dat += "<td>[e.display_name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][imp][internal_bleeding][lung_ruptured]</td>"
 		else
 			dat += "<td>[e.display_name]</td><td>-</td><td>-</td><td>Not Found</td>"
 		dat += "</tr>"
@@ -425,29 +399,8 @@
 		if(i.robotic == ORGAN_ROBOT)
 			mech = "Mechanical:<br>"
 
-		var/infection = "None"
-		switch (i.germ_level)
-			if (1 to INFECTION_LEVEL_ONE + 200)
-				infection = "Mild Infection:<br>"
-			if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
-				infection = "Mild Infection+:<br>"
-			if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
-				infection = "Mild Infection++:<br>"
-			if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 100)
-				infection = "Acute Infection:<br>"
-			if (INFECTION_LEVEL_TWO + 100 to INFECTION_LEVEL_TWO + 200)
-				infection = "Acute Infection+:<br>"
-			if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
-				infection = "Acute Infection++:<br>"
-			if (INFECTION_LEVEL_THREE to INFECTION_LEVEL_THREE + 300)
-				infection = "Septic:<br>"
-			if (INFECTION_LEVEL_THREE to INFECTION_LEVEL_THREE + 600)
-				infection = "Septic+:<br>"
-			if (INFECTION_LEVEL_THREE to INFINITY)
-				infection = "Septic++:<br>"
-
 		dat += "<tr>"
-		dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
+		dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[mech]</td><td></td>"
 		dat += "</tr>"
 	dat += "</table>"