cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roundend fixes (#33477)

Browse Source 
* Fixes TC use counts and adds some spacing between solo antags of the same kind

* Fixes nuke result

* Fixes round result for clock_cult

* Kevinz please.

* Hurts my soul
This commit is contained in:
AnturK
2017-12-13 12:20:56 +01:00
committed by Emmett Gaines
parent 1cc04f73c1
commit 171aca5a41
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/roundend.dm
View File

@@ -335,7 +335,7 @@
currrent_category = A.roundend_category currrent_category = A.roundend_category
previous_category = A previous_category = A
result += A.roundend_report() result += A.roundend_report()
result += "<br>" result += "<br><br>"
if(all_antagonists.len) if(all_antagonists.len)
var/datum/antagonist/last = all_antagonists[all_antagonists.len] var/datum/antagonist/last = all_antagonists[all_antagonists.len]

4
code/datums/antagonists/datum_traitor.dm
View File

@@ -302,8 +302,8 @@
var/uplink_true = FALSE var/uplink_true = FALSE
var/purchases = "" var/purchases = ""
for(var/datum/component/uplink/H in GLOB.uplinks) for(var/datum/component/uplink/H in GLOB.uplinks)
if(H && H.owner && H.owner == owner.key) if(H.owner && H.owner == owner.key)
TC_uses += H.spent_telecrystals TC_uses += H.purchase_log.total_spent
uplink_true = TRUE uplink_true = TRUE
purchases += H.purchase_log.generate_render(FALSE) purchases += H.purchase_log.generate_render(FALSE)

2
code/datums/antagonists/nukeop.dm
View File

@@ -306,7 +306,7 @@
for(var/U in GLOB.uplinks) for(var/U in GLOB.uplinks)
var/datum/component/uplink/H = U var/datum/component/uplink/H = U
if(H.owner == syndicate.key) if(H.owner == syndicate.key)
TC_uses += H.spent_telecrystals TC_uses += H.purchase_log.total_spent
if(H.purchase_log) if(H.purchase_log)
purchases += H.purchase_log.generate_render(show_key = FALSE) purchases += H.purchase_log.generate_render(show_key = FALSE)
else else

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

@@ -196,7 +196,7 @@ Credit where due:
/datum/game_mode/clockwork_cult/proc/check_clockwork_victory() /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
return main_clockcult.check_clockwork_victory() return main_clockcult.check_clockwork_victory()
/datum/game_mode/clock_cult/set_round_result() /datum/game_mode/clockwork_cult/set_round_result()
..() ..()
if(GLOB.clockwork_gateway_activated) if(GLOB.clockwork_gateway_activated)
SSticker.news_report = CLOCK_SUMMON SSticker.news_report = CLOCK_SUMMON

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

@@ -70,6 +70,7 @@
..() ..()
/datum/game_mode/nuclear/set_round_result() /datum/game_mode/nuclear/set_round_result()
..()
var result = nuke_team.get_result() var result = nuke_team.get_result()
switch(result) switch(result)
if(NUKE_RESULT_FLUKE) if(NUKE_RESULT_FLUKE)
@@ -102,7 +103,6 @@
else else
SSticker.mode_result = "halfwin - interrupted" SSticker.mode_result = "halfwin - interrupted"
SSticker.news_report = OPERATIVE_SKIRMISH SSticker.news_report = OPERATIVE_SKIRMISH
return ..()
/datum/game_mode/nuclear/generate_report() /datum/game_mode/nuclear/generate_report()
return "One of Central Command's trading routes was recently disrupted by a raid carried out by the Gorlex Marauders. They seemed to only be after one ship - a highly-sensitive \ return "One of Central Command's trading routes was recently disrupted by a raid carried out by the Gorlex Marauders. They seemed to only be after one ship - a highly-sensitive \

3
code/modules/uplink/uplink.dm
View File

@@ -17,7 +17,6 @@ GLOBAL_LIST_EMPTY(uplinks)
var/selected_cat var/selected_cat
var/owner = null var/owner = null
var/datum/game_mode/gamemode var/datum/game_mode/gamemode
var/spent_telecrystals = 0
var/datum/uplink_purchase_log/purchase_log var/datum/uplink_purchase_log/purchase_log
var/list/uplink_items var/list/uplink_items
var/hidden_crystals = 0 var/hidden_crystals = 0
@@ -89,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplinks)
var/refundable = initial(UI.refundable) var/refundable = initial(UI.refundable)
if(I.type == path && refundable && I.check_uplink_validity()) if(I.type == path && refundable && I.check_uplink_validity())
telecrystals += cost telecrystals += cost
spent_telecrystals -= cost purchase_log.total_spent -= cost
to_chat(user, "<span class='notice'>[I] refunded.</span>") to_chat(user, "<span class='notice'>[I] refunded.</span>")
qdel(I) qdel(I)
return return

2
code/modules/uplink/uplink_items.dm
View File

@@ -1390,7 +1390,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
if(possible_items.len) if(possible_items.len)
var/datum/uplink_item/I = pick(possible_items) var/datum/uplink_item/I = pick(possible_items)
U.telecrystals -= I.cost U.telecrystals -= I.cost
U.spent_telecrystals += I.cost U.purchase_log.total_spent += I.cost
SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(I.name)]", "[cost]")) SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(I.name)]", "[cost]"))
SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name)) SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name))
return new I.item(loc) return new I.item(loc)