Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Mar 28, 2024 · 878b1e2 · 878b1e2
2 parents a1699f8 + 85ae1f3
commit 878b1e2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm
@@ -14165,7 +14165,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/space/basic,
+/turf/open/floor/mainship/mono,
 /area/mainship/living/officer_rnr)
 "neQ" = (
 /obj/structure/disposalpipe/segment,

diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm
@@ -660,7 +660,7 @@
 	scannable = TRUE
 
 /datum/reagent/medicine/peridaxon_plus/on_mob_life(mob/living/L, metabolism)
-	L.reagents.add_reagent(/datum/reagent/toxin,5)
+	L.reagents.add_reagent(/datum/reagent/toxin/scannable,5)
 	L.adjustStaminaLoss(10*effect_str)
 	if(!ishuman(L))
 		return ..()
@@ -782,7 +782,7 @@
 		target_IB = null
 
 /datum/reagent/medicine/quickclotplus/on_mob_life(mob/living/L, metabolism)
-	L.reagents.add_reagent(/datum/reagent/toxin,5)
+	L.reagents.add_reagent(/datum/reagent/toxin/scannable,5)
 	L.reagent_shock_modifier -= PAIN_REDUCTION_VERY_HEAVY
 	L.adjustStaminaLoss(15*effect_str)
 	if(!target_IB)
@@ -847,7 +847,7 @@
 		L.adjust_blood_volume(2.4)
 	if(L.blood_volume < BLOOD_VOLUME_BAD)
 		L.set_blood_volume(BLOOD_VOLUME_BAD+1)
-		L.reagents.add_reagent(/datum/reagent/toxin,25)
+		L.reagents.add_reagent(/datum/reagent/toxin/scannable,25)
 		L.AdjustSleeping(10 SECONDS)
 	return ..()
 

diff --git a/code/modules/reagents/reagents/toxin.dm b/code/modules/reagents/reagents/toxin.dm
@@ -17,6 +17,10 @@
 		L.adjustToxLoss(toxpwr*0.5*effect_str)
 	return ..()
 
+///For medicines that generate toxin reagent when metabolized
+/datum/reagent/toxin/scannable
+	scannable = TRUE
+
 /datum/reagent/toxin/hptoxin
 	name = "Toxin"
 	description = "A toxic chemical."

diff --git a/html/changelogs/AutoChangeLog-pr-15465.yml b/html/changelogs/AutoChangeLog-pr-15465.yml
@@ -0,0 +1,4 @@
+author: "Barnet2"
+delete-after: True
+changes:
+  - qol: "The toxin reagent from QC+, Peri+ and Nanoblood now shows on medical scanners."
diff --git a/html/changelogs/AutoChangeLog-pr-15481.yml b/html/changelogs/AutoChangeLog-pr-15481.yml
@@ -0,0 +1,4 @@
+author: "blackdav123"
+delete-after: True
+changes:
+  - bugfix: "Fills in space tile on Theseus"