Merge pull request #3493 from Zuhayr/master

Click delay fixes (part 1)

code/game/gamemodes/events/biomass.dm

@@ -22,6 +22,9 @@
 
 /obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (!W || !user || !W.type) return
+
+	user.delay_click(10)
+
 	switch(W.type)
 		if(/obj/item/weapon/circular_saw) del src
 		if(/obj/item/weapon/kitchen/utensil/knife) del src

code/game/objects/items/weapons/RCD.dm

@@ -86,6 +86,8 @@ RCD
 		if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
 			return 0
 
+		user.delay_click(10)
+
 		switch(mode)
 			if(1)
 				if(istype(A, /turf/space))

code/modules/client/preferences.dm

@@ -806,7 +806,7 @@ datum/preferences
 
 						if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
 							for(var/S in whitelisted_species)
-								if(is_alien_whitelisted(user,S))
+								if(is_alien_whitelisted(user,S) || (S == "Unathi" && is_alien_whitelisted(user,"Soghun")))
 									new_species += S
 									whitelisted = 1
 							if(!whitelisted)

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

@@ -49,7 +49,11 @@
 	. = ..()
 
 /mob/living/carbon/attack_hand(mob/M as mob)
+
 	if(!istype(M, /mob/living/carbon)) return
+
+	M.delay_click(10)
+
 	if (hasorgans(M))
 		var/datum/organ/external/temp = M:organs_by_name["r_hand"]
 		if (M.hand)
@@ -76,6 +80,8 @@
 /mob/living/carbon/attack_paw(mob/M as mob)
 	if(!istype(M, /mob/living/carbon)) return
 
+	M.delay_click(10)
+
 	for(var/datum/disease/D in viruses)
 
 		if(D.spread_by_touch())

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

@@ -217,6 +217,8 @@
 		M << "No attacking people at spawn, you jackass."
 		return
 
+	M.delay_click(10)
+
 	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
 		var/obj/item/clothing/gloves/G = M.gloves
 		if(G.cell)

code/modules/mob/mob.dm

@@ -83,6 +83,7 @@
 //This is awful
 /mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
+	user.delay_click(10)
 	//Holding a balloon will shield you from an item that is_sharp() ... cause that makes sense
 	if (user.intent != "harm")
 		if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W))
@@ -960,4 +961,4 @@ mob/verb/yank_out_object()
 			pinned -= O
 		if(!pinned.len)
 			anchored = 0
-	return 1
+	return 1

code/modules/mob/new_player/new_player.dm

@@ -351,7 +351,7 @@
 		if(client.prefs.species)
 			chosen_species = all_species[client.prefs.species]
 		if(chosen_species)
-			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED))
+			if(is_alien_whitelisted(src, client.prefs.species) || (client.prefs.species == "Unathi" && is_alien_whitelisted(src, "Soghun")) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED))
 				new_character.set_species(client.prefs.species)
 				if(chosen_species.language)
 					new_character.add_language(chosen_species.language)