Fixes

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm

@@ -210,7 +210,7 @@
 				/obj/item/weapon/reagent_containers/food/snacks/candiedapple, \
 				/obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \
 				/obj/item/weapon/reagent_containers/food/snacks/cookie, \
-				/obj/item/weapon/reagent_containers/food/snacks/faggot, \
+				/obj/item/weapon/reagent_containers/food/snacks/meatball, \
 				/obj/item/weapon/reagent_containers/food/snacks/plump_pie, \
 				)
 				for(var/i=0,i<num,i++)

code/game/gamemodes/blob/blob.dm

@@ -11,7 +11,7 @@ var/list/blob_nodes = list()
 	config_tag = "blob"
 
 	required_players = 15
-	required_players_secret = 25
+	required_players_secret = 15
 	restricted_jobs = list("Cyborg", "AI")
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)

code/game/gamemodes/changeling/changeling.dm

@@ -10,9 +10,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
 	required_players = 2
-	required_players_secret = 5
+	required_players_secret = 10
 	required_enemies = 1
-	recommended_enemies = 4
+	recommended_enemies = 2
 
 	uplink_welcome = "Syndicate Uplink Console:"
 	uplink_uses = 10

code/game/gamemodes/changeling/traitor_chan.dm

@@ -4,7 +4,7 @@
 	traitors_possible = 3 //hard limit on traitors if scaling is turned off
 	restricted_jobs = list("AI", "Cyborg")
 	required_players = 3
-	required_players_secret = 5
+	required_players_secret = 10
 	required_enemies = 2
 	recommended_enemies = 3
 

code/game/gamemodes/cult/cult.dm

@@ -23,7 +23,7 @@
 	restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain")
 	protected_jobs = list()
 	required_players = 5
-	required_players_secret = 10
+	required_players_secret = 15
 	required_enemies = 3
 	recommended_enemies = 4
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -6,9 +6,9 @@
 	name = "nuclear emergency"
 	config_tag = "nuclear"
 	required_players = 6
-	required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining
-	required_enemies = 5
-	recommended_enemies = 5
+	required_players_secret = 15 // 25 players - 5 players to be the nuke ops = 20 players remaining
+	required_enemies = 3
+	recommended_enemies = 4
 
 	uplink_welcome = "Corporate Backed Uplink Console:"
 	uplink_uses = 40

code/game/gamemodes/vox/heist/heist.dm

@@ -11,7 +11,7 @@ VOX HEIST ROUNDTYPE
 	required_players = 15
 	required_players_secret = 15
 	required_enemies = 4
-	recommended_enemies = 6
+	recommended_enemies = 5
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)

code/game/gamemodes/vox/trade/trade.dm

@@ -11,8 +11,8 @@ VOX TRADE ROUNDTYPE
 	config_tag = "trade"
 	required_players = 10
 	required_players_secret = 10
-	required_enemies = 4
-	recommended_enemies = 6
+	required_enemies = 1
+	recommended_enemies = 3
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)

code/game/jobs/job_objective.dm

@@ -36,7 +36,7 @@
 	return completed
 
 /datum/job_objective/proc/check_for_completion()
-	return 0
+	return per_unit && units_completed > 0
 
 /datum/game_mode/proc/declare_job_completion()
 	var/text = "<FONT size = 2><B>Job Completion:</B></FONT>"

code/game/machinery/kitchen/processor.dm

@@ -27,19 +27,19 @@
 	/* objs */
 	meat
 		input = /obj/item/weapon/reagent_containers/food/snacks/meat
-		output = /obj/item/weapon/reagent_containers/food/snacks/faggot
+		output = /obj/item/weapon/reagent_containers/food/snacks/meatball
 
 	meat2
 		input = /obj/item/weapon/syntiflesh
-		output = /obj/item/weapon/reagent_containers/food/snacks/faggot
+		output = /obj/item/weapon/reagent_containers/food/snacks/meatball
 /*
 	monkeymeat
 		input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
-		output = /obj/item/weapon/reagent_containers/food/snacks/faggot
+		output = /obj/item/weapon/reagent_containers/food/snacks/meatball
 
 	humanmeat
 		input = /obj/item/weapon/reagent_containers/food/snacks/meat/human
-		output = /obj/item/weapon/reagent_containers/food/snacks/faggot
+		output = /obj/item/weapon/reagent_containers/food/snacks/meatball
 */
 	potato
 		input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato

code/game/sound.dm

@@ -8,6 +8,7 @@
 		if ("rustle") soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg')
 		if ("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')
 		if ("clownstep") soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')
+		if ("jackboot") soundin = pick('sound/effects/jackboot1.ogg','sound/effects/jackboot2.ogg')
 		if ("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
 		if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
 		if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
@@ -72,6 +73,7 @@
 		if ("rustle") soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg')
 		if ("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')
 		if ("clownstep") soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')
+		if ("jackboot") soundin = pick('sound/effects/jackboot1.ogg','sound/effects/jackboot2.ogg')
 		if ("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
 		if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
 

code/game/turfs/simulated.dm

@@ -39,6 +39,12 @@
 						O.footstep++
 				else
 					playsound(src, "clownstep", 20, 1)
+			if(istype(H.shoes, /obj/item/clothing/shoes/jackboots))
+//				var/obj/item/clothing/shoes/jackboots/O = H.shoes
+				if(H.m_intent == "run")
+					playsound(src, "jackboot", 50, 1) // this will get annoying very fast.
+				else
+					playsound(src, "jackboot", 20, 1)
 
 			var/list/bloodDNA = null
 			if(H.shoes)

code/modules/clothing/shoes/miscellaneous.dm

@@ -88,7 +88,7 @@
 	item_state = "jackboots"
 	_color = "hosred"
 	siemens_coefficient = 0.7
-
+	var/footstep=1
 /obj/item/clothing/shoes/cult
 	name = "boots"
 	desc = "A pair of boots worn by the followers of Nar-Sie."

code/modules/food/recipes_microwave.dm

@@ -2,7 +2,7 @@
 // see code/datums/recipe.dm
 
 
-/* No telebacon. just no...
+
 /datum/recipe/telebacon
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -10,14 +10,14 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
 
-I said no!
+
 /datum/recipe/syntitelebacon
 	items = list(
 		/obj/item/weapon/syntiflesh,
 		/obj/item/device/assembly/signaler
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
-*/
+
 
 /datum/recipe/friedegg
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
@@ -122,14 +122,14 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
 
-/* NO FUN ALLOWED
+
 /datum/recipe/roburger
+	reagents = list("flour" = 5)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
 		/obj/item/robot_parts/head
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/roburger
-*/
+
 
 /datum/recipe/xenoburger
 	reagents = list("flour" = 5)
@@ -192,7 +192,7 @@ I said no!
 /datum/recipe/donkpocket
 	reagents = list("flour" = 5)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
 	proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
@@ -592,7 +592,7 @@ I said no!
 /datum/recipe/meatballsoup
 	reagents = list("water" = 10)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/faggot ,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball ,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
 	)
@@ -848,8 +848,8 @@ I said no!
 	reagents = list("water" = 5)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/spagetti,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
 
@@ -857,10 +857,10 @@ I said no!
 	reagents = list("water" = 5)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/spagetti,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
 
@@ -1037,7 +1037,7 @@ I said no!
 
 /datum/recipe/sausage
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -1135,7 +1135,7 @@ I said no!
 		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-		/obj/item/weapon/reagent_containers/food/snacks/faggot,
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
 	make_food(var/obj/container as obj)

code/modules/mob/language.dm

@@ -56,7 +56,7 @@
 	desc = "Languages of slimes, a mixture of bubbling noises and pops. Almost impossible to speak without mechanical aid for non slime people."
 	speech_verb = "bubbles and pops"
 	colour = "slime"
-	key = "sl"
+	key = "f"
 	flags = RESTRICTED
 
 /datum/language/human

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

@@ -149,7 +149,7 @@ var/list/ai_list = list()
 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
 	if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
-	else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
+	else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Clown", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
 	switch(icontype)
 		if("Custom") icon_state = "[src.ckey]-ai"
 		if("Clown") icon_state = "ai-clown2"

code/modules/mob/new_player/sprite_accessories.dm

@@ -51,7 +51,7 @@
 		name = "Bald"
 		icon_state = "bald"
 		gender = MALE
-		species_allowed = list("Human","Unathi")
+		species_allowed = list("Human","Unathi","Vox","Diona","Skellington","Kidan")
 
 	short
 		name = "Short Hair"	  // try to capatilize the names please~
@@ -288,10 +288,6 @@
 		icon_state = "hair_e"
 		gender = MALE // turnoff!
 
-
-	bald
-		name = "Bald"
-		icon_state = "bald"
 /*
 ///////////////////////////////////
 /  =---------------------------=  /

code/modules/mob/say.dm

@@ -90,6 +90,8 @@
 		return 1
 	else if (istype(other, src.type) || istype(src, other.type))
 		return 1
+	else if (istype(other, /mob/living/carbon/human) && istype(src, /mob/living/carbon/human))
+		return 1
 	return 0
 
 /mob/proc/say_quote(var/text,var/datum/language/speaking)

code/modules/power/apc.dm

@@ -193,7 +193,7 @@
 		icon_state = "[ cell ? "apc2" : "apc1" ]"       // if opened, show cell if it's inserted
 		if (overlays.len) overlays.len = 0               // also delete all overlays
 		return
-	else if(emagged)
+	else if(emagged || malfhack)
 		icon_state = "apcemag"
 		if (overlays.len) overlays.len = 0
 		return
@@ -957,6 +957,7 @@
 					else
 						src.malfai = usr
 					malfai << "Hack complete. The APC is now under your exclusive control."
+					src.malfhack = 1
 					update_icon()
 
 	else if (href_list["occupyapc"])

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -600,10 +600,10 @@
 		reagents.add_reagent("nutriment", 3)
 		src.bitesize = 6
 
-/obj/item/weapon/reagent_containers/food/snacks/faggot
-	name = "Faggot"
-	desc = "A great meal all round. Not a cord of wood."
-	icon_state = "faggot"
+/obj/item/weapon/reagent_containers/food/snacks/meatball
+	name = "Meatball"
+	desc = "A great meal all round."
+	icon_state = "meatball"
 	New()
 		..()
 		reagents.add_reagent("nutriment", 3)
@@ -1303,7 +1303,7 @@
 		reagents.add_reagent("tomatojuice", 2)
 		bitesize = 5
 
-/* No more of this
+
 /obj/item/weapon/reagent_containers/food/snacks/telebacon
 	name = "Tele Bacon"
 	desc = "It tastes a little odd but it is still delicious."
@@ -1318,7 +1318,7 @@
 		if(!reagents.total_volume)
 			baconbeacon.loc = usr
 			baconbeacon.digest_delay()
-*/
+
 
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube
 	name = "monkey cube"