From 57606e8eb47b5265a0262213237cae25c1088804 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 18 Sep 2023 02:17:20 +0100 Subject: [PATCH] EORG Update --- code/__DEFINES/urls.dm | 3 ++- code/game/gamemodes/colonialmarines/xenovsxeno.dm | 2 +- code/game/gamemodes/game_mode.dm | 2 +- code/modules/admin/player_panel/actions/punish.dm | 2 +- code/modules/admin/topic/topic.dm | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 4d9268220f2b..4b7be8f8e093 100644 --- 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 index a0d555acd2fb..c2bb45d97fc0 100644 --- 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 rule #4 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 index 5b007d275c32..01209f816538 100644 --- 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 rule #4 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 index 3ef1cdb4b5aa..576de30ae7ff 100644 --- 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 index 4c7e6afa5b7b..dc6e5550503d 100644 --- 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