Skip to content

Commit

Permalink
Moved images to top "survived" line
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuckleberry-Finn committed Feb 24, 2014
1 parent 82cfa67 commit 0d1bcfb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
27 changes: 15 additions & 12 deletions code/game/gamemodes/traitor/traitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,19 @@
text += "body destroyed"
text += ")"


var/TC_uses = 0
var/uplink_true = 0
var/purchases = ""
for(var/obj/item/device/uplink/hidden/H)
if(H.uplink_owner && H.uplink_owner==traitor.name)
TC_uses += H.used_TC
uplink_true=1
purchases += H.purchase_log

if(uplink_true) text += " (used [TC_uses] TC) [purchases]"


if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
var/count = 1
for(var/datum/objective/objective in traitor.objectives)
Expand All @@ -211,22 +224,12 @@
else
special_role_text = "antagonist"

var/TC_uses = 0
var/uplink_true = 0
var/purchases = ""
for(var/obj/item/device/uplink/hidden/H)
if(H.uplink_owner && H.uplink_owner==traitor.name)
TC_uses += H.used_TC
uplink_true=1
purchases += H.purchase_log

if(uplink_true && !TC_uses) text+= "<br>"//EMBRACE THE GAP

if(traitorwin)
text += "<br><font color='green'><B>The [special_role_text] was successful!</B>[uplink_true ? " (used [TC_uses] TC) [purchases]" : ""]</font>"
text += "<br><font color='green'><B>The [special_role_text] was successful!</B></font>"
feedback_add_details("traitor_success","SUCCESS")
else
text += "<br><font color='red'><B>The [special_role_text] has failed!</B>[uplink_true ? " (used [TC_uses] TC) [purchases]" : ""]</font>"
text += "<br><font color='red'><B>The [special_role_text] has failed!</B></font>"
feedback_add_details("traitor_success","FAIL")

text += "<br>"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/uplinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
var/show_description = null
var/active = 0

var/uplink_owner = null//text-only unless
var/uplink_owner = null//text-only
var/used_TC = 0

/obj/item/device/uplink/New()
Expand Down

0 comments on commit 0d1bcfb

Please sign in to comment.