Merge remote-tracking branch 'citadel/master' into eldritch_affairs

2020-03-29 20:44:49 -07:00
parent c39dd52b5f 02d32d17c2
commit 03d87f6bdc
110 changed files with 2217 additions and 1979 deletions
@@ -241,6 +241,9 @@ GLOBAL_LIST_EMPTY(antagonists)

 /// Gets our threat level. Defaults to threat var, override for custom stuff like different traitor goals having different threats.
 /datum/antagonist/proc/threat()
+	. = CONFIG_GET(keyed_list/antag_threat)[lowertext(name)]
+	if(. == null)
+		return threat
 	return threat

 //This one is created by admin tools for custom objectives
@@ -92,7 +92,7 @@
 	owner.current.blood_volume = max(owner.current.blood_volume,BLOOD_VOLUME_SAFE)

 /datum/antagonist/bloodsucker/threat()
-	return threat+3*vamplevel
+	return ..()+3*vamplevel


 /datum/antagonist/bloodsucker/proc/SelectFirstName()
@@ -16,7 +16,7 @@
 	threat = -3

 /datum/antagonist/vamphunter/threat()
-	return bad_dude ? -threat : threat
+	return bad_dude ? -(..()) : ..()

 /datum/antagonist/vamphunter/on_gain()

@@ -114,7 +114,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	var/ascendable = FALSE

 /datum/antagonist/devil/threat()
-	return threat + form * 10
+	return ..() + form * 10

 /datum/antagonist/devil/can_be_owned(datum/mind/new_owner)
 	. = ..()
@@ -4,12 +4,13 @@
 	job_rank = ROLE_NINJA
 	show_name_in_check_antagonists = TRUE
 	antag_moodlet = /datum/mood_event/focused
+	threat = 8
 	var/helping_station = FALSE
 	var/give_objectives = TRUE
 	var/give_equipment = TRUE

 /datum/antagonist/ninja/threat()
-	return helping_station ? -8 : 8
+	return helping_station ? -(..()) : ..()

 /datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override)
 	var/mob/living/M = mob_override || owner.current
@@ -96,6 +96,13 @@
 			equip(silent)
 		owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)

+/datum/antagonist/traitor/antag_panel_objectives()
+	. = ..()
+	if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets))
+		. += "<i><b>Contract Targets</b></i>:<br>"
+		for(var/datum/mind/M in contractor_hub.assigned_targets)
+			. += "<b> - </b>[key_name(M, FALSE, TRUE)]<br>"
+
 /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
 	. = ..()
 	update_traitor_icons_added()
@@ -292,4 +299,4 @@
 	return SSticker.mode.name == "traitor"

 /datum/antagonist/traitor/threat()
-	return threat+traitor_kind.threat
+	return (..())+traitor_kind.threat
@@ -645,7 +645,7 @@

 /obj/item/spellbook/proc/wrap(content)
 	var/dat = ""
-	dat +="<html><head><title>Spellbook</title></head>"
+	dat +="<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Spellbook</title></head>"
 	dat += {"
 	<head>
 		<style type="text/css">