Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413

[MIRROR] Removes useless commented-out what-if code from the 1970s

code/modules/mining/machine_processing.dm

@@ -143,27 +143,6 @@
 		if(CONSOLE)
 			CONSOLE.updateUsrDialog()
 
-
-			//THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT.
-			//They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage
-			//Even in the dark year of 2016, where /tg/ is dead, Urist still hasn't finished this -Bawhoppennn
-			/*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
-				if (ore_uranium >= 2 && ore_diamond >= 1)
-					ore_uranium -= 2
-					ore_diamond -= 1
-					generate_mineral(/obj/item/stack/sheet/mineral/adamantine)
-				else
-					on = FALSE
-				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
-				if (ore_silver >= 1 && ore_plasma >= 3)
-					ore_silver -= 1
-					ore_plasma -= 3
-					generate_mineral(/obj/item/stack/sheet/mineral/mythril)
-				else
-					on = FALSE
-				continue*/
-
 /obj/machinery/mineral/processing_unit/proc/smelt_ore()
 	GET_COMPONENT(materials, /datum/component/material_container)
 	var/datum/material/mat = materials.materials[selected_material]
@@ -221,4 +200,4 @@
 	materials.retrieve_all()
 	..()
 
-#undef SMELT_AMOUNT
+#undef SMELT_AMOUNT

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

@@ -246,7 +246,7 @@
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(FALSE)
 
-	regenerate_organs(C,old_species)		
+	regenerate_organs(C,old_species)
 
 	if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype)
 		C.dna.blood_type = exotic_bloodtype
@@ -1632,9 +1632,6 @@
 	else
 		H.clear_alert("temp")
 
-	// Account for massive pressure differences.  Done by Polymorph
-	// Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense!
-
 	var/pressure = environment.return_pressure()
 	var/adjusted_pressure = H.calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
 	switch(adjusted_pressure)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -55,14 +55,6 @@ Borg Hypospray
 	//update_icon()
 	return 1
 
-// Purely for testing purposes I swear~ //don't lie to me
-/*
-/obj/item/reagent_containers/borghypo/verb/add_cyanide()
-	set src in world
-	add_reagent("cyanide")
-*/
-
-
 // Use this to add more chemicals for the borghypo to produce.
 /obj/item/reagent_containers/borghypo/proc/add_reagent(reagent)
 	reagent_ids |= reagent

code/modules/research/designs/weapon_designs.dm

@@ -124,19 +124,6 @@
 	build_path = /obj/item/grenade/chem_grenade/pyro
 	category = list("Weapons")
 
-/* // Currently commented out, because it has no worthwhile useage yet.
-
-/datum/design/cryo_grenade
-	name = "Cryo Grenade"
-	desc = "An advanced grenade that rapidly cools its contents upon detonation."
-	id = "cryo_Grenade"
-	req_tech = list("combat" = 3, "materials" = 3)
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 2000, MAT_SILVER = 500)
-	build_path = /obj/item/grenade/chem_grenade/cryo
-	category = list("Weapons")
-*/
-
 /datum/design/adv_grenade
 	name = "Advanced Release Grenade"
 	desc = "An advanced grenade that can be detonated several times, best used with a repeating igniter."