From e636c47767eae7659c976194bf25b2b336db41fe Mon Sep 17 00:00:00 2001
From: Hockaa <69127651+Hockaa@users.noreply.github.com>
Date: Tue, 8 Sep 2020 13:02:04 +0100
Subject: [PATCH] Various RMT pill tweaks + bugfix (#9914)

---
 code/controllers/subsystems/job.dm                        | 3 ---
 code/game/objects/items/weapons/storage/firstaid.dm       | 2 +-
 .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm     | 4 ++--
 code/modules/reagents/reagent_containers/pill.dm          | 2 +-
 html/changelogs/hockaa-rmtpills.yml                       | 8 ++++++++
 5 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/hockaa-rmtpills.yml

diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 16b35eab745..c9d099c60ed 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -529,9 +529,6 @@
 			G.prescription = TRUE
 			G.autodrobe_no_remove = TRUE
 
-	if(H.species)
-		H.species.equip_later_gear(H)
-
 	// So shoes aren't silent if people never change 'em.
 	H.update_noise_level()
 
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a36804d25cd..8061612d31a 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -245,6 +245,6 @@ obj/item/storage/pill_bottle/butazoline
 	starts_with = list(/obj/item/reagent_containers/pill/minaphobin = 7)
 
 /obj/item/storage/pill_bottle/rmt
-	name = "bottle of 15u RMT pills"
+	name = "bottle of 30u RMT pills"
 	desc = "Contains pills used to remedy the effects of prolonged zero-gravity adaptations."
 	starts_with = list(/obj/item/reagent_containers/pill/rmt = 7)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index b92df7b5b2a..b7f1018c753 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -1627,8 +1627,8 @@
 	reagent_state = LIQUID
 	scannable = TRUE
 	color = "#AA8866"
-	overdose = REAGENTS_OVERDOSE
-	metabolism = 0.2 * REM
+	overdose = 40
+	metabolism = 0.1 * REM
 	taste_description = "sourness"
 	fallback_specific_heat = 1
 
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index f8f322c4747..615021f8e06 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -226,7 +226,7 @@ obj/item/reagent_containers/pill/tranquility
 	name = "Regenerative-Muscular Tissue Supplement Pill"
 	desc = "Commonly abbreviated to RMT, it contains chemicals rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations."
 	icon_state = "pill19"
-	reagents_to_add = list(/datum/reagent/rmt = 15)
+	reagents_to_add = list(/datum/reagent/rmt = 30)
 
 /obj/item/reagent_containers/pill/cetahydramine
 	name = "Cetahydramine Pill"
diff --git a/html/changelogs/hockaa-rmtpills.yml b/html/changelogs/hockaa-rmtpills.yml
new file mode 100644
index 00000000000..8da4eae2047
--- /dev/null
+++ b/html/changelogs/hockaa-rmtpills.yml
@@ -0,0 +1,8 @@
+author: Hocka
+
+delete-after: True
+
+changes: 
+  - tweak: "RMT supplements are now 30 units by default (was 15)."
+  - tweak: "RMT now metabolises twice as slowly and overdoses at 40 units (was 20)."
+  - bugfix: "Offworlders no longer get two pill bottles if they spawn on the Odin."
\ No newline at end of file