From 0ddc238a160d3a04a65c0dd4ccdb4ae6a707d913 Mon Sep 17 00:00:00 2001
From: NinjaPikachuska <89906909+NinjaPikachuska@users.noreply.github.com>
Date: Sun, 8 Sep 2024 10:09:10 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5=D0=BC=20?=
=?UTF-8?q?=D1=81=D0=BC=D0=B5=D1=88=D0=BD=D1=8B=D0=B5=20=D1=80=D0=B8=D0=B7?=
=?UTF-8?q?=D0=BE=D0=BD=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B2?=
=?UTF-8?q?=D1=8B=20(#13520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* no rp rev
* empty proc
* useless define
---
code/__DEFINES/messages.dm | 1 -
code/game/gamemodes/factions/revolution.dm | 81 +------------------
.../game/objects/effects/decals/contraband.dm | 2 +-
3 files changed, 3 insertions(+), 81 deletions(-)
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 += "
"
- var/custom_result = custom_result()
- score_results += custom_result
- score_results += "
"
- for(var/datum/objective/objective in objective_holder.GetObjectives())
- objective.extra_info()
- score_results += "Objective #[count]: [objective.explanation_text] [objective.completion_to_string()]"
- feedback_add_details("[ID]_objective","[objective.type]|[objective.completion_to_string(FALSE)]")
- count++
- if(count <= objective_holder.objectives.len)
- score_results += "
"
- score_results += "
"
- score_results += ""
-
- var/have_objectives = FALSE
- var/have_reason_string = FALSE
- if(reasons.len)
- have_reason_string = TRUE
-
- var/list/name_by_members = list()
- score_results += "Members:
"
- for(var/datum/role/R in members)
- if(!name_by_members[R.name])
- name_by_members[R.name] = list()
- name_by_members[R.name] += R
-
- for(var/name in name_by_members)
- score_results += "[name]:"
- for(var/datum/role/R in name_by_members[name])
- var/results = R.GetScoreboard()
- if(results)
- score_results += results
- score_results += "
"
- if(R.objectives.objectives.len)
- have_objectives = TRUE
- if(have_reason_string)
- var/reason_string = reasons[R.antag.key]
- if(reason_string)
- score_results += "- Reason to join the revolution: [reason_string]
"
-
- 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)
. = ..()