diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index b82e42c2fe9..e77cbb2a417 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -1,5 +1,5 @@ /obj/machinery/optable - name = "Operating Table" + name = "operating table" desc = "Used for advanced medical procedures." icon = 'icons/obj/surgery.dmi' icon_state = "table2-idle" @@ -61,15 +61,15 @@ to_chat(user, "There is nobody on \the [src]. It would be pointless to turn the suppressor on.") return TRUE - if(user != victim && !suppressing) // Skip checks if you're doing it to yourself or turning it off, this is an anti-griefing mechanic more than anything. - user.visible_message("\The [user] begins switching on \the [src]'s neural suppressor.") - if(!do_after(user, 30, src) || !use_check_and_message(user)) + if(user != victim && !use_check_and_message(user)) // Skip checks if you're doing it to yourself or turning it off, this is an anti-griefing mechanic more than anything. + user.visible_message("\The [user] begins switching [suppressing ? "off" : "on"] \the [src]'s neural suppressor.") + if(!do_after(user, 30, src)) return if(!victim) to_chat(user, "There is nobody on \the [src]. It would be pointless to turn the suppressor on.") - suppressing = !suppressing - user.visible_message("\The [user] switches [suppressing ? "on" : "off"] \the [src]'s neural suppressor.") + suppressing = !suppressing + user.visible_message("\The [user] switches [suppressing ? "on" : "off"] \the [src]'s neural suppressor.") /obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 507c1d9b8a2..10fe7ca4fe5 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -178,7 +178,7 @@ proc/get_radio_key_from_channel(var/channel) var/static/list/correct_punctuation = list("!" = TRUE, "." = TRUE, "?" = TRUE, "-" = TRUE, "~" = TRUE, "*" = TRUE, "/" = TRUE, ">" = TRUE, "\"" = TRUE, "'" = TRUE, "," = TRUE, ":" = TRUE, ";" = TRUE) var/ending = copytext(message, length(message), (length(message) + 1)) - if(ending && !correct_punctuation[ending]) + if(ending && !correct_punctuation[ending] && !(HULK in mutations)) message += "." //parse the language code and consume it diff --git a/html/changelogs/mattatlas-bobthefixer.yml b/html/changelogs/mattatlas-bobthefixer.yml new file mode 100644 index 00000000000..eac9f6f03d3 --- /dev/null +++ b/html/changelogs/mattatlas-bobthefixer.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Neural suppressors actually work now." + - bugfix: "Hulks no longer auto-add a period after their exclamation marks."