diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 6158871a4f60ac..5b1d8e82693b2c 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -102,7 +102,7 @@ var/list/stolen_memories = list() var/true_form_death //SKYRAT EDIT ADDITION: The time that the horror form died. - + // SKYRAT EDIT START var/datum/changeling_profile/current_profile = null var/list/mimicable_quirks_list = list( @@ -826,13 +826,13 @@ user.selected_laugh = new chosen_profile.laugh_type // Only certain quirks will be copied, to avoid making the changeling blind or wheelchair-bound when they can simply pretend to have these quirks. - + for(var/datum/quirk/target_quirk in user.quirks) for(var/mimicable_quirk in mimicable_quirks_list) if(target_quirk.name == mimicable_quirk) user.remove_quirk(target_quirk.type) break - + for(var/datum/quirk/target_quirk in chosen_profile.quirks) for(var/mimicable_quirk in mimicable_quirks_list) if(target_quirk.name == mimicable_quirk) @@ -919,7 +919,7 @@ new_flesh_item.inhand_icon_state = chosen_profile.inhand_icon_state_list[slot] new_flesh_item.worn_icon = chosen_profile.worn_icon_list[slot] new_flesh_item.worn_icon_state = chosen_profile.worn_icon_state_list[slot] - + // SKYRAT EDIT START new_flesh_item.worn_icon_digi = chosen_profile.worn_icon_digi_list[slot] new_flesh_item.worn_icon_monkey = chosen_profile.worn_icon_monkey_list[slot] @@ -1071,9 +1071,13 @@ /datum/antagonist/changeling/roundend_report() var/list/parts = list() + // SKYRAT EDIT REMOVAL START + /* var/changeling_win = TRUE if(!owner.current) changeling_win = FALSE + */ + // SKYRAT EDIT REMOVAL END parts += printplayer(owner) parts += "Genomes Extracted: [absorbed_count]
" @@ -1081,16 +1085,24 @@ if(objectives.len) var/count = 1 for(var/datum/objective/objective in objectives) + // SKYRAT EDIT START - No greentext + /* if(!objective.check_completion()) changeling_win = FALSE parts += "Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" + */ parts += "Objective #[count]: [objective.explanation_text]" + // SKYRAT EDIT END - No greentext count++ + // SKYRAT EDIT REMOVAL START - No greentext + /* if(changeling_win) parts += span_greentext("The changeling was successful!") else parts += span_redtext("The changeling has failed.") + */ + // SKYRAT EDIT REMOVAL END - No greentext return parts.Join("
") diff --git a/code/modules/antagonists/malf_ai/malf_ai.dm b/code/modules/antagonists/malf_ai/malf_ai.dm index d9bc4690f5fd20..624f181dea2dd2 100644 --- a/code/modules/antagonists/malf_ai/malf_ai.dm +++ b/code/modules/antagonists/malf_ai/malf_ai.dm @@ -250,7 +250,7 @@ /datum/antagonist/malf_ai/roundend_report() var/list/result = list() - var/malf_ai_won = TRUE + //var/malf_ai_won = TRUE // SKYRAT EDIT REMOVAL result += printplayer(owner) @@ -258,10 +258,14 @@ if(objectives.len) //If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in objectives) + // SKYRAT EDIT START - No greentext + /* if(!objective.check_completion()) malf_ai_won = FALSE objectives_text += "
Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" + */ objectives_text += "
Objective #[count]: [objective.explanation_text]" + // SKYRAT EDIT END - No greentext count++ result += objectives_text @@ -275,6 +279,7 @@ else result += span_redtext("The [special_role_text] has failed!") SEND_SOUND(owner.current, 'sound/ambience/ambifailure.ogg') + */ return result.Join("
")