cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a bunch of things related to mindslaves (#12491)

Browse Source
This commit is contained in:
SteelSlayer
2019-10-03 14:08:54 -04:00
committed by variableundefined
parent b976302215
commit 0e3a484c42
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_panel.dm
+3
View File
@@ -502,6 +502,9 @@
if(SSticker.mode.traitors.len)
dat += check_role_table("Traitors", SSticker.mode.traitors)
if(SSticker.mode.implanted.len)
dat += check_role_table("Mindslaves", SSticker.mode.implanted)
if(SSticker.mode.shadows.len)
dat += check_role_table("Shadowlings", SSticker.mode.shadows)
code/modules/admin/topic.dm
+1 -1
View File
@@ -1985,9 +1985,9 @@
kill_objective.target = H.mind
kill_objective.owner = newtraitormind
kill_objective.explanation_text = "Assassinate [H.mind], the [H.mind.assigned_role]"
H.mind.objectives += kill_objective
var/datum/antagonist/traitor/T = new()
T.give_objectives = FALSE
T.add_objective(kill_objective)
to_chat(newtraitormind, "<span class='danger'>ATTENTION:</span> It is time to pay your debt to the Syndicate...")
to_chat(newtraitormind, "<B>Goal: <span class='danger'>KILL [H.real_name]</span>, currently in [get_area(H.loc)]</B>")
newtraitormind.add_antag_datum(T)
code/modules/antagonists/traitor/datum_mindslave.dm
+5 -4
View File
@@ -7,8 +7,9 @@
var/special_role = ROLE_MINDSLAVE
/datum/antagonist/mindslave/on_gain()
// Handling mindslave objectives on top of other antag objective sucks, so Im just gonna do it like this
to_chat(owner.current, "<b>New Objective:</b> [objectives[objectives.len].explanation_text]")
owner.special_role = special_role
// Will print the most recent objective which is probably going the mindslave objective
to_chat(owner.current, "<b>New Objective:</b> [owner.objectives[owner.objectives.len].explanation_text]")
update_mindslave_icons_added()
/datum/antagonist/mindslave/on_removal()
@@ -37,10 +38,10 @@
slave_mob.mutations.Add(CLUMSY)
/datum/antagonist/mindslave/proc/add_objective(datum/objective/O)
objectives += O
owner.objectives += O
/datum/antagonist/mindslave/proc/remove_objective(datum/objective/O)
objectives -= O
owner.objectives -= O
/datum/antagonist/mindslave/proc/update_mindslave_icons_added()
var/datum/atom_hud/antag/traitorhud = huds[ANTAG_HUD_TRAITOR]