From 730897d29ee05e5d12f6d97cac982c94788978f1 Mon Sep 17 00:00:00 2001
From: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Date: Sat, 30 Sep 2023 22:40:20 +1000
Subject: [PATCH] Ghosts are now able to see N2O with the analyze air verb.
(#22552)
* Update observer_base.dm
* Burzah review
* missed a couple
* Update observer_base.dm
* Update observer_base.dm
* Update observer_base.dm
* Update observer_base.dm
---
.../mob/dead/observer/observer_base.dm | 38 ++++++++++---------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm
index 32e63537c48..1139f0dcde2 100644
--- a/code/modules/mob/dead/observer/observer_base.dm
+++ b/code/modules/mob/dead/observer/observer_base.dm
@@ -544,39 +544,43 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, "Results:")
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- to_chat(src, "Pressure: [round(pressure,0.1)] kPa")
+ to_chat(src, "Pressure: [round(pressure, 0.1)] kPa")
else
- to_chat(src, "Pressure: [round(pressure,0.1)] kPa")
+ to_chat(src, "Pressure: [round(pressure, 0.1)] kPa")
if(total_moles)
- var/o2_concentration = environment.oxygen/total_moles
- var/n2_concentration = environment.nitrogen/total_moles
- var/co2_concentration = environment.carbon_dioxide/total_moles
- var/plasma_concentration = environment.toxins/total_moles
+ var/o2_concentration = environment.oxygen / total_moles
+ var/n2_concentration = environment.nitrogen / total_moles
+ var/co2_concentration = environment.carbon_dioxide / total_moles
+ var/plasma_concentration = environment.toxins / total_moles
+ var/n2o_concentration = environment.sleeping_agent / total_moles
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+ var/unknown_concentration = 1 - (o2_concentration + n2_concentration + co2_concentration + plasma_concentration + n2o_concentration)
if(abs(n2_concentration - N2STANDARD) < 20)
- to_chat(src, "Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)")
+ to_chat(src, "Nitrogen: [round(n2_concentration * 100)]% ([round(environment.nitrogen, 0.01)] moles)")
else
- to_chat(src, "Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)")
+ to_chat(src, "Nitrogen: [round(n2_concentration * 100)]% ([round(environment.nitrogen, 0.01)] moles)")
if(abs(o2_concentration - O2STANDARD) < 2)
- to_chat(src, "Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)")
+ to_chat(src, "Oxygen: [round(o2_concentration * 100)]% ([round(environment.oxygen, 0.01)] moles)")
else
- to_chat(src, "Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)")
+ to_chat(src, "Oxygen: [round(o2_concentration * 100)]% ([round(environment.oxygen, 0.01)] moles)")
if(co2_concentration > 0.01)
- to_chat(src, "CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)")
+ to_chat(src, "CO2: [round(co2_concentration * 100)]% ([round(environment.carbon_dioxide, 0.01)] moles)")
else
- to_chat(src, "CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)")
+ to_chat(src, "CO2: [round(co2_concentration * 100)]% ([round(environment.carbon_dioxide, 0.01)] moles)")
if(plasma_concentration > 0.01)
- to_chat(src, "Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)")
+ to_chat(src, "Plasma: [round(plasma_concentration * 100)]% ([round(environment.toxins, 0.01)] moles)")
+
+ if(n2o_concentration > 0.01)
+ to_chat(src, "N2O: [round(n2o_concentration * 100)]% ([round(environment.sleeping_agent, 0.01)] moles)")
if(unknown_concentration > 0.01)
- to_chat(src, "Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)")
+ to_chat(src, "Unknown: [round(unknown_concentration * 100)]% ([round(unknown_concentration * total_moles, 0.01)] moles)")
- to_chat(src, "Temperature: [round(environment.temperature-T0C,0.1)]°C")
- to_chat(src, "Heat Capacity: [round(environment.heat_capacity(),0.1)]")
+ to_chat(src, "Temperature: [round(environment.temperature - T0C, 0.1)]°C")
+ to_chat(src, "Heat Capacity: [round(environment.heat_capacity(), 0.1)]")
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"