Merge branch 'master' into Reagents_bitflats

code/game/machinery/Sleeper.dm

@@ -179,7 +179,7 @@
 		data["occupant"]["toxLoss"] = mob_occupant.getToxLoss()
 		data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
 		data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
-		data["occupant"]["brainLoss"] = mob_occupant.getBrainLoss()
+		data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
 		data["occupant"]["reagents"] = list()
 		if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)

code/game/machinery/cloning.dm

@@ -241,13 +241,14 @@
 				var/obj/item/I = pick_n_take(unattached_flesh)
 				if(isorgan(I))
 					var/obj/item/organ/O = I
+					O.organ_flags &= ~ORGAN_FROZEN
 					O.Insert(mob_occupant)
 				else if(isbodypart(I))
 					var/obj/item/bodypart/BP = I
 					BP.attach_limb(mob_occupant)
 
 			//Premature clones may have brain damage.
-			mob_occupant.adjustBrainLoss(-((speed_coeff / 2) * dmg_mult))
+			mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, -((speed_coeff / 2) * dmg_mult))
 
 			use_power(7500) //This might need tweaking.
 
@@ -261,6 +262,7 @@
 			for(var/i in unattached_flesh)
 				if(isorgan(i))
 					var/obj/item/organ/O = i
+					O.organ_flags &= ~ORGAN_FROZEN
 					O.Insert(mob_occupant)
 				else if(isbodypart(i))
 					var/obj/item/bodypart/BP = i
@@ -346,6 +348,9 @@
 	if(mess) //Clean that mess and dump those gibs!
 		for(var/obj/fl in unattached_flesh)
 			fl.forceMove(T)
+			if(istype(fl, /obj/item/organ))
+				var/obj/item/organ/O = fl
+				O.organ_flags &= ~ORGAN_FROZEN
 		unattached_flesh.Cut()
 		mess = FALSE
 		new /obj/effect/gibspawner/generic(get_turf(src))
@@ -442,7 +447,7 @@
 		unattached_flesh.Cut()
 
 	H.setCloneLoss(CLONE_INITIAL_DAMAGE)     //Yeah, clones start with very low health, not with random, because why would they start with random health
-	H.setBrainLoss(CLONE_INITIAL_DAMAGE)
+	//H.setOrganLoss(ORGAN_SLOT_BRAIN, CLONE_INITIAL_DAMAGE)
 	// In addition to being cellularly damaged and having barely any
 
 	// brain function, they also have no limbs or internal organs.
@@ -458,8 +463,9 @@
 
 	for(var/o in H.internal_organs)
 		var/obj/item/organ/organ = o
-		if(!istype(organ) || organ.vital)
+		if(!istype(organ) || (organ.organ_flags & ORGAN_VITAL))
 			continue
+		organ.organ_flags |= ORGAN_FROZEN
 		organ.Remove(H, special=TRUE)
 		organ.forceMove(src)
 		unattached_flesh += organ

code/game/machinery/cryopod.dm

@@ -0,0 +1,497 @@
+/*
+ * Cryogenic refrigeration unit. Basically a despawner.
+ * Stealing a lot of concepts/code from sleepers due to massive laziness.
+ * The despawn tick will only fire if it's been more than time_till_despawned ticks
+ * since time_entered, which is world.time when the occupant moves in.
+ * ~ Zuhayr
+ */
+
+
+//Main cryopod console.
+
+/obj/machinery/computer/cryopod
+	name = "cryogenic oversight console"
+	desc = "An interface between crew and the cryogenic storage oversight systems."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "cellconsole_1"
+	circuit = /obj/item/circuitboard/cryopodcontrol
+	density = FALSE
+	interaction_flags_machine = INTERACT_MACHINE_OFFLINE
+	req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with.
+	var/mode = null
+
+	var/menu = 1 //Which menu screen to display
+
+	//Used for logging people entering cryosleep and important items they are carrying.
+	var/list/frozen_crew = list()
+	var/list/frozen_items = list()
+
+	// Used for containing rare items traitors need to steal, so it's not
+	// game-over if they get iced
+	var/list/objective_items = list()
+	// A cache of theft datums so you don't have to re-create them for
+	// each item check
+	var/list/theft_cache = list()
+
+	var/allow_items = TRUE
+
+/obj/machinery/computer/cryopod/attack_ai()
+	attack_hand()
+
+/obj/machinery/computer/cryopod/ui_interact(mob/user = usr)
+	if(!is_operational())
+		return
+
+	user.set_machine(src)
+	add_fingerprint(user)
+
+	var/dat = ""
+
+	dat += "<h2>Welcome, [user.real_name].</h2><hr/>"
+	dat += "<br><br>"
+
+	switch(src.menu)
+		if(1)
+			dat += "<a href='byond://?src=[REF(src)];menu=2'>View crew storage log</a><br><br>"
+			if(allow_items)
+				dat += "<a href='byond://?src=[REF(src)];menu=3'>View objects storage log</a><br><br>"
+				dat += "<a href='byond://?src=[REF(src)];item=1'>Recover object</a><br><br>"
+				dat += "<a href='byond://?src=[REF(src)];allitems=1'>Recover all objects</a><br>"
+		if(2)
+			dat += "<a href='byond://?src=[REF(src)];menu=1'><< Back</a><br><br>"
+			dat += "<h3>Recently stored Crew</h3><br/><hr/><br/>"
+			if(!frozen_crew.len)
+				dat += "There has been no storage usage at this terminal.<br/>"
+			else
+				for(var/person in frozen_crew)
+					dat += "[person]<br/>"
+			dat += "<hr/>"
+		if(3)
+			dat += "<a href='byond://?src=[REF(src)];menu=1'><< Back</a><br><br>"
+			dat += "<h3>Recently stored objects</h3><br/><hr/><br/>"
+			if(!frozen_items.len)
+				dat += "There has been no storage usage at this terminal.<br/>"
+			else
+				for(var/obj/item/I in frozen_items)
+					dat += "[I.name]<br/>"
+			dat += "<hr/>"
+
+	var/datum/browser/popup = new(user, "cryopod_console", "Cryogenic System Control")
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+
+/obj/machinery/computer/cryopod/Topic(href, href_list)
+	if(..())
+		return TRUE
+
+	var/mob/user = usr
+
+	add_fingerprint(user)
+
+	if(href_list["item"])
+		if(!allowed(user))
+			to_chat(user, "<span class='warning'>Access Denied.</span>")
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			updateUsrDialog()
+			return
+		if(!allow_items) return
+
+		if(frozen_items.len == 0)
+			to_chat(user, "<span class='notice'>There is nothing to recover from storage.</span>")
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			updateUsrDialog()
+			return
+
+		var/obj/item/I = input(user, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items
+		playsound(src, "terminal_type", 25, 0)
+		if(!I)
+			return
+
+		if(!(I in frozen_items))
+			to_chat(user, "<span class='notice'>\The [I] is no longer in storage.</span>")
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			updateUsrDialog()
+			return
+
+		visible_message("<span class='notice'>The console beeps happily as it disgorges \the [I].</span>")
+		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+		I.forceMove(drop_location())
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
+			user.put_in_hands(I)
+		frozen_items -= I
+		updateUsrDialog()
+
+	else if(href_list["allitems"])
+		playsound(src, "terminal_type", 25, 0)
+		if(!allowed(user))
+			to_chat(user, "<span class='warning'>Access Denied.</span>")
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			updateUsrDialog()
+			return
+		if(!allow_items) return
+
+		if(frozen_items.len == 0)
+			to_chat(user, "<span class='notice'>There is nothing to recover from storage.</span>")
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			return
+
+		visible_message("<span class='notice'>The console beeps happily as it disgorges the desired objects.</span>")
+		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+		for(var/obj/item/I in frozen_items)
+			I.forceMove(drop_location())
+			frozen_items -= I
+			updateUsrDialog()
+
+	else if (href_list["menu"])
+		src.menu = text2num(href_list["menu"])
+		playsound(src, "terminal_type", 25, 0)
+		updateUsrDialog()
+
+	ui_interact(usr)
+	updateUsrDialog()
+	return
+
+/obj/item/circuitboard/cryopodcontrol
+	name = "Circuit board (Cryogenic Oversight Console)"
+	build_path = "/obj/machinery/computer/cryopod"
+
+/obj/machinery/computer/cryopod/contents_explosion()
+	return
+
+//Cryopods themselves.
+/obj/machinery/cryopod
+	name = "cryogenic freezer"
+	desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest."
+	icon = 'icons/obj/cryogenic2.dmi'
+	icon_state = "cryopod-open"
+	density = TRUE
+	anchored = TRUE
+	state_open = TRUE
+
+	var/on_store_message = "has entered long-term storage."
+	var/on_store_name = "Cryogenic Oversight"
+
+	// 15 minutes-ish safe period before being despawned.
+	var/time_till_despawn = 15 * 600 // This is reduced by 90% if a player manually enters cryo
+	var/despawn_world_time = null          // Used to keep track of the safe period.
+
+	var/obj/machinery/computer/cryopod/control_computer
+	var/last_no_computer_message = 0
+
+	// These items are preserved when the process() despawn proc occurs.
+	var/list/preserve_items = list(
+		/obj/item/hand_tele,
+		/obj/item/card/id/captains_spare,
+		/obj/item/aicard,
+		/obj/item/mmi,
+		/obj/item/paicard,
+		/obj/item/gun,
+		/obj/item/pinpointer,
+		/obj/item/clothing/shoes/magboots,
+		/obj/item/areaeditor/blueprints,
+		/obj/item/clothing/head/helmet/space,
+		/obj/item/clothing/suit/space,
+		/obj/item/clothing/suit/armor,
+		/obj/item/defibrillator/compact,
+		/obj/item/reagent_containers/hypospray/CMO,
+		/obj/item/clothing/accessory/medal/gold/captain,
+		/obj/item/clothing/gloves/krav_maga,
+		/obj/item/nullrod,
+		/obj/item/tank/jetpack,
+		/obj/item/documents,
+		/obj/item/nuke_core_container
+	)
+	// These items will NOT be preserved
+	var/list/do_not_preserve_items = list (
+		/obj/item/mmi/posibrain,
+		/obj/item/gun/energy/laser/mounted,
+		/obj/item/gun/energy/e_gun/advtaser/mounted,
+		/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
+		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/gun/energy/e_gun/advtaser/cyborg,
+		/obj/item/gun/energy/printer,
+		/obj/item/gun/energy/kinetic_accelerator/cyborg,
+		/obj/item/gun/energy/laser/cyborg
+	)
+
+/obj/machinery/cryopod/Initialize(mapload)
+	. = ..()
+	update_icon()
+	find_control_computer(mapload)
+
+/obj/machinery/cryopod/proc/find_control_computer(urgent = FALSE)
+	for(var/obj/machinery/computer/cryopod/C in get_area(src))
+		control_computer = C
+		if(C)
+			return C
+		break
+
+	// Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged
+	if(!control_computer && urgent && last_no_computer_message + 5*60*10 < world.time)
+		log_admin("Cryopod in [get_area(src)] could not find control computer!")
+		message_admins("Cryopod in [get_area(src)] could not find control computer!")
+		last_no_computer_message = world.time
+
+	return control_computer != null
+
+/obj/machinery/cryopod/close_machine(mob/user)
+	if(!control_computer)
+		find_control_computer(TRUE)
+	if((isnull(user) || istype(user)) && state_open && !panel_open)
+		..(user)
+		var/mob/living/mob_occupant = occupant
+		if(mob_occupant && mob_occupant.stat != DEAD)
+			to_chat(occupant, "<span class='boldnotice'>You feel cool air surround you. You go numb as your senses turn inward.</span>")
+		if(mob_occupant.client)//if they're logged in
+			despawn_world_time = world.time + (time_till_despawn * 0.1)
+		else
+			despawn_world_time = world.time + time_till_despawn
+	icon_state = "cryopod"
+
+/obj/machinery/cryopod/open_machine()
+	..()
+	icon_state = "cryopod-open"
+	density = TRUE
+	name = initial(name)
+
+/obj/machinery/cryopod/container_resist(mob/living/user)
+	visible_message("<span class='notice'>[occupant] emerges from [src]!</span>",
+		"<span class='notice'>You climb out of [src]!</span>")
+	open_machine()
+
+/obj/machinery/cryopod/relaymove(mob/user)
+	container_resist(user)
+
+/obj/machinery/cryopod/process()
+	if(!occupant)
+		return
+
+	var/mob/living/mob_occupant = occupant
+	if(mob_occupant)
+		// Eject dead people
+		if(mob_occupant.stat == DEAD)
+			open_machine()
+
+		if(!(world.time > despawn_world_time + 100))//+ 10 seconds
+			return
+
+		if(!mob_occupant.client && mob_occupant.stat < 2) //Occupant is living and has no client.
+			if(!control_computer)
+				find_control_computer(urgent = TRUE)//better hope you found it this time
+
+			despawn_occupant()
+
+#define CRYO_DESTROY 0
+#define CRYO_PRESERVE 1
+#define CRYO_OBJECTIVE 2
+
+/obj/machinery/cryopod/proc/should_preserve_item(obj/item/I)
+	for(var/datum/objective_item/steal/T in control_computer.theft_cache)
+		if(istype(I, T.targetitem) && T.check_special_completion(I))
+			return CRYO_OBJECTIVE
+	for(var/T in preserve_items)
+		if(istype(I, T) && !(I.type in do_not_preserve_items))
+			return CRYO_PRESERVE
+	return CRYO_DESTROY
+
+// This function can not be undone; do not call this unless you are sure
+/obj/machinery/cryopod/proc/despawn_occupant()
+	if(!control_computer)
+		find_control_computer()
+
+	var/mob/living/mob_occupant = occupant
+
+	//Handle Borg stuff first
+	if(iscyborg(mob_occupant))
+		var/mob/living/silicon/robot/R = mob_occupant
+		if(!istype(R)) return ..()
+
+		R.contents -= R.mmi
+		qdel(R.mmi)
+		for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
+			for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
+				if(should_preserve_item(O) != CRYO_DESTROY) // Preserve important things inside the item
+					continue
+				O.forceMove(src)
+			R.module.remove_module(I, TRUE)	//delete the module itself so it doesn't transfer over.
+
+	//Drop all items into the pod.
+	for(var/obj/item/I in mob_occupant)
+		mob_occupant.doUnEquip(I)
+		I.forceMove(src)
+
+		if(I.contents.len) //Make sure we catch anything not handled by qdel() on the items.
+			if(should_preserve_item(I) != CRYO_DESTROY) // Don't remove the contents of things that need preservation
+				continue
+			for(var/obj/item/O in I.contents)
+				if(istype(O, /obj/item/tank)) //Stop eating pockets, you fuck!
+					continue
+				O.forceMove(src)
+
+	//Delete all items not on the preservation list.
+	var/list/items = contents
+	items -= mob_occupant // Don't delete the occupant
+
+	for(var/obj/item/I in items)
+		if(istype(I, /obj/item/pda))
+			var/obj/item/pda/P = I
+			QDEL_NULL(P.id)
+			qdel(P)
+			continue
+
+		var/preserve = should_preserve_item(I)
+		if(preserve == CRYO_DESTROY)
+			qdel(I)
+		else if(control_computer && control_computer.allow_items)
+			control_computer.frozen_items += I
+			if(preserve == CRYO_OBJECTIVE)
+				control_computer.objective_items += I
+			I.loc = null
+		else
+			I.forceMove(loc)
+
+	//Update any existing objectives involving this mob.
+	for(var/datum/objective/O in GLOB.objectives)
+		// We don't want revs to get objectives that aren't for heads of staff. Letting
+		// them win or lose based on cryo is silly so we remove the objective.
+		if(istype(O,/datum/objective/mutiny) && O.target == mob_occupant.mind)
+			qdel(O)
+		else if(O.target && istype(O.target, /datum/mind))
+			if(O.target == mob_occupant.mind)
+				if(O.owner && O.owner.current)
+					to_chat(O.owner.current, "<BR><span class='userdanger'>You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!</span>")
+				O.target = null
+				spawn(10) //This should ideally fire after the occupant is deleted.
+					if(!O)
+						return
+					O.find_target()
+					O.update_explanation_text()
+					if(!(O.target))
+						O.owner.objectives -= O
+						qdel(O)
+
+	if(mob_occupant.mind && mob_occupant.mind.assigned_role)
+		//Handle job slot/tater cleanup.
+		var/job = mob_occupant.mind.assigned_role
+		SSjob.FreeRole(job)
+		if(mob_occupant.mind.objectives.len)
+			mob_occupant.mind.objectives.Cut()
+			mob_occupant.mind.special_role = null
+
+	// Delete them from datacore.
+
+	var/announce_rank = null
+	for(var/datum/data/record/R in GLOB.data_core.medical)
+		if((R.fields["name"] == mob_occupant.real_name))
+			qdel(R)
+	for(var/datum/data/record/T in GLOB.data_core.security)
+		if((T.fields["name"] == mob_occupant.real_name))
+			qdel(T)
+	for(var/datum/data/record/G in GLOB.data_core.general)
+		if((G.fields["name"] == mob_occupant.real_name))
+			announce_rank = G.fields["rank"]
+			qdel(G)
+
+	for(var/obj/machinery/computer/cloning/cloner in world)
+		for(var/datum/data/record/R in cloner.records)
+			if(R.fields["name"] == mob_occupant.real_name)
+				cloner.records.Remove(R)
+
+	//Make an announcement and log the person entering storage.
+	if(control_computer)
+		control_computer.frozen_crew += "[mob_occupant.real_name]"
+
+	if(GLOB.announcement_systems.len)
+		var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
+		announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list())
+		visible_message("<span class='notice'>\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.</span>")
+
+	// Ghost and delete the mob.
+	if(!mob_occupant.get_ghost(1))
+		mob_occupant.ghostize(0) // Players who cryo out may not re-enter the round
+
+	QDEL_NULL(occupant)
+	open_machine()
+	name = initial(name)
+
+#undef CRYO_DESTROY
+#undef CRYO_PRESERVE
+#undef CRYO_OBJECTIVE
+
+/obj/machinery/cryopod/MouseDrop_T(mob/living/target, mob/user)
+	if(!istype(target) || user.incapacitated() || !target.Adjacent(user) || !Adjacent(user) || !ismob(target) || (!ishuman(user) && !iscyborg(user)) || !istype(user.loc, /turf) || target.buckled)
+		return
+
+	if(occupant)
+		to_chat(user, "<span class='boldnotice'>The cryo pod is already occupied!</span>")
+		return
+
+	if(target.stat == DEAD)
+		to_chat(user, "<span class='notice'>Dead people can not be put into cryo.</span>")
+		return
+
+	if(target.client && user != target)
+		if(iscyborg(target))
+			to_chat(user, "<span class='danger'>You can't put [target] into [src]. They're online.</span>")
+		else
+			to_chat(user, "<span class='danger'>You can't put [target] into [src]. They're conscious.</span>")
+		return
+	else if(target.client)
+		if(alert(target,"Would you like to enter cryosleep?",,"Yes","No") == "No")
+			return
+
+	var/generic_plsnoleave_message = " Please adminhelp before leaving the round, even if there are no administrators online!"
+
+	if(target == user && world.time - target.client.cryo_warned > 5 MINUTES)//if we haven't warned them in the last 5 minutes
+		var/caught = FALSE
+		if(target.mind.assigned_role in GLOB.command_positions)
+			alert("<span class='userdanger'>You're a Head of Staff![generic_plsnoleave_message] Be sure to put your locker items back into your locker!</span>")
+			caught = TRUE
+		if(iscultist(target) || is_servant_of_ratvar(target))
+			to_chat(target, "<span class='userdanger'>You're a Cultist![generic_plsnoleave_message]</span>")
+			caught = TRUE
+		if(is_devil(target))
+			alert("<span class='userdanger'>You're a Devil![generic_plsnoleave_message]</span>")
+			caught = TRUE
+		if(istype(SSticker.mode, /datum/antagonist/gang))
+			if(target.mind.has_antag_datum(/datum/antagonist/gang))
+				alert("<span class='userdanger'>You're a Gangster![generic_plsnoleave_message]</span>")
+				caught = TRUE
+		if(istype(SSticker.mode, /datum/antagonist/rev))
+			if(target.mind.has_antag_datum(/datum/antagonist/rev/head))
+				alert("<span class='userdanger'>You're a Head Revolutionary![generic_plsnoleave_message]</span>")
+				caught = TRUE
+			else if(target.mind.has_antag_datum(/datum/antagonist/rev))
+				alert("<span class='userdanger'>You're a Revolutionary![generic_plsnoleave_message]</span>")
+				caught = TRUE
+
+		if(caught)
+			target.client.cryo_warned = world.time
+			return
+
+	if(!target || user.incapacitated() || !target.Adjacent(user) || !Adjacent(user) || (!ishuman(user) && !iscyborg(user)) || !istype(user.loc, /turf) || target.buckled)
+		return
+		//rerun the checks in case of shenanigans
+
+	if(target == user)
+		visible_message("[user] starts climbing into the cryo pod.")
+	else
+		visible_message("[user] starts putting [target] into the cryo pod.")
+
+	if(occupant)
+		to_chat(user, "<span class='boldnotice'>\The [src] is in use.</span>")
+		return
+	close_machine(target)
+
+	to_chat(target, "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>")
+	name = "[name] ([occupant.name])"
+	log_admin("<span class='notice'>[key_name(target)] entered a stasis pod.</span>")
+	message_admins("[key_name_admin(target)] entered a stasis pod. (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
+	add_fingerprint(target)
+
+//Attacks/effects.
+/obj/machinery/cryopod/blob_act()
+	return //Sorta gamey, but we don't really want these to be destroyed.

code/game/mecha/equipment/tools/medical_tools.dm

@@ -166,7 +166,7 @@
 				<font color="[patient.getToxLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Toxin Content:</b> [patient.getToxLoss()]%</font><br />
 				<font color="[patient.getFireLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Burn Severity:</b> [patient.getFireLoss()]%</font><br />
 				<span class='danger'>[patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]</span><br />
-				<span class='danger'>[patient.getBrainLoss() ? "Significant brain damage detected." : ""]</span><br />
+				<span class='danger'>[patient.getOrganLoss(ORGAN_SLOT_BRAIN) ? "Significant brain damage detected." : ""]</span><br />
 				<span class='danger'>[length(patient.get_traumas()) ? "Brain Traumas detected." : ""]</span><br />
 				"}
 

code/game/objects/items.dm

@@ -514,12 +514,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	log_combat(user, M, "attacked", "[src.name]", "(INTENT: [uppertext(user.a_intent)])")
 
-	M.adjust_blurriness(3)
-	M.adjust_eye_damage(rand(2,4))
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
 	if (!eyes)
 		return
-	if(eyes.eye_damage >= 10)
+	M.adjust_blurriness(3)
+	eyes.applyOrganDamage(rand(2,4))
+	if(eyes.damage >= 10)
 		M.adjust_blurriness(15)
 		if(M.stat != DEAD)
 			to_chat(M, "<span class='danger'>Your eyes start to bleed profusely!</span>")
@@ -533,7 +533,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			M.adjust_blurriness(10)
 			M.Unconscious(20)
 			M.Knockdown(40)
-		if (prob(eyes.eye_damage - 10 + 1))
+		if (prob(eyes.damage - 10 + 1))
 			M.become_blind(EYE_DAMAGE)
 			to_chat(M, "<span class='danger'>You go blind!</span>")
 

code/game/objects/items/body_egg.dm

@@ -17,26 +17,27 @@
 /obj/item/organ/body_egg/Insert(var/mob/living/carbon/M, special = 0)
 	..()
 	ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
-	START_PROCESSING(SSobj, src)
 	owner.med_hud_set_status()
 	INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
 
 /obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
-	STOP_PROCESSING(SSobj, src)
 	if(owner)
 		REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
 		owner.med_hud_set_status()
 		INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
 	..()
 
-/obj/item/organ/body_egg/process()
+/obj/item/organ/body_egg/on_death()
+	. = ..()
 	if(!owner)
 		return
-	if(!(src in owner.internal_organs))
-		Remove(owner)
-		return
 	egg_process()
 
+/obj/item/organ/body_egg/on_life()
+	. = ..()
+	egg_process()
+
+
 /obj/item/organ/body_egg/proc/egg_process()
 	return
 

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -399,6 +399,7 @@
 		/obj/machinery/smartfridge/food = "food",
 		/obj/machinery/smartfridge/drinks = "drinks",
 		/obj/machinery/smartfridge/extract = "slimes",
+		/obj/machinery/smartfridge/organ = "organs",
 		/obj/machinery/smartfridge/chemistry = "chems",
 		/obj/machinery/smartfridge/chemistry/virology = "viruses",
 		/obj/machinery/smartfridge/disks = "disks")

code/game/objects/items/defib.dm

@@ -440,9 +440,20 @@
 
 	do_help(H, user)
 
-/obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/H)
+/obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/H) //Our code here is different than tg, if it breaks in testing; BUG_PROBABLE_CAUSE
+	var/obj/item/organ/heart = H.getorgan(/obj/item/organ/heart)
+	if(H.suiciding || H.hellbound || HAS_TRAIT(H, TRAIT_HUSK))
+		return
+	if((world.time - H.timeofdeath) > tlimit)
+		return
+	if((H.getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (H.getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE))
+		return
+	if(!heart || (heart.organ_flags & ORGAN_FAILING))
+		return
 	var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain)
-	return	(!H.suiciding && !(HAS_TRAIT(H, TRAIT_NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)
+	if(QDELETED(BR) || BR.brain_death || (BR.organ_flags & ORGAN_FAILING) || H.suiciding)
+		return
+	return TRUE
 
 /obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
 	if(req_defib)
@@ -557,14 +568,12 @@
 	if(do_after(user, primetimer, target = H)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
 		user.visible_message("<span class='notice'>[user] places [src] on [H]'s chest.</span>", "<span class='warning'>You place [src] on [H]'s chest.</span>")
 		playsound(src, 'sound/machines/defib_charge.ogg', 75, 0)
-		var/tplus = world.time - H.timeofdeath
-		// past this much time the patient is unrecoverable
-		// (in deciseconds)
-		// brain damage starts setting in on the patient after
-		// some time left rotting
+		// patients rot when they are killed, and die when they are dead
+		var/tplus = world.time - H.timeofdeath	//length of time spent dead
 		var/tloss = deathtimer
 		var/total_burn	= 0
 		var/total_brute	= 0
+		var/obj/item/organ/heart = H.getorgan(/obj/item/organ/heart)
 		if(do_after(user, primetimer2, target = H)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
 			for(var/obj/item/carried_item in H.contents)
 				if(istype(carried_item, /obj/item/clothing/suit/space))
@@ -589,16 +598,26 @@
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence.  Further attempts futile.</span>"
 				else if (tplus > tlimit)
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Body has decayed for too long. Further attempts futile.</span>"
-				else if (!H.getorgan(/obj/item/organ/heart))
+				else if (!heart)
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing.</span>"
+				else if (heart.organ_flags & ORGAN_FAILING)
+					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged.</span>"
 				else if(total_burn >= 180 || total_brute >= 180)
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile.</span>"
 				else if(H.get_ghost())
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No activity in patient's brain. Further attempts may be successful.</span>"
 				else
 					var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain)
-					if(!BR || BR.damaged_brain)
-						failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain is missing or damaged beyond point of no return. Further attempts futile.</span>"
+					if(BR) //BUG_PROBABLE_CAUSE - slight difference between us and tg
+						if(BR.organ_flags & ORGAN_FAILING)
+							failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain tissue is damaged making recovery of patient impossible via defibrillator. Further attempts futile.</span>"
+						if(BR.brain_death)
+							failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain damaged beyond point of no return. Further attempts futile.</span>"
+						if(H.suiciding || BR.brainmob?.suiciding)
+							failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No intelligence pattern can be detected in patient's brain. Further attempts futile.</span>"
+					else
+						failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain is missing. Further attempts futile.</span>"
+
 
 				if(failed)
 					user.visible_message(failed)
@@ -623,7 +642,7 @@
 					H.Jitter(100)
 					SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK)
 					if(tplus > tloss)
-						H.adjustBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))), 150)
+						H.adjustOrganLoss(ORGAN_SLOT_BRAIN,  max(0, min(99, ((tlimit - tplus) / tlimit * 100))), 150)
 					log_combat(user, H, "revived", defib)
 					if(req_defib)
 						if(defib.healdisk)
@@ -641,7 +660,11 @@
 				playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
 			else if(H.undergoing_cardiac_arrest())
 				H.set_heartattack(FALSE)
-				user.visible_message("<span class='notice'>[req_defib ? "[defib]" : "[src]"] pings: Patient's heart is now beating again.</span>")
+				if(!(heart.organ_flags & ORGAN_FAILING))
+					H.set_heartattack(FALSE)
+					user.visible_message("<span class='notice'>[req_defib ? "[defib]" : "[src]"] pings: Patient's heart is now beating again.</span>")
+				else
+					user.visible_message("<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed, heart damage detected.</span>")
 				playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
 
 

code/game/objects/items/devices/dogborg_sleeper.dm

@@ -211,7 +211,7 @@
 		data["occupant"]["toxLoss"] = mob_occupant.getToxLoss()
 		data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
 		data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
-		data["occupant"]["brainLoss"] = mob_occupant.getBrainLoss()
+		data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
 		data["occupant"]["reagents"] = list()
 		if(mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)

code/game/objects/items/devices/scanners.dm

@@ -135,7 +135,7 @@ SLIME SCANNER
 		var/mob/living/carbon/human/H = M
 		if(H.undergoing_cardiac_arrest() && H.stat != DEAD)
 			to_chat(user, "<span class='danger'>Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!</span>")
-		if(H.undergoing_liver_failure() && H.stat != DEAD)
+		if(H.undergoing_liver_failure() && H.stat != DEAD) //might be depreciated BUG_PROBABLE_CAUSE
 			to_chat(user, "<span class='danger'>Subject is suffering from liver failure: Apply Corazone and begin a liver transplant immediately!</span>")
 
 	var/msg = "<span class='info'>*---------*\nAnalyzing results for [M]:\n\tOverall status: [mob_status]\n"
@@ -157,12 +157,8 @@ SLIME SCANNER
 		msg += "\t<span class='alert'>Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.</span>\n"
 		if(advanced)
 			msg += "\t<span class='info'>Cellular Damage Level: [M.getCloneLoss()].</span>\n"
-	if (M.getBrainLoss() >= 200 || !M.getorgan(/obj/item/organ/brain))
-		msg += "\t<span class='alert'>Subject's brain function is non-existent.</span>\n"
-	else if (M.getBrainLoss() >= 120)
-		msg += "\t<span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>\n"
-	else if (M.getBrainLoss() >= 45)
-		msg += "\t<span class='alert'>Brain damage detected.</span>\n"
+	if (!M.getorgan(/obj/item/organ/brain))
+		to_chat(user, "\t<span class='alert'>Subject lacks a brain.</span>") //Unsure how this won't proc for 50% of the cit playerbase (This is a joke everyone on cit a cute.)
 	if(ishuman(M) && advanced) // Should I make this not advanced?
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/liver/L = H.getorganslot("liver")
@@ -194,6 +190,14 @@ SLIME SCANNER
 			if(Br.cached_size>5)
 				msg += "\t<span class='info'>Subject has a sizeable bosom with a [Br.size] cup.</span>\n"
 
+		if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200 || !M.getorgan(/obj/item/organ/brain))
+			msg += "\t<span class='alert'>Subject's brain function is non-existent.</span>\n"
+		else if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
+			msg += "\t<span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>\n"
+		else if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45)
+			msg += "\t<span class='alert'>Brain damage detected.</span>\n"
+
+	if(iscarbon(M))
 		var/mob/living/carbon/C = M
 		if(LAZYLEN(C.get_traumas()))
 			var/list/trauma_text = list()
@@ -212,7 +216,7 @@ SLIME SCANNER
 		if(C.roundstart_quirks.len)
 			msg += "\t<span class='info'>Subject has the following physiological traits: [C.get_trait_string()].</span>\n"
 	if(advanced)
-		msg += "\t<span class='info'>Brain Activity Level: [(200 - M.getBrainLoss())/2]%.</span>\n"
+		msg += "\t<span class='info'>Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.</span>\n"
 	if(M.radiation)
 		msg += "\t<span class='alert'>Subject is irradiated.</span>\n"
 		msg += "\t<span class='info'>Radiation Level: [M.radiation] rad</span>\n"
@@ -246,11 +250,11 @@ SLIME SCANNER
 					healthy = FALSE
 					msg += "\t<span class='alert'>Subject is deaf.</span>\n"
 				else
-					if(ears.ear_damage)
-						msg += "\t<span class='alert'>Subject has [ears.ear_damage > UNHEALING_EAR_DAMAGE? "permanent ": "temporary "]hearing damage.</span>\n"
+					if(ears.damage)
+						to_chat(user, "\t<span class='alert'>Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.</span>")
 						healthy = FALSE
 					if(ears.deaf)
-						msg += "\t<span class='alert'>Subject is [ears.ear_damage > UNHEALING_EAR_DAMAGE ? "permanently ": "temporarily "] deaf.</span>\n"
+						to_chat(user, "\t<span class='alert'>Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.</span>")
 						healthy = FALSE
 				if(healthy)
 					msg += "\t<span class='info'>Healthy.</span>\n"
@@ -266,13 +270,13 @@ SLIME SCANNER
 				if(HAS_TRAIT(C, TRAIT_NEARSIGHT))
 					msg += "\t<span class='alert'>Subject is nearsighted.</span>\n"
 					healthy = FALSE
-				if(eyes.eye_damage > 30)
+				if(eyes.damage > 30)
 					msg += "\t<span class='alert'>Subject has severe eye damage.</span>\n"
 					healthy = FALSE
-				else if(eyes.eye_damage > 20)
+				else if(eyes.damage > 20)
 					msg += "\t<span class='alert'>Subject has significant eye damage.</span>\n"
 					healthy = FALSE
-				else if(eyes.eye_damage)
+				else if(eyes.damage)
 					msg += "\t<span class='alert'>Subject has minor eye damage.</span>\n"
 					healthy = FALSE
 				if(healthy)
@@ -296,6 +300,59 @@ SLIME SCANNER
 			for(var/obj/item/bodypart/org in damaged)
 				msg += "\t\t<span class='info'>[capitalize(org.name)]: [(org.brute_dam > 0) ? "<font color='red'>[org.brute_dam]</font></span>" : "<font color='red'>0</font>"]-[(org.burn_dam > 0) ? "<font color='#FF8000'>[org.burn_dam]</font>" : "<font color='#FF8000'>0</font>"]\n"
 
+	//Organ damages report
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/minor_damage
+		var/major_damage
+		var/max_damage
+		var/report_organs = FALSE
+
+		//Piece together the lists to be reported
+		for(var/O in H.internal_organs)
+			var/obj/item/organ/organ = O
+			if(organ.organ_flags & ORGAN_FAILING)
+				report_organs = TRUE	//if we report one organ, we report all organs, even if the lists are empty, just for consistency
+				if(max_damage)
+					max_damage += ", "	//prelude the organ if we've already reported an organ
+					max_damage += organ.name	//this just slaps the organ name into the string of text
+				else
+					max_damage = "\t<span class='alert'>Non-Functional Organs: "	//our initial statement
+					max_damage += organ.name
+			else if(organ.damage > organ.high_threshold)
+				report_organs = TRUE
+				if(major_damage)
+					major_damage += ", "
+					major_damage += organ.name
+				else
+					major_damage = "\t<span class='info'>Severely Damaged Organs: "
+					major_damage += organ.name
+			else if(organ.damage > organ.low_threshold)
+				report_organs = TRUE
+				if(minor_damage)
+					minor_damage += ", "
+					minor_damage += organ.name
+				else
+					minor_damage = "\t<span class='info'>Mildly Damaged Organs: "
+					minor_damage += organ.name
+
+		if(report_organs)	//we either finish the list, or set it to be empty if no organs were reported in that category
+			if(!max_damage)
+				max_damage = "\t<span class='alert'>Non-Functional Organs: </span>"
+			else
+				max_damage += "</span>"
+			if(!major_damage)
+				major_damage = "\t<span class='info'>Severely Damaged Organs: </span>"
+			else
+				major_damage += "</span>"
+			if(!minor_damage)
+				minor_damage = "\t<span class='info'>Mildly Damaged Organs: </span>"
+			else
+				minor_damage += "</span>"
+			msg += "[minor_damage]"
+			msg += "[major_damage]"
+			msg += "[max_damage]"
+
 
 	// Species and body temperature
 	if(ishuman(M))

code/game/objects/items/robot/robot_parts.dm

@@ -254,7 +254,7 @@
 				to_chat(user, "<span class='warning'>The MMI indicates that their mind is currently inactive; it might change!</span>")
 				return
 
-			if(BM.stat == DEAD || (M.brain && M.brain.damaged_brain))
+			if(BM.stat == DEAD || (M.brain && M.brain.organ_flags & ORGAN_FAILING))
 				to_chat(user, "<span class='warning'>Sticking a dead brain into the frame would sort of defeat the purpose!</span>")
 				return
 

code/game/objects/items/storage/book.dm

@@ -140,7 +140,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 		else if(iscarbon(M))
 			var/mob/living/carbon/C = M
 			if(!istype(C.head, /obj/item/clothing/head))
-				C.adjustBrainLoss(10, 80)
+				C.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 80)
 				to_chat(C, "<span class='danger'>You feel dumber.</span>")
 
 		if(smack)

code/game/objects/items/twohanded.dm

@@ -304,7 +304,7 @@
 
 		var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)//stole from chainsaw code
 		var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
-		B.vital = FALSE//this cant possibly be a good idea
+		B.organ_flags &= ~ORGAN_VITAL	//this cant possibly be a good idea
 		var/randdir
 		for(var/i in 1 to 24)//like a headless chicken!
 			if(user.is_holding(src))

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -2,6 +2,24 @@
 	icon_state = "freezer"
 	var/jones = FALSE
 
+/obj/structure/closet/secure_closet/freezer/Destroy()
+	recursive_organ_check(src)
+	..()
+
+/obj/structure/closet/secure_closet/freezer/Initialize()
+	..()
+	recursive_organ_check(src)
+
+/obj/structure/closet/secure_closet/freezer/open(mob/living/user)
+	if(opened || !can_open(user))	//dupe check just so we don't let the organs decay when someone fails to open the locker
+		return FALSE
+	recursive_organ_check(src)
+	return ..()
+
+/obj/structure/closet/secure_closet/freezer/close(mob/living/user)
+	if(..())	//if we actually closed the locker
+		recursive_organ_check(src)
+
 /obj/structure/closet/secure_closet/freezer/ex_act()
 	if(!jones)
 		jones = TRUE

code/game/objects/structures/morgue.dm

@@ -31,6 +31,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 /obj/structure/bodycontainer/Initialize()
 	. = ..()
 	GLOB.bodycontainers += src
+	recursive_organ_check(src)
 
 /obj/structure/bodycontainer/Destroy()
 	GLOB.bodycontainers -= src
@@ -101,6 +102,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 
 /obj/structure/bodycontainer/deconstruct(disassembled = TRUE)
 	new /obj/item/stack/sheet/metal (loc, 5)
+	recursive_organ_check(src)
 	qdel(src)
 
 /obj/structure/bodycontainer/container_resist(mob/living/user)
@@ -120,6 +122,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 		open()
 
 /obj/structure/bodycontainer/proc/open()
+	recursive_organ_check(src)
 	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
 	playsound(src, 'sound/effects/roll.ogg', 5, 1)
 	var/turf/T = get_step(src, dir)
@@ -134,6 +137,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 	for(var/atom/movable/AM in connected.loc)
 		if(!AM.anchored || AM == connected)
 			AM.forceMove(src)
+	recursive_organ_check(src)
 	update_icon()
 
 /obj/structure/bodycontainer/get_remote_view_fullscreens(mob/user)