From d0de6aeb2a0f413efc032bc34e82d75403bd711e Mon Sep 17 00:00:00 2001
From: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Date: Sat, 26 Oct 2019 04:00:03 -0400
Subject: [PATCH] =?UTF-8?q?Cobbduceus:=20Nerfs=20Multiver....=20As=20a=20p?=
 =?UTF-8?q?oison=F0=9F=98=9C=20(#47251)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

About The Pull Request

Multiver now scales with medibonus against toxins only (previously would scale for all reagents). Still purges them at a slow rate, however.
Multiver has a lower lung damage base damage (2.5 > 1.5)
Multiver now considers drinks "toxins" for the purpose of chem removal
Roundstart Multiver pills have more multiver in them.
Why It's Good For The Game

Multiver kills it's own gimmick by deleting the reagents that help it scale, so I made the bonus selective for toxin.

Multiver is less of a poison. You can still BTFO people with pure multiver but that's partially intentional, as you're meant to dose yourself with medicines to counteract it. Also is nerfed via the less purging of nontoxins
Changelog

cl Cobby
balance: Multiver now only provides unique medicine bonus to purging toxins, not other medicines (still deletes medicines slowly)
balance: Multiver now considers alcohol "toxins" for the purpose of chem removal
balance: Multiver has less base damage, still scales down with medicines (EPIN YOURSELF)
balance: Multiver pills have more... well... multiver
/cl
---
 .../chemistry/reagents/cat2_medicine_reagents.dm      | 11 ++++++-----
 code/modules/reagents/reagent_containers/pill.dm      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 360caa9cc6d..7ba130b12a5 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -228,13 +228,14 @@
 		if(istype(the_reagent, /datum/reagent/medicine))
 			medibonus += 1
 	M.adjustToxLoss(-0.2 * medibonus)
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, medibonus ? 2.5/medibonus : 1)
-	for(var/datum/reagent/the_reagent2 in M.reagents.reagent_list)
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, medibonus ? 1.5/medibonus : 1)
+	for(var/r2 in M.reagents.reagent_list)
+		var/datum/reagent/the_reagent2 = r2
 		if(the_reagent2 == src)
 			continue
-		var/amount2purge = medibonus*0.1
-		if(istype(the_reagent2,/datum/reagent/toxin))
-			amount2purge *= 5 //very good antitox (well just removing them) for roundstart availability
+		var/amount2purge = 0.1
+		if(istype(the_reagent2,/datum/reagent/toxin) || istype(the_reagent2,/datum/reagent/consumable/ethanol/))
+			amount2purge *= (5*medibonus) //very good antitox and antidrink (well just removing them) for roundstart availability
 		else if(medibonus >= 5 && istype(the_reagent2, /datum/reagent/medicine)) //5 unique meds (4+multiver) will make it not purge medicines
 			continue
 		M.reagents.remove_reagent(the_reagent2.type, amount2purge)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index c23d9165849..d34fd5a8b3d 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -116,7 +116,7 @@
 	name = "multiver pill"
 	desc = "Neutralizes many common toxins and scales with unique medicine in the system. Diluted with granibitaluri."
 	icon_state = "pill17"
-	list_reagents = list(/datum/reagent/medicine/C2/multiver = 2, /datum/reagent/medicine/granibitaluri = 8)
+	list_reagents = list(/datum/reagent/medicine/C2/multiver = 5, /datum/reagent/medicine/granibitaluri = 5)
 	rename_with_volume = TRUE
 
 /obj/item/reagent_containers/pill/epinephrine