Merge pull request #603 from SoundScopes/master

UPdates

code/modules/admin/topic.dm

@@ -297,7 +297,7 @@
 			if("queen")				M.change_mob_type( /mob/living/carbon/alien/humanoid/queen , null, null, delmob )
 			if("sentinel")			M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob )
 			if("larva")				M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob )
-			if("nymph")				M.change_mob_type( /mob/living/carbon/alien/diona , null, null, delmob )
+			if("nymph")				M.change_mob_type( /mob/living/carbon/monkey/diona , null, null, delmob )
 			if("human")				M.change_mob_type( /mob/living/carbon/human , null, null, delmob )
 			if("slime")				M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
 			if("monkey")			M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
@@ -2843,6 +2843,10 @@
 		if(!check_rights(R_ADMIN|R_MOD))	return
 		var/mob/M = locate(href_list["admindibs"])
 
+		if(!M || !M.client)
+			usr << "<font color=red><b>The client has lost connection.</b></font>"
+			return
+
 		if(M.client.adminhelped == 2)
 			log_admin("[key_name(usr)] called dibs on [key_name(M)]'s adminhelp!")
 			message_admins("[key_name_admin(usr)] has called dibs on [key_name_admin(M)]'s adminhelp!")

code/modules/hydroponics/seed_mobs.dm

@@ -25,7 +25,7 @@
 /datum/seed/proc/request_player(var/mob/living/host)
 	if(!host) return
 	for(var/mob/dead/observer/O in player_list)
-		if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(O, "Diona") && config.usealienwhitelist))
+		if(jobban_isbanned(O, "Dionaea"))
 			continue
 		if(O.client)
 			if(O.client.prefs.be_special & BE_PLANT && !(O.client in currently_querying))

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

@@ -208,7 +208,7 @@
 
 	//These only pertain to common. Languages are handled by mob/say_understands()
 	if (!speaking)
-		if (istype(other, /mob/living/carbon/alien/diona))
+		if (istype(other, /mob/living/carbon/monkey/diona))
 			if(other.languages.len >= 2) //They've sucked down some blood and can speak common now.
 				return 1
 		if (istype(other, /mob/living/silicon))

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

@@ -382,7 +382,7 @@
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
 	language = "Rootspeak"
 	unarmed_type = /datum/unarmed_attack/diona
-	primitive = /mob/living/carbon/alien/diona
+	primitive = /mob/living/carbon/monkey/diona
 	slowdown = 7
 	rarity_value = 3
 
@@ -416,7 +416,7 @@
 	reagent_tag = IS_DIONA
 
 /datum/species/diona/can_understand(var/mob/other)
-	var/mob/living/carbon/alien/diona/D = other
+	var/mob/living/carbon/monkey/diona/D = other
 	if(istype(D))
 		return 1
 	return 0
@@ -427,12 +427,12 @@
 
 /datum/species/diona/handle_death(var/mob/living/carbon/human/H)
 
-	var/mob/living/carbon/alien/diona/S = new(get_turf(H))
+	var/mob/living/carbon/monkey/diona/S = new(get_turf(H))
 
 	if(H.mind)
 		H.mind.transfer_to(S)
 
-	for(var/mob/living/carbon/alien/diona/D in H.contents)
+	for(var/mob/living/carbon/monkey/diona/D in H.contents)
 		if(D.client)
 			D.loc = H.loc
 		else

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

@@ -265,3 +265,6 @@
 		return
 
 	..(message, speaking, verb, null, null, message_range, null)
+
+/mob/living/carbon/monkey/diona/can_use_vents()
+	return

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

@@ -135,7 +135,7 @@
 				wander = 0
 
 			else // My target's gone! But I might still be pissed! You there. You look like a good stinging target!
-				for(var/mob/living/carbon/G in view(src,7))
+				for(var/mob/living/carbon/human/G in view(src,7))
 					target_mob = G
 					break
 

code/modules/organs/organ_alien.dm

@@ -53,7 +53,7 @@
 		del(src)
 
 	spawn(1) // So it has time to be thrown about by the gib() proc.
-		var/mob/living/carbon/alien/diona/D = new(get_turf(src))
+		var/mob/living/carbon/monkey/diona/D = new(get_turf(src))
 		diona.request_player(D)
 		del(src)