[MIRROR] Pre-vox modpack cleanup.

code/__defines/mobs.dm

@@ -181,9 +181,6 @@
 #define BP_ANCHOR   "anchoring ligament"
 #define BP_ACETONE  "acetone reactor"
 
-// Vox bits.
-#define BP_HINDTONGUE "hindtongue"
-
 // Robo Organs.
 #define BP_POSIBRAIN         "posibrain"
 #define BP_VOICE             "vocal synthesiser"

code/game/antagonist/antagonist_equip.dm

@@ -12,7 +12,7 @@
 		for(var/obj/item/thing in player.contents)
 			if(player.canUnEquip(thing))
 				qdel(thing)
-		//mainly for vox antag compatibility. Should not effect item spawning.
+		//mainly for nonhuman antag compatibility. Should not effect item spawning.
 		player.species.equip_survival_gear(player)
 	return 1
 

code/game/gamemodes/cult/runes.dm

@@ -407,7 +407,7 @@
 		user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes_str)
 
 	O = user.get_equipped_item(slot_back_str)
-	if(istype(O, /obj/item/storage) && !istype(O, /obj/item/storage/backpack/cultpack) && user.unEquip(O)) // We don't want to make the vox drop their nitrogen tank, though
+	if(istype(O, /obj/item/storage) && !istype(O, /obj/item/storage/backpack/cultpack) && user.unEquip(O)) 
 		var/obj/item/storage/backpack/cultpack/C = new /obj/item/storage/backpack/cultpack(user)
 		user.equip_to_slot_or_del(C, slot_back_str)
 		if(C)

code/game/machinery/computer/arcade_orion.dm

@@ -115,7 +115,7 @@
 					event_title  += ": [stops[port]]"
 					event_actions = "<a href='?src=\ref[src];continue=1'>Shove off</a>"
 				if(ORION_TRAIL_RAIDERS)
-					event_desc   = "You arm yourselves as you prepare to fight off the vox menace!"
+					event_desc   = "You arm yourselves as you prepare to fight off the alien menace!"
 				if(ORION_TRAIL_DERELICT)
 					event_desc = "You come across an unpowered ship drifting slowly in the vastness of space. Sensors indicate there are no lifeforms aboard."
 				if(ORION_TRAIL_ILLNESS)

code/game/machinery/vending/misc.dm

@@ -111,7 +111,7 @@
 	name = "Lavatory Essentials"
 	desc = "Vends things that make you less reviled in the work-place!"
 	vend_delay = 15
-	product_slogans = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of vox taint? Take a shower!"
+	product_slogans = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of scale taint? Take a shower!"
 
 	icon_state = "lavatory"
 	icon_deny = "lavatory-deny"

code/game/objects/items/weapons/material/knives.dm

@@ -108,7 +108,7 @@
 	material = /decl/material/solid/glass
 
 /obj/item/knife/combat/titanium
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 
 //random stuff
 /obj/item/knife/hook
@@ -141,5 +141,5 @@
 /obj/item/knife/utility/lightweight
 	name = "lightweight utility knife"
 	desc = "A lightweight utility knife made out of a titanium alloy."
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 	draw_handle = FALSE

code/game/objects/items/weapons/material/misc.dm

@@ -73,7 +73,7 @@
 	item_state = "machete"
 	w_class = ITEM_SIZE_NORMAL
 	slot_flags = SLOT_LOWER_BODY
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 	base_parry_chance = 50
 	max_force = 20
 	material_force_multiplier = 0.20 //20 with hardness 80 (titanium) or 15 with hardness 60 (steel)

code/game/objects/items/weapons/material/swords.dm

@@ -75,7 +75,7 @@
 /obj/item/sword/katana/vibro
 	name = "vibrokatana"
 	desc = "A high-tech take on a woefully underpowered weapon. Can't mistake its sound for anything."
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 	hitsound = 'sound/weapons/anime_sword.wav'
 
 /obj/item/sword/katana/vibro/equipped(mob/living/user, slot)

code/game/objects/items/weapons/storage/boxes.dm

@@ -91,17 +91,6 @@
 					/obj/item/oxycandle = 1,
 					/obj/item/crowbar/cheap = 1)
 
-/obj/item/storage/box/vox/
-	name = "vox survival kit"
-	desc = "A box decorated in warning colors that contains a limited supply of survival tools. The panel and black stripe indicate this one contains nitrogen."
-	icon_state = "survivalvox"
-	startswith = list(/obj/item/clothing/mask/breath = 1,
-					/obj/item/tank/emergency/nitrogen = 1,
-					/obj/item/chems/hypospray/autoinjector = 1,
-					/obj/item/stack/medical/bruise_pack = 1,
-					/obj/item/flashlight/flare/glowstick = 1,
-					/obj/item/chems/food/snacks/candy/proteinbar = 1)
-
 /obj/item/storage/box/engineer/
 	name = "engineer survival kit"
 	desc = "A box decorated in warning colors that contains a limited supply of survival tools. The panel and orange stripe indicate this one as the engineering variant."

code/game/objects/random/random.dm

@@ -970,7 +970,6 @@ something, make sure it's not in one of the other lists.*/
 				/obj/random/voidsuit = 10,
 				/obj/random/hardsuit = 10,
 				/obj/item/clothing/mask/muzzle = 7,
-				/obj/item/clothing/mask/gas/vox = 8,
 				/obj/item/clothing/mask/gas/syndicate = 10,
 				/obj/item/clothing/glasses/night = 3,
 				/obj/item/clothing/glasses/thermal = 1,

code/game/objects/structures/wall_frame.dm

@@ -166,7 +166,7 @@
 	paint_color = COLOR_WALL_GUNMETAL
 
 /obj/structure/wall_frame/titanium
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 
 /obj/structure/wall_frame/hull
 	paint_color = COLOR_HULL

code/game/turfs/simulated/wall_types.dm

@@ -38,12 +38,12 @@
 
 /turf/simulated/wall/titanium
 	color = COLOR_SILVER
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 
 /turf/simulated/wall/r_titanium
 	icon_state = "reinforced_solid"
-	material = /decl/material/solid/metal/plasteel/titanium
-	reinf_material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
+	reinf_material = /decl/material/solid/metal/titanium
 
 /turf/simulated/wall/ocp_wall
 	color = COLOR_GUNMETAL
@@ -69,12 +69,12 @@
 	icon_state = "wood"
 	material = /decl/material/solid/wood/walnut
 
-/turf/simulated/wall/voxshuttle
+/turf/simulated/wall/raidershuttle
 	color = COLOR_GREEN_GRAY
 	icon_state = "metal"
-	material = /decl/material/solid/metal/voxalloy
+	material = /decl/material/solid/metal/alienalloy
 
-/turf/simulated/wall/voxshuttle/attackby()
+/turf/simulated/wall/raidershuttle/attackby()
 	return
 
 //Alien metal walls

code/modules/clothing/masks/gasmask.dm

@@ -186,34 +186,6 @@
 	item_state = "owl"
 	body_parts_covered = SLOT_HEAD|SLOT_FACE|SLOT_EYES
 
-//Vox Unique Masks
-
-/obj/item/clothing/mask/gas/vox
-	name = "vox breathing mask"
-	desc = "A small oxygen filter for use by Vox"
-	icon_state = "respirator"
-	item_state = "respirator"
-	flags_inv = 0
-	body_parts_covered = 0
-	filtered_gases = list(/decl/material/gas/oxygen)
-
-
-/obj/item/clothing/mask/gas/swat/vox
-	name = "alien mask"
-	desc = "Clearly not designed for a human face."
-	icon_state = "voxswat"
-	item_state = "voxswat"
-	body_parts_covered = SLOT_EYES
-	filtered_gases = list(
-		/decl/material/gas/oxygen,
-		/decl/material/gas/nitrous_oxide,
-		/decl/material/gas/chlorine,
-		/decl/material/gas/ammonia,
-		/decl/material/gas/carbon_monoxide,
-		/decl/material/gas/methyl_bromide,
-		/decl/material/gas/methane
-		)
-
 /obj/item/clothing/mask/gas/aquabreather
 	name = "aquabreather"
 	desc = "A compact CO2 scrubber and breathing apparatus that draws oxygen from water."

code/modules/emotes/definitions/audible.dm

@@ -168,11 +168,6 @@
 	emote_message_3p = "USER chitters."
 	emote_sound = 'sound/voice/Bug.ogg'
 
-/decl/emote/audible/vox_shriek
-	key ="shriek"
-	emote_message_3p = "USER SHRIEKS!"
-	emote_sound = 'sound/voice/shriek1.ogg'
-
 /decl/emote/audible/roar
 	key = "roar"
 	emote_message_3p = "USER roars!"

code/modules/integrated_electronics/subtypes/input.dm

@@ -1079,7 +1079,7 @@
 		/decl/material/solid/gemstone/diamond, 
 		/decl/material/solid/metal/uranium,
 		/decl/material/solid/metal/plasteel,
-		/decl/material/solid/metal/plasteel/titanium,
+		/decl/material/solid/metal/titanium,
 		/decl/material/solid/glass,
 		/decl/material/solid/plastic
 	)

code/modules/materials/_materials.dm

@@ -138,7 +138,6 @@
 	var/removed_by_welder
 
 	// Mining behavior.
-	var/alloy_product
 	var/ore_name
 	var/ore_desc
 	var/ore_smelts_to

code/modules/materials/definitions/solids/materials_solid_metal.dm

@@ -190,7 +190,6 @@
 	hardness = MAT_VALUE_VERY_HARD
 	stack_origin_tech = "{'materials':2}"
 	hitsound = 'sound/weapons/smash.ogg'
-	alloy_product = TRUE
 	value = 1.4
 	reflectiveness = MAT_VALUE_MATTE
 
@@ -202,7 +201,7 @@
 	. += new/datum/stack_recipe/furniture/crate(src)
 	. += new/datum/stack_recipe/grip(src)
 
-/decl/material/solid/metal/plasteel/titanium
+/decl/material/solid/metal/titanium
 	name = "titanium"
 	lore_text = "A light, strong, corrosion-resistant metal. Perfect for cladding high-velocity ballistic supply pods."
 	brute_armor = 10
@@ -217,6 +216,19 @@
 	icon_reinf = 'icons/turf/walls/reinforced_metal.dmi'
 	construction_difficulty = MAT_VALUE_VERY_HARD_DIY
 	value = 1.5
+	explosion_resistance = 25
+	hardness = MAT_VALUE_VERY_HARD
+	stack_origin_tech = "{'materials':2}"
+	hitsound = 'sound/weapons/smash.ogg'
+	reflectiveness = MAT_VALUE_MATTE
+
+/decl/material/solid/metal/titanium/generate_recipes(var/reinforce_material)
+	. = ..()
+	if(reinforce_material)	//recipes below don't support composite materials
+		return
+	. += new/datum/stack_recipe/ai_core(src)
+	. += new/datum/stack_recipe/furniture/crate(src)
+	. += new/datum/stack_recipe/grip(src)
 
 /decl/material/solid/metal/plasteel/ocp
 	name = "osmium-carbide plasteel"
@@ -275,7 +287,7 @@
 	M.add_chemical_effect(CE_BLOODRESTORE, 8 * removed)
 
 // Adminspawn only, do not let anyone get this.
-/decl/material/solid/metal/voxalloy
+/decl/material/solid/metal/alienalloy
 	name = "dense alloy"
 	stack_type = null
 	color = "#6c7364"
@@ -289,7 +301,7 @@
 	value = 3
 
 // Likewise.
-/decl/material/solid/metal/voxalloy/elevatorium
+/decl/material/solid/metal/alienalloy/elevatorium
 	name = "elevator panelling"
 	color = "#666666"
 	hidden_from_codex = TRUE

code/modules/materials/definitions/solids/materials_solid_mineral.dm

@@ -252,7 +252,7 @@
 	stack_type = null
 	color = "#d8ad97"
 	heating_products = list(
-		/decl/material/solid/metal/plasteel/titanium = 0.8,
+		/decl/material/solid/metal/titanium = 0.8,
 		/decl/material/solid/slag = 0.2
 	)
 	heating_point = GENERIC_SMELTING_HEAT_POINT

code/modules/materials/material_sheets.dm

@@ -319,7 +319,7 @@
 	name = "titanium"
 	icon_state = "sheet"
 	plural_icon_state = "sheet-mult"
-	material = /decl/material/solid/metal/plasteel/titanium
+	material = /decl/material/solid/metal/titanium
 
 /obj/item/stack/material/titanium/ten
 	amount = 10

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

@@ -23,8 +23,8 @@
 		whispering = TRUE
 
 	message = sanitize(message)
-	var/obj/item/organ/internal/voicebox/vox = locate() in internal_organs
-	var/snowflake_speak = (speaking && (speaking.flags & (NONVERBAL|SIGNLANG))) || (vox && vox.is_usable() && vox.assists_languages[speaking])
+	var/obj/item/organ/internal/voicebox/voice = locate() in internal_organs
+	var/snowflake_speak = (speaking && (speaking.flags & (NONVERBAL|SIGNLANG))) || (voice && voice.is_usable() && voice.assists_languages[speaking])
 	if(!isSynthetic() && need_breathe() && failed_last_breath && !snowflake_speak)
 		var/obj/item/organ/internal/lungs/L = internal_organs_by_name[species.breathing_organ]
 		if(!L || L.breath_fail_ratio > 0.9)

code/modules/mob/living/simple_animal/hostile/voxslug.dm → code/modules/mob/living/simple_animal/hostile/slug.dm

@@ -2,13 +2,13 @@
 Small, little HP, poisonous.
 */
 
-/mob/living/simple_animal/hostile/voxslug
+/mob/living/simple_animal/hostile/slug
 	name = "slug"
-	desc = "A viscious little creature, it has a mouth of too many teeth and a penchant for blood."
-	icon_state = "voxslug"
-	icon_living = "voxslug"
-	item_state = "voxslug"
-	icon_dead = "voxslug_dead"
+	desc = "A vicious, viscous little creature, it has a mouth of too many teeth and a penchant for blood."
+	icon_state = "slug"
+	icon_living = "slug"
+	item_state = "slug"
+	icon_dead = "slug_dead"
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "stamps on"
@@ -23,43 +23,49 @@ Small, little HP, poisonous.
 	can_escape = TRUE
 	pass_flags = PASS_FLAG_TABLE
 	natural_weapon = /obj/item/natural_weapon/bite
-	holder_type = /obj/item/holder/voxslug
+	holder_type = /obj/item/holder/slug
 	faction = "Hostile Fauna"
 
-/mob/living/simple_animal/hostile/voxslug/ListTargets(var/dist = 7)
+/mob/living/simple_animal/hostile/slug/proc/check_friendly_species(var/mob/living/carbon/human/H)
+	if(isliving(H))
+		var/mob/living/M = H
+		if(M.faction == faction)
+			return TRUE
+	return FALSE
+
+/mob/living/simple_animal/hostile/slug/ListTargets(var/dist = 7)
 	var/list/L = list()
 	for(var/a in hearers(src, dist))
-		if(isliving(a))
-			var/mob/living/M = a
-			if(M.faction == faction)
-				continue
-		L += a
-
+		if(!check_friendly_species(a))
+			L += a
 	return L
 
-/mob/living/simple_animal/hostile/voxslug/get_scooped(var/mob/living/carbon/grabber)
-	to_chat(grabber, "<span class='warning'>\The [src] wriggles out of your hands before you can pick it up!</span>")
+/mob/living/simple_animal/hostile/slug/get_scooped(var/mob/living/carbon/grabber)
+	if(check_friendly_species(grabber))
+		..()
+	else
+		to_chat(grabber, "<span class='warning'>\The [src] wriggles out of your hands before you can pick it up!</span>")
 
-/mob/living/simple_animal/hostile/voxslug/proc/attach(var/mob/living/carbon/human/H)
+/mob/living/simple_animal/hostile/slug/proc/attach(var/mob/living/carbon/human/H)
 	var/obj/item/clothing/suit/space/S = H.get_covering_equipped_item_by_zone(BP_CHEST)
 	if(istype(S) && !length(S.breaches))
 		S.create_breaches(BRUTE, 20)
 		if(!length(S.breaches)) //unable to make a hole
 			return
 	var/obj/item/organ/external/chest = H.organs_by_name[BP_CHEST]
-	var/obj/item/holder/voxslug/holder = new(get_turf(src))
+	var/obj/item/holder/slug/holder = new(get_turf(src))
 	src.forceMove(holder)
 	chest.embed(holder,0,"\The [src] latches itself onto \the [H]!")
 	holder.sync(src)
 
-/mob/living/simple_animal/hostile/voxslug/AttackingTarget()
+/mob/living/simple_animal/hostile/slug/AttackingTarget()
 	. = ..()
 	if(istype(., /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = .
 		if(prob(H.getBruteLoss()/2))
 			attach(H)
 
-/mob/living/simple_animal/hostile/voxslug/Life()
+/mob/living/simple_animal/hostile/slug/Life()
 	. = ..()
 	if(. && istype(src.loc, /obj/item/holder) && isliving(src.loc.loc)) //We in somebody
 		var/mob/living/L = src.loc.loc
@@ -69,8 +75,8 @@ Small, little HP, poisonous.
 			var/datum/reagents/R = L.reagents
 			R.add_reagent(/decl/material/liquid/presyncopics, 0.5)
 
-/obj/item/holder/voxslug/attack(var/mob/target, var/mob/user)
-	var/mob/living/simple_animal/hostile/voxslug/V = contents[1]
+/obj/item/holder/slug/attack(var/mob/target, var/mob/user)
+	var/mob/living/simple_animal/hostile/slug/V = contents[1]
 	if(!V.stat && istype(target, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = target
 		if(!do_mob(user, H, 30))