Merge pull request #604 from Aurorastation/development

Update, 09JUN2015

aurora.dme

@@ -1047,17 +1047,9 @@
 #include "code\modules\mob\living\carbon\alien\death.dm"
 #include "code\modules\mob\living\carbon\alien\emote.dm"
 #include "code\modules\mob\living\carbon\alien\life.dm"
-#include "code\modules\mob\living\carbon\alien\login.dm"
-#include "code\modules\mob\living\carbon\alien\logout.dm"
 #include "code\modules\mob\living\carbon\alien\progression.dm"
 #include "code\modules\mob\living\carbon\alien\say.dm"
 #include "code\modules\mob\living\carbon\alien\update_icons.dm"
-#include "code\modules\mob\living\carbon\alien\diona\diona.dm"
-#include "code\modules\mob\living\carbon\alien\diona\diona_attacks.dm"
-#include "code\modules\mob\living\carbon\alien\diona\diona_powers.dm"
-#include "code\modules\mob\living\carbon\alien\diona\progression.dm"
-#include "code\modules\mob\living\carbon\alien\diona\say_understands.dm"
-#include "code\modules\mob\living\carbon\alien\diona\update_icons.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\death.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"

code/game/gamemodes/cult/runes.dm

@@ -107,7 +107,7 @@ var/list/sacrificed = list()
 				M.visible_message("\red [M] writhes in pain as the markings below him glow a bloody red.", \
 				"\red AAAAAAHHHH!.", \
 				"\red You hear an anguished scream.")
-				if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument
+				if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist") && !jobban_isbanned(M, "Syndicate")) //putting jobban check here because is_convertable uses mind as argument -Check for Syndicate too because yeah
 
 					// Mostly for the benefit of those who resist, but it makes sense for even those who join to have some.. effect.
 					M.take_overall_damage(0, 10)
@@ -379,7 +379,7 @@ var/list/sacrificed = list()
 				break
 			if(!ghost)
 				return this_rune.fizzle()
-			if(jobban_isbanned(ghost, "cultist"))
+			if(jobban_isbanned(ghost, "cultist") || jobban_isbanned(ghost, "Syndicate"))
 				return this_rune.fizzle()
 
 			usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!")

code/game/gamemodes/mutiny/mutiny_hooks.dm

@@ -12,7 +12,7 @@
 	mode.update_icon(H.mind)
 	return 1
 
-/hook/harvest_podman/proc/update_icon(mob/living/carbon/alien/diona/D)
+/hook/harvest_podman/proc/update_icon(mob/living/carbon/monkey/diona/D)
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
 	if (!mode) return 1
 

code/modules/admin/DB ban/functions.dm

@@ -1,7 +1,7 @@
 
 datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/autobanner = 0, var/autoip = null, var/autocid = null)
 
-	if(!check_rights(R_MOD,0) && !check_rights(R_BAN))	return
+	if(!check_rights(R_MOD,0) && !check_rights(R_BAN) && !autobanner)	return
 
 	establish_db_connection()
 	if(!dbcon.IsConnected())

code/modules/admin/IsBanned.dm

@@ -128,7 +128,7 @@ world/IsBanned(key,address,computer_id)
 			if(multikey)
 				desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\nThis is an automatic ban for attempted bandodging. The original ban reason is this: [reason]\nThis ban was applied by [ackey] on [bantime], [expires]"
 				var/newreason = "This is an automatic ban for attempted bandodging. The original ban reason: [reason]."
-				Adminbot.DB_ban_record(1, null, null, reason, null, null, ckey(key), 1, address, computer_id)
+				Adminbot.DB_ban_record(1, null, null, newreason, null, null, ckey(key), 1, address, computer_id)
 				notes_add_sql(key, newreason, null, address, computer_id)
 
 			del Adminbot

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)