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

Fixes rev mindswap (#34567)

Browse Source
This commit is contained in:
ShizCalev
2018-01-21 12:29:12 -06:00
committed by CitadelStationBot
parent f692ffaa0c
commit 68cfdb617b
28 changed files with 60 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/devil/objectives.dm
+5 -5
View File
@@ -13,7 +13,7 @@
/datum/objective/devil/soulquantity/check_completion()
var/count = 0
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
var/list/souls = devilDatum.soulsOwned
for(var/S in souls) //Just a sanity check.
var/datum/mind/L = S
@@ -51,7 +51,7 @@
/datum/objective/devil/soulquality/check_completion()
var/count = 0
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
var/list/souls = devilDatum.soulsOwned
for(var/S in souls)
var/datum/mind/L = S
@@ -92,19 +92,19 @@
/datum/objective/devil/outsell/New()
/datum/objective/devil/outsell/update_explanation_text()
var/datum/antagonist/devil/opponent = target.has_antag_datum(ANTAG_DATUM_DEVIL)
var/datum/antagonist/devil/opponent = target.has_antag_datum(/datum/antagonist/devil)
explanation_text = "Purchase and retain control over more souls than [opponent.truename], known to mortals as [target.name], the [target.assigned_role]."
/datum/objective/devil/outsell/check_completion()
var/selfcount = 0
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(/datum/antagonist/devil)
var/list/souls = devilDatum.soulsOwned
for(var/S in souls)
var/datum/mind/L = S
if(L.soulOwner == owner)
selfcount++
var/targetcount = 0
devilDatum = target.has_antag_datum(ANTAG_DATUM_DEVIL)
devilDatum = target.has_antag_datum(/datum/antagonist/devil)
souls = devilDatum.soulsOwned
for(var/S in souls)
var/datum/mind/L = S