cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2844 from CIB/master

Browse Source 
Removing hijack means less bloodshed, plus we already admin change it whenever it pops up.
This commit is contained in:
Asanadas
2013-05-23 15:13:19 -07:00
parent 62e525329b e9fc666cdb
commit 33f8309c5b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/traitor/traitor.dm
View File

@@ -115,7 +115,7 @@
steal_objective.find_target() steal_objective.find_target()
traitor.objectives += steal_objective traitor.objectives += steal_objective
switch(rand(1,100)) switch(rand(1,100))
if(1 to 90) if(1 to 100)
if (!(locate(/datum/objective/escape) in traitor.objectives)) if (!(locate(/datum/objective/escape) in traitor.objectives))
var/datum/objective/escape/escape_objective = new var/datum/objective/escape/escape_objective = new
escape_objective.owner = traitor escape_objective.owner = traitor

2
code/game/gamemodes/wizard/wizard.dm
View File

@@ -87,7 +87,7 @@
escape_objective.owner = wizard escape_objective.owner = wizard
wizard.objectives += escape_objective wizard.objectives += escape_objective
if(61 to 85) if(61 to 100)
var/datum/objective/assassinate/kill_objective = new var/datum/objective/assassinate/kill_objective = new
kill_objective.owner = wizard kill_objective.owner = wizard
kill_objective.find_target() kill_objective.find_target()