Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor

code/modules/admin/topic.dm

@@ -1228,7 +1228,7 @@
 		if(ismob(M))
 			var/take_msg = "<span class='notice'><b>ADMINHELP</b>: <b>[key_name(usr.client)]</b> is attending to <b>[key_name(M)]'s</b> adminhelp, please don't dogpile them.</span>"
 			for(var/client/X in admins)
-				if((R_ADMIN|R_MOD|R_EVENT) & X.holder.rights)
+				if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights)
 					to_chat(X, take_msg)
 			to_chat(M, "<span class='notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
 		else

code/modules/blob2/mobs/spore.dm

@@ -12,7 +12,7 @@
 	melee_damage_lower = 2
 	melee_damage_upper = 4
 	layer = MOB_LAYER + 0.2 // Over the blob.
-	attacktext = "slams into"
+	attacktext = list("slams into")
 	attack_sound = 'sound/effects/slime_squish.ogg'
 	emote_see = list("sways", "inflates briefly")
 	var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie.
@@ -97,7 +97,7 @@
 	melee_damage_lower += 8  // 10 total.
 	melee_damage_upper += 11 // 15 total.
 	emote_see = list("shambles around", "twitches", "stares")
-	attacktext = "claws"
+	attacktext = list("claws")
 
 	H.forceMove(src)
 	infested = H

code/modules/client/preference_setup/general/03_body.dm

@@ -4,7 +4,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	var/equip_preview_mob = EQUIP_PREVIEW_ALL
 
 	var/icon/bgstate = "000"
-	var/list/bgstate_options = list("000", "fff", "steel", "white")
+	var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
 
 /datum/category_item/player_setup_item/general/body
 	name = "Body"

code/modules/clothing/masks/breath.dm

@@ -45,3 +45,17 @@
 	icon_state = "medical"
 	item_state_slots = list(slot_r_hand_str = "medical", slot_l_hand_str = "medical")
 	permeability_coefficient = 0.01
+
+/obj/item/clothing/mask/breath/emergency
+	desc = "A close-fitting  mask that is used by the wallmounted emergency oxygen pump."
+	name = "emergency mask"
+	icon_state = "breath"
+	item_state = "breath"
+	permeability_coefficient = 0.50
+
+/obj/item/clothing/mask/breath/anesthetic
+	desc = "A close-fitting sterile mask that is used by the anesthetic wallmounted pump."
+	name = "anesthetic mask"
+	icon_state = "medical"
+	item_state = "medical"
+	permeability_coefficient = 0.01

code/modules/clothing/masks/gasmask.dm

@@ -73,7 +73,6 @@
 	icon_state = "explorer"
 	item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas")
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 5, bomb = 0, bio = 50, rad = 0)
-	body_parts_covered = HEAD|FACE|EYES
 	siemens_coefficient = 0.9
 
 /obj/item/clothing/mask/gas/clown_hat

code/modules/clothing/under/accessories/permits.dm

@@ -34,6 +34,10 @@
 	name = "bar shotgun permit"
 	desc = "A card indicating that the owner is allowed to carry a shotgun in the bar."
 
+/obj/item/clothing/accessory/permit/gun/planetside
+	name = "planetside gun permit"
+	desc = "A card indicating that the owner is allowed to carry a firearm while on the surface."
+
 /obj/item/clothing/accessory/permit/drone
 	name = "drone identification card"
 	desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law."

code/modules/materials/material_recipes.dm

@@ -182,4 +182,10 @@
 	recipes += new/datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
 	recipes += new/datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
 	recipes += new/datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
-	recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
+	recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
+
+/material/wood/sif/generate_recipes()
+	..()
+	recipes += new/datum/stack_recipe("alien wood floor tile", /obj/item/stack/tile/sifwood, 1, 4, 20)
+	recipes -= new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20)
+	recipes -= new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1)

code/modules/mining/mine_turfs.dm

@@ -488,7 +488,7 @@ var/list/mining_overlay_cache = list()
 				M.flash_eyes()
 				if(prob(50))
 					M.Stun(5)
-			radiation_repository.flat_radiate(src, 25, 200)
+			radiation_repository.flat_radiate(src, 25, 100)
 			if(prob(25))
 				excavate_find(prob(5), finds[1])
 	else if(rand(1,500) == 1)

code/modules/mining/satchel_ore_boxdm.dm

@@ -14,12 +14,15 @@
 	if (istype(W, /obj/item/weapon/ore))
 		user.remove_from_mob(W)
 		src.contents += W
-	if (istype(W, /obj/item/weapon/storage))
+
+	else if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
+		if(!S.contents.len)
+			return
 		S.hide_from(usr)
 		for(var/obj/item/weapon/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
-		user << "<font color='blue'>You empty the satchel into the box.</font>"
+		to_chat(user,"<span class='notice'>You empty the satchel into the box.</span>")
 
 	update_ore_count()
 
@@ -62,13 +65,12 @@
 		user << "- [stored_ore[ore]] [ore]"
 	return
 
-
 /obj/structure/ore_box/verb/empty_box()
 	set name = "Empty Ore Box"
 	set category = "Object"
 	set src in view(1)
 
-	if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
+	if(!istype(usr, /mob/living/carbon/human) && !istype(usr, /mob/living/silicon/robot)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
 		usr << "<font color='red'>You are physically incapable of emptying the ore box.</font>"
 		return
 

code/modules/mob/_modifiers/modifiers.dm

@@ -39,7 +39,7 @@
 	var/haste							// If set to 1, the mob will be 'hasted', which makes it ignore slowdown and go really fast.
 	var/evasion							// Positive numbers reduce the odds of being hit. Negative numbers increase the odds.
 	var/bleeding_rate_percent			// Adjusts amount of blood lost when bleeding.
-	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder. Every 15% is equal to one tile easier or harder, just like evasion.
+	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder.
 	var/accuracy_dispersion				// Positive numbers make gun firing cover a wider tile range, and therefore more inaccurate.  Negatives help negate dispersion penalties.
 	var/metabolism_percent				// Adjusts the mob's metabolic rate, which affects reagent processing.  Won't affect mobs without reagent processing.
 	var/icon_scale_percent				// Makes the holder's icon get scaled up or down.
@@ -208,13 +208,13 @@
 		effects += "You move at maximum speed, and cannot be slowed by any means."
 
 	if(!isnull(evasion))
-		effects += "You are [abs(evasion * 15)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."
+		effects += "You are [abs(evasion)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."
 
 	if(!isnull(bleeding_rate_percent))
 		effects += "You bleed [multipler_to_percentage(bleeding_rate_percent, TRUE)] [bleeding_rate_percent > 1.0 ? "faster" : "slower"]."
 
 	if(!isnull(accuracy))
-		effects += "It is [abs(accuracy * 15)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."
+		effects += "It is [abs(accuracy)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."
 
 	if(!isnull(accuracy_dispersion))
 		effects += "Projectiles you fire are [accuracy_dispersion > 0 ? "more" : "less"] likely to stray from your intended target."

code/modules/mob/_modifiers/modifiers_misc.dm

@@ -60,9 +60,9 @@ the artifact triggers the rage.
 	pain_immunity = TRUE					// Avoid falling over from shock (at least until it expires).
 
 	// The less good stuff.
-	accuracy = -5							// Aiming requires focus.
+	accuracy = -75							// Aiming requires focus.
 	accuracy_dispersion = 3					// Ditto.
-	evasion = -3							// Too angry to dodge.
+	evasion = -45							// Too angry to dodge.
 
 	var/nutrition_cost = 150
 	var/exhaustion_duration = 2 MINUTES 	// How long the exhaustion modifier lasts after it expires. Set to 0 to not apply one.
@@ -157,7 +157,7 @@ the artifact triggers the rage.
 	attack_speed_percent = 1.5
 	outgoing_melee_damage_percent = 0.6
 	disable_duration_percent = 1.5
-	evasion = -2
+	evasion = -30
 
 /datum/modifier/berserk_exhaustion/on_applied()
 	holder.visible_message("<span class='warning'>\The [holder] looks exhausted.</span>")
@@ -177,6 +177,6 @@ the artifact triggers the rage.
 	stacks = MODIFIER_STACK_EXTEND
 
 	// Just being mad isn't gonna overclock your body when you're a beepboop.
-	accuracy = -5				// Aiming requires focus.
+	accuracy = -75				// Aiming requires focus.
 	accuracy_dispersion = 3		// Ditto.
-	evasion = -3				// Too angry to dodge.
+	evasion = -45				// Too angry to dodge.

code/modules/mob/living/carbon/human/human.dm

@@ -1024,10 +1024,10 @@
 		return
 	return md5(dna.uni_identity)
 
-/mob/living/carbon/human/clean_blood(var/clean_feet)
+/mob/living/carbon/human/clean_blood(var/washshoes)
 	.=..()
 	gunshot_residue = null
-	if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
+	if(washshoes && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
 		feet_blood_color = null
 		feet_blood_DNA.Cut()
 		feet_blood_DNA = null
@@ -1546,11 +1546,14 @@
 		permit.set_name(real_name)
 		equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
 
-/mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot.
+/mob/living/carbon/human/proc/update_icon_special(var/mutable_appearance/ma, var/update_icons = TRUE) //For things such as teshari hiding and whatnot.
 	if(hiding) // Hiding? Carry on.
 		if(stat == DEAD || paralysis || weakened || stunned) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work.
-			hiding = 0 //No hiding for you. Mob layer should be updated naturally, but it actually doesn't.
+			hiding = FALSE //No hiding for you. Mob layer should be updated naturally, but it actually doesn't.
 		else
-			layer = 2.45
-	else //Replace this else with other variables if added in the future. Alternatively, could make other things effect this hiding variable.
-		return
+			ma.layer = HIDING_LAYER
+
+	//Can put special species icon update proc calls here, if any are ever invented.
+
+	if(update_icons)
+		update_icons()

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -245,12 +245,13 @@
 			var/real_damage = rand_damage
 			var/hit_dam_type = attack.damage_type
 			real_damage += attack.get_unarmed_damage(H)
-			if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves))
-				var/obj/item/clothing/gloves/G = H.gloves
-				real_damage += G.punch_force
-				hit_dam_type = G.punch_damtype
-				if(H.pulling_punches)	//SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN
-					hit_dam_type = AGONY
+			if(H.gloves)
+				if(istype(H.gloves, /obj/item/clothing/gloves))
+					var/obj/item/clothing/gloves/G = H.gloves
+					real_damage += G.punch_force
+					hit_dam_type = G.punch_damtype
+					if(H.pulling_punches)	//SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN
+						hit_dam_type = AGONY
 			real_damage *= damage_multiplier
 			rand_damage *= damage_multiplier
 			if(HULK in H.mutations)
@@ -327,7 +328,7 @@
 /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
 	return
 
-/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message)
+/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message, var/armor_type = "melee", var/armor_pen = 0, var/a_sharp = 0, var/a_edge = 0)
 
 	if(!damage)
 		return
@@ -339,9 +340,9 @@
 
 	var/dam_zone = pick(organs_by_name)
 	var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone))
-	var/armor_block = run_armor_check(affecting, "melee")
-	var/armor_soak = get_armor_soak(affecting, "melee")
-	apply_damage(damage, BRUTE, affecting, armor_block, armor_soak)
+	var/armor_block = run_armor_check(affecting, armor_type, armor_pen)
+	var/armor_soak = get_armor_soak(affecting, armor_type, armor_pen)
+	apply_damage(damage, BRUTE, affecting, armor_block, armor_soak, sharp = a_sharp, edge = a_edge)
 	updatehealth()
 	return 1
 

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -149,11 +149,14 @@ var/datum/species/shapeshifter/promethean/prometheans
 			H.nutrition += rand(15, 45)
 
 	// Heal remaining damage.
-	if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
-		H.adjustBruteLoss(-heal_rate)
-		H.adjustFireLoss(-heal_rate)
-		H.adjustOxyLoss(-heal_rate)
-		H.adjustToxLoss(-heal_rate)
+	if(H.fire_stacks >= 0)
+		if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
+			H.adjustBruteLoss(-heal_rate)
+			H.adjustFireLoss(-heal_rate)
+			H.adjustOxyLoss(-heal_rate)
+			H.adjustToxLoss(-heal_rate)
+	else
+		H.adjustToxLoss(2*heal_rate)	// Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
 
 /datum/species/shapeshifter/promethean/get_blood_colour(var/mob/living/carbon/human/H)
 	return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())

code/modules/mob/living/carbon/human/update_icons.dm

@@ -159,6 +159,8 @@ Please contact me on #coderbus IRC. ~Carn x
 
 	//0: We start with their existing appearance (this contains their verbs, important to keep those!)
 	var/mutable_appearance/ma_compiled = new(src)
+	ma_compiled.plane = plane //Required because of an override on mutable_appearance/New() that sets it to FLOAT_PLANE...for some reason.
+	ma_compiled.layer = layer
 
 	//1: HUDs because these are hidden behind a backplane. See update_icons_huds()
 	ma_compiled.overlays = list_huds //The first one can set instead of add
@@ -170,17 +172,14 @@ Please contact me on #coderbus IRC. ~Carn x
 	ma_compiled.overlays += list_layers
 
 	//4: Apply transforms based on situation
-	update_transform(ma_compiled, FALSE)
+	update_transform(ma_compiled)
 
-	//4.5 Set layer to PLANE_WORLD to make sure its not magically FLOAT_PLANE due to byond madness
-	ma_compiled.plane = PLANE_WORLD
+	//5: Do any species specific layering updates, such as when hiding.
+	update_icon_special(ma_compiled, FALSE)
 
-	//5: Set appearance once
+	//6: Set appearance once
 	appearance = ma_compiled
 
-	//6: Do any species specific layering updates, such as when hiding.
-	update_icon_special()
-
 /mob/living/carbon/human/update_transform(var/mutable_appearance/passed_ma)
 	if(QDESTROYING(src))
 		return
@@ -190,6 +189,8 @@ Please contact me on #coderbus IRC. ~Carn x
 		ma = passed_ma
 	else
 		ma = new(src)
+		ma.plane = plane //Required because of an override on mutable_appearance/New() that sets it to FLOAT_PLANE...for some reason.
+		ma.layer = layer
 
 	// First, get the correct size.
 	var/desired_scale = icon_scale
@@ -214,9 +215,9 @@ Please contact me on #coderbus IRC. ~Carn x
 		M.Translate(0, 16*(desired_scale-1))
 		ma.transform = M
 		ma.layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters
-	update_icon_special() //Adjust their layer, like when they are hiding.
 
 	if(!passed_ma)
+		update_icon_special(ma)
 		appearance = ma
 
 //Update the layers from the defines above
@@ -251,10 +252,9 @@ Please contact me on #coderbus IRC. ~Carn x
 		list_huds = hud_list.Copy()
 		list_huds += backplane // Required to mask HUDs in context menus: http://www.byond.com/forum/?post=2336679
 
-//TYPING INDICATOR CODE.
+	//Typing indicator code
 	if(client && !stat) //They have a client & aren't dead/KO'd? Continue on!
 		if(typing_indicator && hud_typing) //They already have the indicator and are still typing
-			overlays += typing_indicator //This might not be needed? It works, so I'm leaving it.
 			list_huds += typing_indicator
 			typing_indicator.invisibility = invisibility
 
@@ -262,13 +262,11 @@ Please contact me on #coderbus IRC. ~Carn x
 			typing_indicator = new
 			typing_indicator.icon = 'icons/mob/talk.dmi'
 			typing_indicator.icon_state = "[speech_bubble_appearance()]_typing"
-			overlays += typing_indicator
 			list_huds += typing_indicator
 
 		else if(typing_indicator && !hud_typing) //Did they stop typing?
-			overlays -= typing_indicator
-			typing = 0
-			hud_typing = 0
+			typing = FALSE
+			hud_typing = FALSE
 
 	if(update_icons)
 		update_icons()
@@ -419,20 +417,24 @@ var/global/list/damage_icon_parts = list()
 			var/icon/temp = part.get_icon(skeleton)
 			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
 			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
-			if(part.icon_position & (LEFT | RIGHT))
+			if(part.icon_position == RIGHT)
 				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				var/icon/temp3 = new('icons/mob/human.dmi',"blank")
 				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
 				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
-				if(!(part.icon_position & LEFT))
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(!(part.icon_position & RIGHT))
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
 				base_icon.Blend(temp2, ICON_OVERLAY)
-				if(part.icon_position & LEFT)
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(part.icon_position & RIGHT)
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
-				base_icon.Blend(temp2, ICON_UNDERLAY)
+				temp3.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				base_icon.Blend(temp3, ICON_UNDERLAY)
+			else if(part.icon_position == LEFT)
+				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				var/icon/temp3 = new('icons/mob/human.dmi',"blank")
+				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
+				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
+				temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				base_icon.Blend(temp2, ICON_OVERLAY)
+				temp3.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				base_icon.Blend(temp3, ICON_UNDERLAY)
 			else if(part.icon_position & UNDER)
 				base_icon.Blend(temp, ICON_UNDERLAY)
 			else
@@ -656,7 +658,7 @@ var/global/list/damage_icon_parts = list()
 	update_fire(0)
 	update_water(0)
 	update_surgery(0)
-	UpdateDamageIcon()
+	UpdateDamageIcon(0)
 	update_icons_layers(0)
 	update_icons_huds(0)
 	update_icons()

code/modules/mob/living/silicon/robot/robot.dm

@@ -885,6 +885,18 @@
 								cleaned_human.update_inv_shoes(0)
 							cleaned_human.clean_blood(1)
 							cleaned_human << "<font color='red'>[src] cleans your face!</font>"
+
+		if((module_state_1 && istype(module_state_1, /obj/item/weapon/storage/bag/ore)) || (module_state_2 && istype(module_state_2, /obj/item/weapon/storage/bag/ore)) || (module_state_3 && istype(module_state_3, /obj/item/weapon/storage/bag/ore))) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use.
+			var/obj/item/weapon/storage/bag/ore/B = null
+			if(istype(module_state_1, /obj/item/weapon/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple.
+				B = module_state_1
+			else if(istype(module_state_2, /obj/item/weapon/storage/bag/ore))
+				B = module_state_2
+			else if(istype(module_state_3, /obj/item/weapon/storage/bag/ore))
+				B = module_state_3
+			var/turf/tile = loc
+			if(isturf(tile))
+				B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
 		return
 
 /mob/living/silicon/robot/proc/self_destruct()

code/modules/mob/living/simple_animal/animals/giant_spider.dm

@@ -78,6 +78,18 @@ Nurse Family
 	var/atom/cocoon_target
 	var/egg_inject_chance = 5
 
+/mob/living/simple_animal/hostile/giant_spider/nurse/medical
+	desc = "Furry and beige, it makes you shudder to look at it. This one has brilliant green eyes and a tiny nurse hat."
+	icon_state = "nursemed"
+	icon_living = "nursemed"
+	icon_dead = "nursemed_dead"
+
+	melee_damage_lower = 8
+	melee_damage_upper = 16
+	poison_type = "tramadol"
+	poison_chance = 15
+
+
 /mob/living/simple_animal/hostile/giant_spider/nurse/queen
 	desc = "Absolutely gigantic, this creature is horror itself."
 	icon = 'icons/mob/64x64.dmi'

code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm

@@ -18,7 +18,7 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 8
 
-	attacktext = "gouged"
+	attacktext = list("gouged")
 	cold_damage_per_tick = 0
 
 	speak_chance = 5

code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm

@@ -17,7 +17,7 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 25
 
-	attacktext = "mauled"
+	attacktext = list("mauled")
 	cold_damage_per_tick = 0
 
 	speak_chance = 5

code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm

@@ -17,7 +17,7 @@
 	melee_damage_lower = 3
 	melee_damage_upper = 12
 
-	attacktext = "gouged"
+	attacktext = list("gouged")
 	cold_damage_per_tick = 0
 
 	speak_chance = 5

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -119,6 +119,10 @@
 	var/melee_miss_chance = 15		// percent chance to miss a melee attack.
 	var/melee_attack_minDelay = 5		// How long between attacks at least
 	var/melee_attack_maxDelay = 10		// How long between attacks at most
+	var/attack_armor_type = "melee"		// What armor does this check?
+	var/attack_armor_pen = 0			// How much armor pen this attack has.
+	var/attack_sharp = 0				// Is the attack sharp?
+	var/attack_edge = 0					// Does the attack have an edge?
 
 	//Special attacks
 	var/spattack_prob = 0			// Chance of the mob doing a special attack (0 for never)
@@ -642,7 +646,6 @@
 		if(istype(O, /obj/item/weapon/material/knife) || istype(O, /obj/item/weapon/material/knife/butch))
 			harvest(user)
 	else
-		O.attack(src, user, user.zone_sel.selecting)
 		ai_log("attackby() I was weapon'd by: [user]",2)
 		if(O.force)
 			react_to_attack(user)
@@ -1275,7 +1278,7 @@
 		if(H.check_shields(damage = damage_to_do, damage_source = src, attacker = src, def_zone = null, attack_text = "the attack"))
 			return FALSE
 
-	if(A.attack_generic(src, damage_to_do, pick(attacktext)) && attack_sound)
+	if(A.attack_generic(src, damage_to_do, pick(attacktext), attack_armor_type, attack_armor_pen, attack_sharp, attack_edge) && attack_sound)
 		playsound(src, attack_sound, 75, 1)
 
 	return TRUE

code/modules/mob/living/simple_animal/slime/combat.dm

@@ -180,7 +180,7 @@
 				var/damage_to_do = rand(melee_damage_lower, melee_damage_upper)
 				var/armor_modifier = abs((L.getarmor(null, "bio") / 100) - 1)
 
-				L.attack_generic(src, damage_to_do, attacktext)
+				L.attack_generic(src, damage_to_do, pick(attacktext))
 				playsound(src, 'sound/weapons/bite.ogg', 75, 1)
 
 				// Give the slime some nutrition, if applicable.
@@ -199,7 +199,7 @@
 
 	if(istype(L,/obj/mecha))
 		var/obj/mecha/M = L
-		M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext)
+		M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), pick(attacktext))
 
 /mob/living/simple_animal/slime/proc/post_attack(var/mob/living/L, var/intent = I_HURT)
 	if(intent != I_HELP)

code/modules/mob/mob_planes.dm

@@ -94,6 +94,9 @@
 	var/invis_toggle = FALSE
 	var/list/sub_planes
 
+/obj/screen/plane_master/New()
+	..(null) //Never be in anything ever.
+
 /obj/screen/plane_master/proc/set_desired_alpha(var/new_alpha)
 	if(new_alpha != alpha && new_alpha > 0 && new_alpha <= 255)
 		desired_alpha = new_alpha

code/modules/mob/typing_indicator.dm

@@ -26,15 +26,18 @@
 
 	if(!ishuman(src)) //If they're a mob, use the old code.
 		set_typing_indicator(1)
-	if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
+	else if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
 		hud_typing = 1
 		update_icons_huds()
+
 	var/message = input("","say (text)") as text
-	if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
-		hud_typing = 0
-		update_icons_huds()
+
 	if(!ishuman(src)) //If they're a mob, use the old code.
 		set_typing_indicator(0)
+	else if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
+		hud_typing = 0
+		update_icons_huds()
+
 	if(message)
 		say_verb(message)
 
@@ -44,14 +47,17 @@
 
 	if(!ishuman(src)) //If they're a mob, use the old code.
 		set_typing_indicator(1)
-	if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
+	else if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
 		hud_typing = 1
 		update_icons_huds()
+
 	var/message = input("","me (text)") as text
+
 	if(is_preference_enabled(/datum/client_preference/show_typing_indicator))
 		hud_typing = 0
 		update_icons_huds()
-	if(!ishuman(src)) //If they're a mob, use the old code.
+	else if(!ishuman(src)) //If they're a mob, use the old code.
 		set_typing_indicator(0)
+
 	if(message)
 		me_verb(message)

code/modules/nano/modules/nano_module.dm

@@ -5,6 +5,10 @@
 /datum/nano_module/New(var/host)
 	src.host = host
 
+/datum/nano_module/Destroy()
+	host = null
+	return ..()
+
 /datum/nano_module/nano_host()
 	return host ? host : src
 

code/modules/nano/modules/power_monitor.dm

@@ -43,8 +43,11 @@
 /datum/nano_module/power_monitor/proc/refresh_sensors()
 	grid_sensors = list()
 	var/turf/T = get_turf(nano_host())
+	var/list/levels = list()
+	if(T)
+		levels += using_map.get_map_levels(T.z, FALSE)
 	for(var/obj/machinery/power/sensor/S in machines)
-		if((T && S.loc.z == T.z) || (S.long_range)) // Consoles have range on their Z-Level. Sensors with long_range var will work between Z levels.
+		if(T && (S.loc.z == T.z) || (S.loc.z in levels) || (S.long_range)) // Consoles have range on their Z-Level. Sensors with long_range var will work between Z levels.
 			if(S.name_tag == "#UNKN#") // Default name. Shouldn't happen!
 				warning("Powernet sensor with unset ID Tag! [S.x]X [S.y]Y [S.z]Z")
 			else

code/modules/organs/internal/eyes.dm

@@ -95,5 +95,6 @@
 	return -1
 
 /obj/item/organ/internal/eyes/emp_act(severity)
-	..()	//Returns if the organ isn't robotic
-	owner.eye_blurry += (4/severity)
+	..()
+	if(robotic >= ORGAN_ASSISTED)
+		owner.eye_blurry += (4/severity)

code/modules/organs/organ.dm

@@ -83,10 +83,9 @@ var/list/organ_cache = list()
 			blood_DNA[dna.unique_enzymes] = dna.b_type
 
 /obj/item/organ/proc/die()
-	if(robotic >= ORGAN_ROBOT)
-		return
+	if(robotic < ORGAN_ROBOT)
+		status |= ORGAN_DEAD
 	damage = max_damage
-	status |= ORGAN_DEAD
 	processing_objects -= src
 	if(owner && vital)
 		owner.death()
@@ -107,6 +106,11 @@ var/list/organ_cache = list()
 		return
 	if(preserved)
 		return
+
+	//check if we've hit max_damage
+	if(damage >= max_damage)
+		die()
+
 	//Process infections
 	if(robotic >= ORGAN_ROBOT || (owner && owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT))))
 		germ_level = 0
@@ -132,10 +136,6 @@ var/list/organ_cache = list()
 		handle_rejection()
 		handle_germ_effects()
 
-	//check if we've hit max_damage
-	if(damage >= max_damage)
-		die()
-
 /obj/item/organ/examine(mob/user)
 	..(user)
 	if(status & ORGAN_DEAD)

code/modules/organs/organ_icon.dm

@@ -18,7 +18,7 @@ var/global/list/limb_icon_cache = list()
 	h_col = null
 	if(robotic >= ORGAN_ROBOT)
 		var/datum/robolimb/franchise = all_robolimbs[model]
-		if(!(franchise && franchise.lifelike))
+		if(!(franchise && franchise.skin_tone))
 			if(human.synth_color)
 				s_col = list(human.r_synth, human.g_synth, human.b_synth)
 			return
@@ -36,7 +36,7 @@ var/global/list/limb_icon_cache = list()
 	h_col = null
 	if(robotic >= ORGAN_ROBOT)
 		var/datum/robolimb/franchise = all_robolimbs[model]
-		if(!(franchise && franchise.lifelike))
+		if(!(franchise && franchise.skin_tone))
 			return
 	if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)) && (species.appearance_flags & HAS_SKIN_TONE))
 		s_tone = dna.GetUIValue(DNA_UI_SKIN_TONE)

code/modules/organs/robolimbs.dm

@@ -21,7 +21,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	scroll=ipc_scroll;\
 	console=ipc_console;\
 	glider=ipc_gol_glider;\
-	rainnbow=ipc_rainbow;\
+	rainbow=ipc_rainbow;\
 	smiley=ipc_smiley;\
 	database=ipc_database"
 
@@ -40,6 +40,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	var/unavailable_at_chargen                           // If set, not available at chargen.
 	var/unavailable_to_build							 // If set, can't be constructed.
 	var/lifelike										 // If set, appears organic.
+	var/skin_tone										 // If set, applies skin tone rather than part color
 	var/blood_color = "#030303"
 	var/list/species_cannot_use = list("Teshari")
 	var/list/monitor_styles			 		 			 //If empty, the model of limbs offers a head compatible with monitors.
@@ -100,7 +101,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt2.dmi'
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
-	
+
 /datum/robolimb/cybersolutions_alt1
 	company = "Cyber Solutions - Wight"
 	desc = "This limb has cheap plastic panels mounted on grey metal."
@@ -198,6 +199,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/veymed/veymed_main.dmi'
 	unavailable_to_build = 1
 	lifelike = 1
+	skin_tone = 1
 	blood_color = "#CCCCCC"
 	speech_bubble_appearance = "normal"
 
@@ -220,7 +222,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi'
 	unavailable_to_build = 1
 
-
 /datum/robolimb/wardtakahashi_monitor
 	company = "Ward-Takahashi Monitor"
 	desc = "Ward-Takahashi's unique spin on a popular prosthetic head model. It looks sleek and modern."
@@ -278,6 +279,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	desc = "This limb has a rubbery fleshtone covering with visible seams."
 	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
 	unavailable_to_build = 1
+	skin_tone = 1
 
 /obj/item/weapon/disk/limb
 	name = "Limb Blueprints"

code/modules/paperwork/paper.dm

@@ -622,3 +622,7 @@
 
 /obj/item/weapon/paper/crumpled/bloody
 	icon_state = "scrap_bloodied"
+
+/obj/item/weapon/paper/crumpled/bloody/CrashedMedShuttle
+	name = "Blackbox Transcript - VMV Aurora's Light"
+	info = "<I>\[The paper is torn at the top, presumably from the impact. It's oil-stained, but you can just about read it.]</I><BR> <B>mmons 19:52:01:</B> Come on... it's right there in the distance, we're almost there!<BR> <B>Doctor Nazarril 19:52:26:</B> Odysseus online. Orrderrs, sirr?<BR> <B>Captain Simmons 19:52:29:</B> Brace for impact. We're going in full-speed.<BR> <B>Technician Dynasty 19:52:44:</B> Chief, fire's spread to the secondary propulsion systems.<BR> <B>Captain Simmons 19:52:51:</B> Copy. Any word from TraCon? Transponder's down still?<BR> <B>Technician Dynasty 19:53:02:</B> Can't get in touch, sir. Emergency beacon's active, but we're not going t-<BR> <B>Doctor Nazarril 19:53:08:</B> Don't say it. As long as we believe, we'll get through this.<BR> <B>Captain Simmons 19:53:11:</B> Damn right. We're a few klicks out from the port. Rough landing, but we can do it.<BR> <B>V.I.T.A 19:53:26:</B> Vessel diagnostics complete. Engines one, two, three offline. Engine four status: critical. Transponder offline. Fire alarm in the patient bay.<BR> <B>A loud explosion is heard.</B><BR> <B>V.I.T.A 19:53:29:</B> Alert: fuel intake valve open.<BR> <B>Technician Dynasty 19:53:31:</B> ... ah.<BR> <B>Doctor Nazarril 19:53:34:</B> Trrranslate?<BR> <B>V.I.T.A 19:53:37:</B> There is a 16.92% chance of this vessel safely landing at the emergency destination. Note that there is an 83.08% chance of detonation of fuel supplies upon landing.<BR> <B>Technician Dynasty 19:53:48:</B> We'll make it, sure, but we'll explode and take out half the LZ with us. Propulsion's down, we can't slow down. If we land there, everyone in that port dies, no question.<BR> <B>V.I.T.A 19:53:53:</B> The Technician is correct.<BR> <B>Doctor Nazarril 19:54:02:</B> Then... we can't land therrre.<BR> <B>V.I.T.A 19:54:11:</B>  Analysing... recommended course of action: attempt emergency landing in isolated area. Chances of survival: negligible. <BR> <B>Captain Simmons 19:54:27:</B> I- alright. I'm bringing us down. You all know what this means.<BR> <B>Doctor Nazarril 19:54:33:</B> Sh... I- I understand. It's been- it's been an honorr, Captain, Dynasty, VITA.<BR> <B>Technician Dynasty 19:54:39:</B> We had a good run. I'm going to miss this.<BR> <B>Captain Simmons 19:54:47:</B> VITA. Tell them we died heroes. Tell them... we did all we could.<BR> <B>V.I.T.A 19:54:48:</B> I will. Impact in five. Four. Three.<BR> <B>Doctor Nazarril 19:54:49:</B> Oh, starrs... I- you werrre all the... best frriends she everr had. Thank you.<BR> <B>Technician Dynasty 19:54:50:</B> Any time, kid. Any time.<BR> <B>V.I.T.A 19:54:41:</B> Two.<BR><B>V.I.T.A 19:54:42:</B> One.<BR> **8/DEC/2561**<BR> <B>V.I.T.A 06:22:16:</B> Backup power restored. Attempting to establish connection with emergency rescue personnel.<BR> <B>V.I.T.A 06:22:17:</B> Unable to establish connection. Transponder destroyed on impact.<BR> <B>V.I.T.A 06:22:18:</B> No lifesigns detected on board.<BR> **1/JAN/2562**<BR> <B>V.I.T.A 00:00:00:</B> Happy New Year, crew.<BR> <B>V.I.T.A 00:00:01:</B> Power reserves: 41%. Diagnostics offline. Cameras offline. Communications offline.<BR> <B>V.I.T.A 00:00:02:</B> Nobody's coming.<BR> **14/FEB/2562**<BR> <B>V.I.T.A 00:00:00:</B> Roses are red.<BR> <B>V.I.T.A 00:00:01:</B> Violets are blue.<BR> <B>V.I.T.A 00:00:02:</B> Won't you come back?<BR> <B>V.I.T.A 00:00:03:</B> I miss you.<BR> **15/FEB/2562**<BR><B>V.I.T.A 22:19:06:</B> Power reserves critical. Transferring remaining power to emergency broadcasting beacon.<BR> <B>V.I.T.A 22:19:07:</B> Should anyone find this, lay them to rest. They deserve a proper burial.<BR> <B>V.I.T.A 22:19:08:</B> Erasing files... shutting down.<BR> <B>A low, monotone beep.</B><BR> **16/FEB/2562**<BR> <B>Something chitters.</B><BR> <B>End of transcript.</B>"

code/modules/planet/sif.dm

@@ -234,6 +234,18 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to rain on them.
 
+			// If they have an open umbrella, it'll guard from rain
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Rain patters softly onto your umbrella</span>")
+					continue
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Rain patters softly onto your umbrella</span>")
+					continue
+
 			L.water_act(1)
 			to_chat(L, "<span class='warning'>Rain falls on you.</span>")
 
@@ -258,6 +270,20 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to rain on them.
 
+			// If they have an open umbrella, it'll get stolen by the wind
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='warning'>A gust of wind yanks the umbrella from your hand!</span>")
+					L.drop_from_inventory(U)
+					U.throw_at(get_edge_target_turf(U, pick(alldirs)), 8, 1, L)
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='warning'>A gust of wind yanks the umbrella from your hand!</span>")
+					L.drop_from_inventory(U)
+					U.throw_at(get_edge_target_turf(U, pick(alldirs)), 8, 1, L)
+
 			L.water_act(2)
 			to_chat(L, "<span class='warning'>Rain falls on you, drenching you in water.</span>")
 
@@ -282,6 +308,18 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to pelt them with ice.
 
+			// If they have an open umbrella, it'll guard from rain
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
+					continue
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
+					continue
+
 			var/target_zone = pick(BP_ALL)
 			var/amount_blocked = L.run_armor_check(target_zone, "melee")
 			var/amount_soaked = L.get_armor_soak(target_zone, "melee")

code/modules/power/cable.dm

@@ -882,6 +882,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN)
 	..()
 
+/obj/item/stack/cable_coil/random_belt/New()
+	stacktype = /obj/item/stack/cable_coil
+	color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE)
+	amount = 30
+	..()
+
 //Endless alien cable coil
 
 /obj/item/stack/cable_coil/alien

code/modules/projectiles/guns/energy/laser.dm

@@ -99,7 +99,7 @@
 	fire_delay = 20
 	w_class = ITEMSIZE_LARGE
 //	one_handed_penalty = 90 // The thing's heavy and huge.
-	accuracy = 3
+	accuracy = 45
 	charge_cost = 600
 
 /obj/item/weapon/gun/energy/lasercannon/mounted

code/modules/projectiles/guns/energy/nuclear.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/gun
 	name = "energy gun"
-	desc = "Another bestseller of Lawson Arms and the FTU, the LAEP90 Perun is a versatile energy based sidearm, capable of switching between low and high capacity projectile settings. In other words: Stun or Kill."
+	desc = "Another bestseller of Lawson Arms and "+TSC_HEPH+", the LAEP90 Perun is a versatile energy based sidearm, capable of switching between low and high capacity projectile settings. In other words: Stun or Kill."
 	icon_state = "energystun100"
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_delay = 10 // Handguns should be inferior to two-handed weapons.
@@ -64,4 +64,4 @@
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="nucgunstun", charge_cost = 240),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="nucgunkill", charge_cost = 480),
-		)
+		)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -160,6 +160,18 @@
 		L.adjust_fire_stacks(-(amount / 5))
 		remove_self(needed)
 
+/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_SLIME)
+		M.adjustToxLoss(6 * removed)
+	else
+		..()
+
+/datum/reagent/fuel/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_SLIME)
+		M.adjustToxLoss(6 * removed)
+	else
+		..()
+
 /datum/reagent/fuel
 	name = "Welding fuel"
 	id = "fuel"

code/modules/research/circuitprinter.dm

@@ -93,7 +93,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 		if(materials[f] >= SHEET_MATERIAL_AMOUNT)
 			var/path = getMaterialType(f)
 			if(path)
-				var/obj/item/stack/S = new f(loc)
+				var/obj/item/stack/S = new path(loc)
 				S.amount = round(materials[f] / SHEET_MATERIAL_AMOUNT)
 	..()
 

code/modules/research/designs.dm

@@ -491,13 +491,13 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/roller/adv
 	sort_string = "MBBAF"
 
-/datum/design/item/medical/enhanced_analyzer
-	name = "enhanced health analyzer"
+/datum/design/item/medical/improved_analyzer
+	name = "improved health analyzer"
 	desc = "A prototype version of the regular health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels."
-	id = "advanced_analyzer"
+	id = "improved_analyzer"
 	req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6)
 	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1500)
-	build_path = /obj/item/device/healthanalyzer/advanced
+	build_path = /obj/item/device/healthanalyzer/improved
 	sort_string = "MBBAG"
 
 /datum/design/item/implant

code/modules/research/rdconsole.dm

@@ -258,7 +258,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									qdel(S)
 									linked_destroy.icon_state = "d_analyzer"
 							else
-								if(!(I in linked_destroy.component_parts))
+								if(I != linked_destroy.circuit && !(I in linked_destroy.component_parts))
 									qdel(I)
 									linked_destroy.icon_state = "d_analyzer"
 

code/modules/shieldgen/shield_capacitor.dm

@@ -104,7 +104,7 @@
 
 	//see if we can connect to a power net.
 	var/datum/powernet/PN
-	var/turf/T = src.loc
+	var/turf/T = get_turf(src)
 	var/obj/structure/cable/C = T.get_cable_node()
 	if (C)
 		PN = C.powernet

code/modules/surgery/organs_internal.dm

@@ -73,7 +73,7 @@
 		return
 	var/is_organ_damaged = 0
 	for(var/obj/item/organ/I in affected.internal_organs)
-		if(I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			is_organ_damaged = 1
 			break
 	return ..() && is_organ_damaged
@@ -91,7 +91,7 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
 	for(var/obj/item/organ/I in affected.internal_organs)
-		if(I && I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			if(!(I.robotic >= ORGAN_ROBOT))
 				user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
 				"You start treating damage to [target]'s [I.name] with [tool_name]." )
@@ -111,11 +111,12 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
 	for(var/obj/item/organ/internal/I in affected.internal_organs)
-		if(I && I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			if(!(I.robotic >= ORGAN_ROBOT))
 				user.visible_message("<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>", \
 				"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>" )
 				I.damage = 0
+				I.status = 0
 				if(I.organ_tag == O_EYES)
 					target.sdisabilities &= ~BLIND
 				if(I.organ_tag == O_LUNGS)

code/modules/xenobio2/mob/slime/slime.dm

@@ -22,7 +22,7 @@ Slime definitions, Life and New live here.
 	var/shiny = 0
 	move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
 	default_chems = list("slimejelly" = 5)
-	attacktext = "absorbed some of"
+	attacktext = list("absorbed some of")
 	response_help = "pats"
 	response_disarm = "tries to stop"
 	response_harm = "hits"

code/modules/xenobio2/mob/xeno.dm

@@ -12,7 +12,7 @@ Also includes Life and New
 	desc = "Something's broken, yell at someone."
 	melee_damage_lower = 0
 	melee_damage_upper = 0
-	attacktext = "hit"
+	attacktext = list("hit")
 	attack_sound = null
 	friendly = "touches"
 	environment_smash = 0