shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "pls""

Browse Source 
This reverts commit b23f2a4460.
This commit is contained in:
Fermi
2019-11-24 03:02:21 +00:00
parent 9eaed4ea8e
commit 4c1c257035
3003 changed files with 157190 additions and 64046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/devil/devil agent/devil_agent.dm
+1 -2
View File
@@ -34,12 +34,11 @@
//If you override this method, have it return the number of objectives added.
if(devil_target_list.len && devil_target_list[devil]) // Is a double agent
var/datum/mind/target_mind = devil_target_list[devil]
var/datum/antagonist/devil/D = target_mind.has_antag_datum(/datum/antagonist/devil)
var/datum/objective/devil/outsell/outsellobjective = new
outsellobjective.owner = devil
outsellobjective.target = target_mind
outsellobjective.update_explanation_text()
D.objectives += outsellobjective
devil.objectives += outsellobjective
return 1
return 0
code/game/gamemodes/devil/game_mode.dm
+1 -2
View File
@@ -4,12 +4,11 @@
/datum/game_mode/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
for(var/i = 1 to quantity)
var/type = pick(validtypes)
var/datum/objective/devil/objective = new type(null)
objective.owner = devil_mind
D.objectives += objective
devil_mind.objectives += objective
if(!istype(objective, /datum/objective/devil/buy_target))
validtypes -= type //prevent duplicate objectives, EXCEPT for buy_target.
else