From cab62745bb45fac0c236a536caae0e0db3746636 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Tue, 26 May 2020 16:19:31 +0200 Subject: [PATCH] fuck (#51250) --- code/modules/client/preferences.dm | 4 ++-- code/modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/dead/new_player/preferences_setup.dm | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c7f553e7fda..675fbf3137e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1799,7 +1799,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) ShowChoices(user) return 1 -/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, character_setup = FALSE, antagonist = FALSE) +/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, character_setup = FALSE, antagonist = FALSE, is_latejoiner = TRUE) hardcore_survival_score = 0 //Set to 0 to prevent you getting points from last another time. @@ -1817,7 +1817,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(randomise[RANDOM_HARDCORE] && parent.mob.mind && !character_setup) if(can_be_random_hardcore()) - hardcore_random_setup(character, antagonist) + hardcore_random_setup(character, antagonist, is_latejoiner) if(roundstart_checks) if(CONFIG_GET(flag/humans_need_surnames) && (pref_species.id == "human")) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 86ab731eb15..05b57edb073 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -420,7 +420,7 @@ if(mind in GLOB.pre_setup_antags) is_antag = TRUE - client.prefs.copy_to(H, antagonist = is_antag) + client.prefs.copy_to(H, antagonist = is_antag, is_latejoiner = transfer_after) H.dna.update_dna_identity() if(mind) if(transfer_after) diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index f86527a7776..b28678bd146 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -47,10 +47,12 @@ real_name = pref_species.random_name(gender,1) ///Setup a hardcore random character and calculate their hardcore random score -/datum/preferences/proc/hardcore_random_setup(mob/living/carbon/human/character, antagonist) +/datum/preferences/proc/hardcore_random_setup(mob/living/carbon/human/character, antagonist, is_latejoiner) random_character(TRUE, antagonist) select_hardcore_quirks() hardcore_survival_score = hardcore_survival_score ** 1.2 //30 points would be about 60 score + if(is_latejoiner)//prevent them from cheatintg + hardcore_survival_score = 0 ///Go through all quirks that can be used in hardcore mode and select some based on a random budget. /datum/preferences/proc/select_hardcore_quirks()