From 42816f916c45f536b985bf878d97f7050041007d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 28 Feb 2017 21:04:37 -0600 Subject: [PATCH 1/3] removes replace_text for them/their to his/her --- code/datums/emotes.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index b0dc419ce1..57065c01fb 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -36,10 +36,11 @@ var/global/list/emote_list = list() var/msg = select_message_type(user) if(params && message_param) msg = select_param(user, params) + /* if(findtext(msg, "their")) msg = replacetext(msg, "their", user.p_their()) if(findtext(msg, "them")) - msg = replacetext(msg, "them", user.p_them()) + msg = replacetext(msg, "them", user.p_them())*/ if(findtext(msg, "%s")) msg = replacetext(msg, "%s", user.p_s()) From 3480265efcbe5bcd920c3309e81ee21bb0d7288d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 28 Feb 2017 21:28:28 -0600 Subject: [PATCH 2/3] reduce meteor chances as well as the chance for everything to fuck up if RNGesus does see it fit to damn you all. --- code/modules/events/meteor_wave.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 1cd401ca5b..e19a014a88 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -3,9 +3,9 @@ /datum/round_event_control/meteor_wave name = "Meteor Wave: Normal" typepath = /datum/round_event/meteor_wave - weight = 4 + weight = 2 min_players = 5 - max_occurrences = 3 + max_occurrences = 2 /datum/round_event/meteor_wave startWhen = 6 @@ -22,9 +22,9 @@ /datum/round_event/meteor_wave/proc/determine_wave_type() if(!wave_name) wave_name = pickweight(list( - "normal" = 50, - "threatening" = 40, - "catastrophic" = 10)) + "normal" = 90, + "threatening" = 20, + "catastrophic" = 5)) switch(wave_name) if("normal") wave_type = meteors_normal From cf680a63d22fd3844289972a8ce58b587df9da60 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 28 Feb 2017 21:40:52 -0600 Subject: [PATCH 3/3] changes most, if not all, the send2irc_adminless_only to send2irc --- code/_onclick/ai.dm | 2 +- code/modules/admin/sql_message_system.dm | 2 +- code/modules/client/client_procs.dm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index e7888459a6..82726f0598 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -44,7 +44,7 @@ else log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])") message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))") - send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") + send2irc("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") return var/list/modifiers = params2list(params) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 99d082feb4..2c81258828 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -332,7 +332,7 @@ proc/get_message_output(type, target_ckey) return if("watchlist entry") message_admins("Notice: [key_name_admin(target_ckey)] is on the watchlist and has just connected - Reason: [text]") - send2irc_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]") + send2irc("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]") if("memo") output += "Memo by [admin_ckey] on [timestamp]" if(editor_ckey) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 5e8b107b4f..c0e603e977 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -281,7 +281,7 @@ var/next_external_rsc = 0 if (config.notify_new_player_age >= 0) message_admins("New user: [key_name_admin(src)] is connecting here for the first time.") if (config.irc_first_connection_alert) - send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!") + send2irc("New-user", "[key_name(src)] is connecting for the first time!") player_age = 0 // set it from -1 to 0 so the job selection code doesn't have a panic attack @@ -441,7 +441,7 @@ var/next_external_rsc = 0 if (!cidcheck_failedckeys[ckey]) message_admins("[key_name(src)] has been detected as using a cid randomizer. Connection rejected.") - send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.") + send2irc("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.") cidcheck_failedckeys[ckey] = TRUE note_randomizer_user() @@ -452,7 +452,7 @@ var/next_external_rsc = 0 else if (cidcheck_failedckeys[ckey]) message_admins("[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer") - send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.") + send2irc("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.") cidcheck_failedckeys -= ckey if (cidcheck_spoofckeys[ckey]) message_admins("[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it appears they aren't spoofing one this time")