From 4960f5440ceca5d243d44a9d7b194dd2f1626716 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Mon, 24 May 2021 16:29:07 +0100 Subject: [PATCH] Various Tweaks & Fixes (#15857) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Stuff * Grammar reviewer review Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com> * Shuttle call HTML fix And multiline announcements too, à la #15645. The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string. * Loadout revert Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com> --- code/_onclick/hud/alert.dm | 4 ++-- code/controllers/subsystem/shuttles.dm | 2 -- code/datums/spells/mime.dm | 4 ++-- code/game/gamemodes/vampire/vampire.dm | 2 +- .../game/machinery/computer/communications.dm | 7 +++++-- .../closets/secure/secure_closets.dm | 1 - code/game/objects/structures/window.dm | 3 ++- code/modules/clothing/glasses/glasses.dm | 4 ++-- code/modules/karma/karma.dm | 4 +++- code/modules/mob/living/death.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/projectiles/guns/medbeam.dm | 2 +- icons/mob/eyes.dmi | Bin 17021 -> 17019 bytes icons/mob/species/grey/eyes.dmi | Bin 13460 -> 13458 bytes icons/mob/species/vox/eyes.dmi | Bin 13653 -> 13652 bytes icons/obj/clothing/glasses.dmi | Bin 14209 -> 14207 bytes 16 files changed, 20 insertions(+), 17 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 35c250abc32..180e5a55e64 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -122,12 +122,12 @@ icon_state = "too_much_oxy" /obj/screen/alert/not_enough_nitro - name = "Choking (No N)" + name = "Choking (No N2)" desc = "You're not getting enough nitrogen. Find some good air before you pass out!" icon_state = "not_enough_nitro" /obj/screen/alert/too_much_nitro - name = "Choking (N)" + name = "Choking (N2)" desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_nitro" diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index c86f988bcd4..4eb3adc62da 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -135,8 +135,6 @@ SUBSYSTEM_DEF(shuttle) to_chat(user, "The emergency shuttle has been disabled by Centcom.") return - call_reason = trim(html_encode(call_reason)) - if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.") return diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 7142448dbdf..79c4e796aa1 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -21,7 +21,7 @@ if(!usr.mind.miming) to_chat(usr, "You must dedicate yourself to silence first.") return - invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]." + invocation = "[usr.name] looks as if a wall is in front of [usr.p_them()]." else invocation_type ="none" ..() @@ -86,7 +86,7 @@ if(!usr.mind.miming) to_chat(usr, "You must dedicate yourself to silence first.") return - invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]." + invocation = "[usr.name] looks as if a blockade is in front of [usr.p_them()]." else invocation_type ="none" ..() diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 6c116ab53f2..ff3a6152da1 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -290,7 +290,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha draining = null return add_attack_logs(owner, H, "vampirebit & is draining their blood.", ATKLOG_ALMOSTALL) - owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [owner.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.") + owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [H.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.") if(!iscarbon(owner)) H.LAssailant = null else diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 054a6719aff..46da580a0d1 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -147,7 +147,7 @@ message_cooldown = world.time + 600 //One minute if("callshuttle") - var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") + var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message if(!input || ..() || !is_authenticated(usr)) return call_shuttle_proc(usr, input) @@ -410,7 +410,7 @@ else menu_state=value -/proc/call_shuttle_proc(mob/user, reason) +/proc/call_shuttle_proc(mob/user, reason, sanitized = FALSE) if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -427,6 +427,9 @@ to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") return + if(!sanitized) + reason = trim_strip_html_properly(reason, allow_lines = TRUE) + SSshuttle.requestEvac(user, reason) log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 8c878cd6c59..5b2f0a54f24 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -69,7 +69,6 @@ togglelock(user) /obj/structure/closet/secure_closet/AltClick(mob/user) - ..() if(Adjacent(user)) togglelock(user) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b0d9464a0a3..0e89ae82e75 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -397,7 +397,8 @@ return TRUE /obj/structure/window/AltClick(mob/user) - + if(fulltile) // Can't rotate these. + return ..() if(user.incapacitated()) to_chat(user, "You can't do that right now!") return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index d07b95d18eb..2f3fcca395f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -424,9 +424,9 @@ ..() /obj/item/clothing/glasses/thermal/monocle - name = "thermoncle" + name = "thermonocle" desc = "A thermal monocle." - icon_state = "thermoncle" + icon_state = "thermonocle" flags_cover = null //doesn't protect eyes because it's a monocle, duh /obj/item/clothing/glasses/thermal/eyepatch diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index de8b42f04ae..7c80166c46f 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -127,11 +127,13 @@ GLOBAL_LIST_EMPTY(karma_spenders) continue if(M == src) continue + if(M.get_preference(PREFTOGGLE_DISABLE_KARMA)) + continue if(!isobserver(src) && isNonCrewAntag(M)) continue // Don't include special roles for non-observers, because players use it to meta karma_list += M - if(!karma_list.len) + if(!length(karma_list)) to_chat(usr, "There's no-one to spend your karma on.") return diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index c4e246f9d3f..65589260d66 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -93,7 +93,7 @@ for(var/P in GLOB.dead_mob_list) var/mob/M = P if((M.client?.prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) && (isobserver(M) || M.stat == DEAD)) - to_chat(M, "[mind.name] has died at [area_name]. (JMP)") + to_chat(M, "[mind.name] has died at [area_name]. (JMP)") if(SSticker && SSticker.mode) SSticker.mode.check_win() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index eaf7261a7b0..d0407aa271e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(check_unable(AI_CHECK_WIRELESS)) return - var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") + var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message if(!input || stat) return diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index aec8cf946d1..452023946ae 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -92,7 +92,7 @@ return 0 for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams! if(B.owner != current_beam) - turf.visible_message("The medbeams cross and EXPLODE!") + turf.visible_message("The medbeams cross and EXPLODE!") explosion(B.loc,0,3,5,8) qdel(dummy) return 0 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index b2d5f08f47bf4d34c570d8be282a4e92657de5bd..07fc7f4ef9e2b823ad98b1e113b457b7ffe16785 100644 GIT binary patch delta 196 zcmV;#06YKvgaP}60gxmCTCpXI0XQjF-|;uP9n@@?3C1phv9;vu>NB!ZK;0NL(LQkR zgQ&#pN4YvJMjBAgb1-ercF*XWjC;*|DdUss0UQc(-or8fygWN6ijxom6=Zc|=VJ|N zdmV~Jr_$BF)7{u>=n~A>rhW3iCQ!FPD!uugx7#}VxwgM`rGfNiu}5>}#jnPu@6Ua{ yJT?#v?A3j9TbYtgZ4QY2Bibbc=)xOi+*kkAt%-E)V^1mifw?Hbr`JK1hI{US@ zzjUR6^kuO}bLPdb#-^{&eZD+45De_yG#ku&Z5-$@B^a`40%;(a@%;DV@p&!QPn+To R`Uuu|1Q^+m7PE%}^go8`Z>9hM diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi index ec6444b0aa4cea932cbd3c5aea6e51e306c97664..7e0c0c9dc8c81825b71288d9071ea9696bbaaecc 100644 GIT binary patch delta 145 zcmV;C0B--3X_9G>Bmo++C8Pm=(zvAG=y%Wvi7+(t>lU~HzG3okz@9_?E#P(I$m>R0 z%74Z~+Bh^p<1qHlj~|jSc760vZWg`CyFJh)i~HCIZ1W-gtPV6Su*n~q{34hCt=xaL z%Gk&-Nbs{_u+- delta 147 zcmV;E0Brw~X_RS@Bmo?;C8Pm=F8GqPq~GXw&qnE zMq0{$#Y5USG(qDq_RfzVf-rV{^iXaVy~(>h&?S5O*avL$8U3sdG%c{nADa9km;bBW zf3(Wj$S_FovtqF9m-U^FGlrpHLKGhbLm)MWl@#*BwEyJoeZHpKmkCDRmGcjJW6dWRQo?VE*8(w#G4*#$RxY zP8mMU+DD%-VZ(@X)^-0HRfSyeUkOra|&wnpgFH5o9tjj;7H#>>IF{~G}E&?VqTRUL? diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 14ad340a547495f91d227662531e14be3b4f509b..68465a79014aadb16d885679982de3c532781390 100644 GIT binary patch delta 185 zcmV;q07n0TZ~tzPBmvE_B`*PgT&1J*SuLj} zMO}h7v@U@Imcv%tXnkEJ2~K<6oM`=bhO-?b|<}?hWQXHFB}D`~ihE?RZ`2 delta 187 zcmV;s07U=)Zh>!*BmvK{B`*Pg+!Qs2(ogF6|0-$(hNLzK(xs9-nt+_q1>S0PJQBcM&mCaI^XWg*C9-TyOvY