Merge pull request #7 from Citadel-Station-13/master

a

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

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, "<span class='danger'>Invalid emote.</span>")
@@ -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"

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

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."

html/changelogs/AutoChangeLog-pr-13577.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Chemical stuff now displays fermichem stuff properly"

tgui/packages/tgui/interfaces/ChemDispenser.js

@@ -182,6 +182,13 @@ export const ChemDispenser = (props, context) => {
                   units of {chemical.name}
                 </Box>
               ))}
+              <Box
+                key={"pH"}>
+                pH:
+                <AnimatedNumber
+                  initial={7.0}
+                  value={data.beakerCurrentpH} />
+              </Box>
             </LabeledList.Item>
           </LabeledList>
         </Section>

tgui/packages/tgui/interfaces/ChemHeater.js

@@ -15,7 +15,6 @@ export const ChemHeater = (props, context) => {
     beakerCurrentVolume,
     beakerMaxVolume,
     beakerContents = [],
-    currentpH,
   } = data;
   return (
     <Window
@@ -64,8 +63,7 @@ export const ChemHeater = (props, context) => {
           buttons={!!isBeakerLoaded && (
             <Fragment>
               <Box inline color="label" mr={2}>
-                {beakerCurrentVolume} / {beakerMaxVolume} units,
-                {data.currentpH} pH
+                {beakerCurrentVolume} / {beakerMaxVolume} units
               </Box>
               <Button
                 icon="eject"
@@ -76,6 +74,7 @@ export const ChemHeater = (props, context) => {
           <BeakerContents
             beakerLoaded={isBeakerLoaded}
             beakerContents={beakerContents} />
+          <Box key="pH" color="label">{Number(data.currentpH).toFixed(data.partRating)} pH</Box>
         </Section>
       </Window.Content>
     </Window>

tgui/packages/tgui/interfaces/common/BeakerContents.js

@@ -15,7 +15,7 @@ export const BeakerContents = props => {
       )}
       {beakerContents.map(chemical => (
         <Box key={chemical.name} color="label">
-          {chemical.volume} units of {chemical.name}
+          {chemical.volume} units of {chemical.name} {chemical.purity < 1 && "(Purity: "+chemical.purity+")"}
         </Box>
       ))}
     </Box>