tweak(vampire): fixes and balances vampires again and commits extreme…

… trolling

code/datums/configuration/indigo_bot_section.dm

@@ -10,6 +10,7 @@
 	var/round_end_webhook = null
 	var/ban_webhook = null
 	var/bug_report_webhook = null
+	var/list/ignored_ckeys = null
 
 /datum/configuration_section/indigo_bot/load_data(list/data)
 	CONFIG_LOAD_STR(secret, data["secret"])
@@ -20,3 +21,4 @@
 	CONFIG_LOAD_STR(round_end_webhook, data["round_end_webhook"])
 	CONFIG_LOAD_STR(ban_webhook, data["ban_webhook"])
 	CONFIG_LOAD_STR(bug_report_webhook, data["bug_report_webhook"])
+	CONFIG_LOAD_LIST(ignored_ckeys, data["ignored_ckeys"])

code/game/gamemodes/vampire/powers/bloodheal.dm

@@ -58,6 +58,14 @@
 			blood_used += 12
 			use_blood(12)
 
+		for(var/obj/item/organ/internal/I in my_mob.internal_organs)
+			if(!I.is_damaged())
+				continue
+
+			I.heal_damage(I.damage)
+			blood_used += 5
+			use_blood(5)
+
 		CHECK_HEAL_BREAK(12)
 
 		for(var/obj/item/organ/external/current_organ in organs)

code/game/gamemodes/vampire/powers/embrace.dm

@@ -111,7 +111,9 @@
 	T.Weaken(15)
 	T.Stun(15)
 	var/datum/antagonist/vampire/VAMP = GLOB.all_antag_types_[MODE_VAMPIRE]
-	VAMP.add_antagonist(T.mind, 1, 1, 0, 0, 1)
+	if(!VAMP.add_antagonist(T.mind, 1, 1, 0, 0, 1))
+		to_chat(my_mob, SPAN("warning", "[T] is not a creature you can embrace."))
+		return
 
 	admin_attack_log(my_mob, T, "successfully embraced [key_name(T)]", "was successfully embraced by [key_name(my_mob)]", "successfully embraced and turned into a vampire")
 

code/game/gamemodes/vampire/powers/enthrall.dm

@@ -59,7 +59,9 @@
 		return
 
 	to_chat(T, SPAN("danger", "Your mind blanks as you finish feeding from [my_mob]'s wrist."))
-	GLOB.thralls.add_antagonist(T.mind, 1, 1, 0, 1, 1)
+	if(!GLOB.thralls.add_antagonist(T.mind, 1, 1, 0, 1, 1))
+		to_chat(my_mob, SPAN("warning", "[T] is not a creature you can enthrall."))
+		return
 
 	T.mind.vampire.master = weakref(my_mob)
 	vampire.thralls += T

code/game/gamemodes/vampire/vampire_datum.dm

@@ -124,6 +124,9 @@
 	my_mob.add_modifier(/datum/modifier/trait/low_metabolism)
 	my_mob.innate_heal = 0
 
+	for(var/obj/item/organ/external/E in my_mob.organs)
+		E.limb_flags &= ~ORGAN_FLAG_CAN_BREAK
+
 	for(var/datum/modifier/mod in my_mob.modifiers)
 		if(!isnull(mod.metabolism_percent))
 			mod.metabolism_percent = 0 // Vampire is not affected by chemicals
@@ -144,6 +147,9 @@
 	my_mob.remove_modifiers_of_type(/datum/modifier/trait/low_metabolism, TRUE)
 	my_mob.innate_heal = 1
 
+	for(var/obj/item/organ/external/E in my_mob.organs)
+		E.limb_flags |= ORGAN_FLAG_CAN_BREAK
+
 	var/obj/item/organ/internal/heart/O = my_mob.internal_organs_by_name[BP_HEART]
 	if(O)
 		O.max_damage = initial(O.max_damage)

code/modules/mob/mob.dm

@@ -509,6 +509,8 @@
 
 	if(client.holder && (client.holder.rights & R_ADMIN))
 		is_admin = 1
+	else
+		return
 
 	if(is_admin && is_ooc_dead())
 		is_admin = 0

code/modules/mob/new_player/new_player.dm

@@ -58,7 +58,8 @@
 		output += "<a href='byond://?src=\ref[src];manifest=1'>View the Crew Manifest</A><br><br>"
 		output += "<p><a href='byond://?src=\ref[src];late_join=1'>Join Game!</A></p>"
 
-	output += "<p><a href='byond://?src=\ref[src];observe=1'>Observe</A></p>"
+	if(client.holder && (client.holder.rights & R_ADMIN))
+		output += "<p><a href='byond://?src=\ref[src];observe=1'>Observe</A></p>"
 
 	output += "</div>"
 
@@ -136,6 +137,9 @@
 			to_chat(src, "<span class='warning'>Please wait for server initialization to complete...</span>")
 			return
 
+		if(client.holder && (client.holder.rights & R_ADMIN))
+			return
+
 		if (!SSeams.CheckForAccess(client))
 			return
 

code/modules/mob/organs/external/_external.dm

@@ -378,6 +378,9 @@
 		owner.organs_by_name[organ_tag] = src
 		owner.organs |= src
 
+		if(owner.mind?.vampire)
+			limb_flags &= ~ORGAN_FLAG_CAN_BREAK
+
 		for(var/obj/item/organ/organ in internal_organs)
 			organ.replaced(owner, src)
 

code/modules/mob/say.dm

@@ -37,6 +37,9 @@
 
 	client?.spellcheck(message)
 
+	if(usr.ckey in config.indigo_bot.ignored_ckeys)
+		return
+
 	var/ckeyname = "[usr.ckey]/[usr.name]"
 	GLOB.indigo_bot.chat_webhook(config.indigo_bot.emote_webhook, "**[ckeyname]:** [message]")