From a134bedd4c87c8aed9b3694120567bbbadd5166a Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Fri, 16 Oct 2020 08:22:35 -0700 Subject: [PATCH 1/4] Fixes subtle hotkey, adds subtler hotkey (#13575) --- code/modules/keybindings/keybind/mob.dm | 13 ++++++++++++- code/modules/mob/say_vr.dm | 7 ------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/code/modules/keybindings/keybind/mob.dm b/code/modules/keybindings/keybind/mob.dm index 2ce4dc35a0..c19fd62dee 100644 --- a/code/modules/keybindings/keybind/mob.dm +++ b/code/modules/keybindings/keybind/mob.dm @@ -107,7 +107,18 @@ /datum/keybinding/living/subtle/down(client/user) var/mob/living/L = user.mob - L.subtle_keybind() + L.subtle() + return TRUE + +/datum/keybinding/living/subtler + hotkey_keys = list("6") + classic_keys = list() + name = "subtler_emote" + full_name = "Subtler Anti-Ghost Emote" + +/datum/keybinding/living/subtler/down(client/user) + var/mob/living/L = user.mob + L.subtler() return TRUE /datum/keybinding/mob/whisper diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 5db3ccf216..7e0d6eb40d 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -83,7 +83,6 @@ proc/get_top_level_mob(var/mob/S) message = null mob_type_blacklist_typecache = list(/mob/living/brain) - /datum/emote/living/subtler/proc/check_invalid(mob/user, input) if(stop_bad_mime.Find(input, 1, 1)) to_chat(user, "Invalid emote.") @@ -129,12 +128,6 @@ proc/get_top_level_mob(var/mob/S) user.visible_message(message=message,self_message=message,vision_distance=1, ignored_mobs = GLOB.dead_mob_list) ///////////////// VERB CODE -/mob/living/proc/subtle_keybind() - var/message = input(src, "", "subtle") as text|null - if(!length(message)) - return - return subtle(message) - /mob/living/verb/subtle() set name = "Subtle" set category = "IC" From 4534dec889af02401dc3e31f89a2aeafb64f92b1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 16 Oct 2020 10:22:38 -0500 Subject: [PATCH 2/4] Automatic changelog generation for PR #13575 [ci skip] --- html/changelogs/AutoChangeLog-pr-13575.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13575.yml diff --git a/html/changelogs/AutoChangeLog-pr-13575.yml b/html/changelogs/AutoChangeLog-pr-13575.yml new file mode 100644 index 0000000000..164581b11f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13575.yml @@ -0,0 +1,5 @@ +author: "BlueWildrose" +delete-after: True +changes: + - bugfix: "Fixed the subtle hotkey being weird with its input prompts." + - rscadd: "Adds a subtler anti-ghost hotkey. Default key is 6." From 099a82b93686ab6546b82f0bd30f610b28a54d66 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Fri, 16 Oct 2020 13:27:37 -0700 Subject: [PATCH 3/4] Made fermichem displays work correctly. (#13577) --- code/modules/reagents/chemistry/machinery/chem_heater.dm | 2 +- tgui/packages/tgui/interfaces/ChemDispenser.js | 7 +++++++ tgui/packages/tgui/interfaces/ChemHeater.js | 5 ++--- tgui/packages/tgui/interfaces/common/BeakerContents.js | 2 +- tgui/public/tgui.bundle.js | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 28f0b2366a..99c1cf97a6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -107,7 +107,7 @@ data["beakerMaxVolume"] = beaker ? beaker.volume : null //purity and pH accuracy for(var/obj/item/stock_parts/micro_laser/M in component_parts) - data["partRating"]= 10**(M.rating-1) + data["partRating"]= M.rating if(M.rating == 4) data["showPurity"] = 1 else diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index c2f68b5e28..0724a9e85f 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -182,6 +182,13 @@ export const ChemDispenser = (props, context) => { units of {chemical.name} ))} + + pH: + + diff --git a/tgui/packages/tgui/interfaces/ChemHeater.js b/tgui/packages/tgui/interfaces/ChemHeater.js index c9b530a493..16acaf3656 100644 --- a/tgui/packages/tgui/interfaces/ChemHeater.js +++ b/tgui/packages/tgui/interfaces/ChemHeater.js @@ -15,7 +15,6 @@ export const ChemHeater = (props, context) => { beakerCurrentVolume, beakerMaxVolume, beakerContents = [], - currentpH, } = data; return ( { buttons={!!isBeakerLoaded && ( - {beakerCurrentVolume} / {beakerMaxVolume} units, - {data.currentpH} pH + {beakerCurrentVolume} / {beakerMaxVolume} units