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

Merge pull request #10913 from datlo/nogolemassassinate

Browse Source 
Prevent objectives from targeting offstation roles
This commit is contained in:
variableundefined
2019-02-19 22:15:11 +08:00
committed by GitHub
parent 71af894c84 91792b09c1
commit abe80802f7
15 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/gimmick_team.dm
+1
View File
@@ -72,6 +72,7 @@
H.mind_initialize()
H.mind.assigned_role = "Event Character"
H.mind.special_role = "Event Character"
H.mind.offstation_role = TRUE
H.key = thisplayer.key
code/modules/admin/verbs/honksquad.dm
+1
View File
@@ -93,6 +93,7 @@ var/global/sent_honksquad = 0
new_honksquad.mind_initialize()
new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD
new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD
new_honksquad.mind.offstation_role = TRUE
new_honksquad.add_language("Clownish")
ticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list.
new_honksquad.equip_honksquad(honk_leader_selected)
code/modules/admin/verbs/infiltratorteam_syndicate.dm
+1
View File
@@ -131,6 +131,7 @@ var/global/sent_syndicate_infiltration_team = 0
new_syndicate_infiltrator.mind_initialize()
new_syndicate_infiltrator.mind.assigned_role = "Syndicate Infiltrator"
new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to z2 so make them inelligible as antag targets
ticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
return new_syndicate_infiltrator
code/modules/admin/verbs/one_click_antag.dm
+1 -1
View File
@@ -415,7 +415,7 @@ client/proc/one_click_antag()
new_syndicate_commando.mind_initialize()
new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.offstation_role = TRUE
//Adds them to current traitor list. Which is really the extra antagonist list.
ticker.mode.traitors += new_syndicate_commando.mind
new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
code/modules/admin/verbs/striketeam.dm
+1
View File
@@ -85,6 +85,7 @@ var/global/sent_strike_team = 0
R.mind.original = R
R.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD
R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
R.mind.offstation_role = TRUE
if(!(R.mind in ticker.minds))
ticker.minds += R.mind
ticker.mode.traitors += R.mind
code/modules/admin/verbs/striketeam_syndicate.dm
+1
View File
@@ -116,6 +116,7 @@ var/global/sent_syndicate_strike_team = 0
new_syndicate_commando.mind_initialize()
new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.offstation_role = TRUE
ticker.mode.traitors |= new_syndicate_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list.
new_syndicate_commando.equip_syndicate_commando(is_leader)
qdel(spawn_location)
code/modules/events/traders.dm
+1
View File
@@ -47,6 +47,7 @@ var/global/list/unused_trade_stations = list("sol")
M.equipOutfit(/datum/outfit/admin/sol_trader)
M.dna.species.after_equip_job(null, M)
M.mind.objectives += trader_objectives
M.mind.offstation_role = TRUE
greet_trader(M)
success_spawn = 1
if(success_spawn)