EORG Update (#4430)

EORG ban details update and EORG round end warning update.
cmss13-devs · Sep 18, 2023 · 884d389 · 884d389
1 parent ed2dd26
commit 884d389
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm
@@ -5,7 +5,8 @@
 #define URL_ISSUE_TRACKER "https://github.com/cmss13-devs/cmss13/issues"
 
 // ------ MISC WIKI LINKS ------ //
-#define URL_WIKI_RULES "https://cm-ss13.com/wiki/Rules"
+#define URL_RULES_PAGE "https://cm-ss13.com/rules"
+#define URL_RULES_EORG "https://cm-ss13.com/rules#rule-4-no-griefing"
 #define URL_WIKI_LANDING "https://cm-ss13.com/wiki/Main_Page"
 #define URL_WIKI_COC "https://cm-ss13.com/wiki/Rank"
 #define URL_WIKI_LAW "https://cm-ss13.com/wiki/Marine_Law"

diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm
@@ -285,7 +285,7 @@
 		round_statistics.track_round_end()
 	log_game("Round end result: [round_finished]")
 	to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|"))
-	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the battling hives on [SSmapping.configs[GROUND_MAP].map_name]. [round_finished]\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #3 for more details."))
+	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the battling hives on [SSmapping.configs[GROUND_MAP].map_name]. [round_finished]\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see <a href='[URL_RULES_EORG]'>rule #4</a> for more details."))
 
 // for the toolbox
 /datum/game_mode/xenovs/end_round_message()

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
@@ -129,7 +129,7 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki
 		round_statistics.track_round_end()
 	log_game("Round end result: [round_finished]")
 	to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|"))
-	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the brave men and women of the [MAIN_SHIP_NAME] and their struggle on [SSmapping.configs[GROUND_MAP].map_name].\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #3 for more details."))
+	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the brave men and women of the [MAIN_SHIP_NAME] and their struggle on [SSmapping.configs[GROUND_MAP].map_name].\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see <a href='[URL_RULES_EORG]'>rule #4</a> for more details."))
 
 /datum/game_mode/proc/declare_completion()
 	if(round_statistics)

diff --git a/code/modules/admin/player_panel/actions/punish.dm b/code/modules/admin/player_panel/actions/punish.dm
@@ -34,7 +34,7 @@
 	switch(alert("Are you sure you want to EORG ban [target.ckey]?", , "Yes", "No"))
 		if("Yes")
 			mins = 180
-			reason = "EORG"
+			reason = "EORG - Generating combat logs with, or otherwise griefing, friendly/allied players."
 		if("No")
 			return
 

diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
@@ -565,7 +565,7 @@
 		switch(alert("Are you sure you want to EORG ban [M.ckey]?", , "Yes", "No"))
 			if("Yes")
 				mins = 180
-				reason = "EORG"
+				reason = "EORG - Generating combat logs with, or otherwise griefing, friendly/allied players."
 			if("No")
 				return
 		var/datum/entity/player/P = get_player_from_key(M.ckey) // you may not be logged in, but I will find you and I will ban you