From 5c1ca01dad3efef044fc62d33b0f56d34f825754 Mon Sep 17 00:00:00 2001
From: Putnam3145 <putnam3145@gmail.com>
Date: Sun, 4 May 2025 00:37:24 -0700
Subject: [PATCH] Fixes ethylredoxrazine; makes ethanol scannable (#7135)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

As title. I should atomize these I might be stupid. It's fine.

## Why It's Good For The Game

Ethylredoxrazine should be purging ethanol from blood, not just the
stomach; that's the intent. Ethanol being scannable by e.g. circuits is
also, in fact, the intent, or at least my intent.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Ethanol can be scanned by lower tier scanners
fix: Ethylredoxrazine purges ethanol from blood properly
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 .../reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm  | 2 +-
 code/modules/reagents/chemistry/reagents/core/ethanol.dm        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm
index 83b3a6528e4..883220c9433 100644
--- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm
@@ -1062,7 +1062,7 @@
 	for(var/datum/reagent/ethanol/ethanol_filter in M.ingested.get_reagent_datums())
 		M.ingested.remove_reagent(ethanol_filter.id, removed * 30)
 	for(var/datum/reagent/ethanol/ethanol_filter in M.bloodstr.get_reagent_datums())
-		M.ingested.remove_reagent(ethanol_filter.id, removed * 20)
+		M.bloodstr.remove_reagent(ethanol_filter.id, removed * 20)
 
 /datum/reagent/hyronalin
 	name = "Hyronalin"
diff --git a/code/modules/reagents/chemistry/reagents/core/ethanol.dm b/code/modules/reagents/chemistry/reagents/core/ethanol.dm
index 0b0dffb6b45..ba2f49d7531 100644
--- a/code/modules/reagents/chemistry/reagents/core/ethanol.dm
+++ b/code/modules/reagents/chemistry/reagents/core/ethanol.dm
@@ -12,6 +12,8 @@
 
 	ingest_met = REM * 5
 
+	scannable = TRUE
+
 	var/nutriment_factor = 0
 	var/hydration_factor = 0
 	var/proof = 200