diff --git a/code/__DEFINES/messages.dm b/code/__DEFINES/messages.dm index e87d3def2a5e..07537cd2260a 100644 --- a/code/__DEFINES/messages.dm +++ b/code/__DEFINES/messages.dm @@ -3,7 +3,6 @@ #define MAX_BOOK_MESSAGE_LEN 27648 #define MAX_NAME_LEN 26 #define MAX_LNAME_LEN 64 -#define MAX_REV_REASON_LEN 255 #define MAX_MEDAL_REASON_LEN 128 //#define SHOWMSG_SELF diff --git a/code/game/gamemodes/factions/revolution.dm b/code/game/gamemodes/factions/revolution.dm index 2f182dc01479..4c387fee0c03 100644 --- a/code/game/gamemodes/factions/revolution.dm +++ b/code/game/gamemodes/factions/revolution.dm @@ -21,9 +21,6 @@ var/last_command_report = 0 var/tried_to_add_revheads = 0 - //associative - var/list/reasons = list() - /datum/faction/revolution/proc/get_all_heads() var/list/heads = list() for(var/mob/living/carbon/human/player as anything in human_list) @@ -245,71 +242,13 @@ return dat -/datum/faction/revolution/GetScoreboard() - var/count = 1 - var/score_results = "" - if(objective_holder.objectives.len > 0) - score_results += "" - score_results += "" - - if(!have_objectives) - score_results += "
" - - return score_results - /datum/faction/revolution/proc/convert_revolutionare_by_invite(mob/possible_rev, mob/inviter) if(!inviter) return FALSE var/datum/role/rev_leader/lead = get_member_by_mind(inviter.mind) var/choice = tgui_alert(possible_rev, "Asked by [inviter]: Do you want to join the revolution?", "Join the Revolution!", list("No!","Yes!")) if(choice == "Yes!") - var/reason_string = find_reason(possible_rev) - if(!reason_string) - to_chat(inviter, "[possible_rev] has no reason to support the revolution!") - lead.rev_cooldown = world.time + 5 SECONDS - return FALSE - if(add_user_to_rev(possible_rev, reason_string)) + if(add_user_to_rev(possible_rev)) to_chat(inviter, "[possible_rev] has joined the revolution!") add_tc_to_headrev(inviter, lead) return TRUE @@ -321,24 +260,8 @@ lead.rev_cooldown = world.time + 5 SECONDS return FALSE -/datum/faction/revolution/proc/convert_revolutionare(mob/possible_rev) - var/reason_string = find_reason(possible_rev) - if(!reason_string) - return FALSE - if(add_user_to_rev(possible_rev, reason_string)) - return TRUE - return FALSE - -/datum/faction/revolution/proc/find_reason(mob/user) - var/reason_string = sanitize_safe(input(user, "Please write the reason why you want to join the ranks of the revolution", "Write Reason") as null|message, MAX_REV_REASON_LEN) - if(!reason_string) - to_chat(user, "You have no reason to join the revolution!") - return null - return reason_string - -/datum/faction/revolution/proc/add_user_to_rev(mob/user, reason_string) +/datum/faction/revolution/proc/add_user_to_rev(mob/user) if(add_faction_member(src, user, TRUE)) - reasons[user.mind.key] = reason_string to_chat(user, "You join the revolution!") return TRUE return FALSE diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index f47fbc4511d9..adac0f9f7818 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -665,7 +665,7 @@ to_chat(user, "You can't overcome the guilt to join the revolutionaries. (You are banned.)") return else if(!isrevhead(user) && !isrev(user)) - rev.convert_revolutionare(user) + rev.add_user_to_rev(user) /obj/structure/sign/poster/revolution/examine(mob/user) . = ..()