diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
index 148af35247..c477bb2cad 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
@@ -27,7 +27,7 @@
/datum/sprite_accessory/mam_body_markings/redpanda
name = "Redpanda"
icon_state = "redpanda"
- covered_limbs = list("Head" = MATRIX_RED_BLUE, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN)
+ covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN)
/datum/sprite_accessory/mam_body_markings/bat
name = "Bat"
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 897c7610a1..e0e0b42653 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -90,6 +90,11 @@
max = safe_breath_dam_max,
damage_type = safe_damage_type
)
+ if(ispath(breathing_class))
+ var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class]
+ for(var/g in class.gases)
+ if(class.gases[g] > 0)
+ gas_min -= g
//TODO: lung health affects lung function
/obj/item/organ/lungs/onDamage(damage_mod) //damage might be too low atm.
@@ -196,9 +201,9 @@
mole_adjustments[entry] = -required_moles
mole_adjustments[breath_results[entry]] = required_moles
if(required_pp < safe_min)
- var/multiplier = 0
+ var/multiplier = handle_too_little_breath(H, required_pp, safe_min, required_moles)
if(required_moles > 0)
- multiplier = handle_too_little_breath(H, required_pp, safe_min, required_moles) / required_moles
+ multiplier /= required_moles
for(var/adjustment in mole_adjustments)
mole_adjustments[adjustment] *= multiplier
if(alert_category)
@@ -517,17 +522,20 @@
var/total_moles = breath.total_moles()
for(var/id in breath.get_gases())
var/this_pressure = PP(breath, id)
- var/req_pressure = (this_pressure * SAFE_THRESHOLD_RATIO) - 1
- if(req_pressure > 0)
- gas_min[id] = req_pressure
+ if(id in gas_min)
+ var/req_pressure = (this_pressure * SAFE_THRESHOLD_RATIO) - 1
+ if(req_pressure > 0)
+ gas_min[id] = req_pressure
+ else
+ gas_min -= id // if there's not even enough of the gas to register, we shouldn't need it
if(id in gas_max)
gas_max[id] += this_pressure
- var/bz = breath.get_moles(GAS_BZ)
+ var/bz = breath.get_moles(GAS_BZ) // snowflaked cause it's got special behavior, of course
if(bz)
BZ_trip_balls_min += bz
BZ_brain_damage_min += bz
- gas_max[GAS_N2] = PP(breath, GAS_N2) + 5
+ gas_max[GAS_N2] = max(15, PP(breath, GAS_N2) + 3) // don't want ash lizards breathing on station; sometimes they might be able to, though
var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class]
var/o2_pp = class.get_effective_pp(breath)
safe_breath_min = min(3, 0.3 * o2_pp)
diff --git a/html/changelog.html b/html/changelog.html
index 1721c5344e..8e3aae4315 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,27 @@
-->
+
08 November 2021
+
timothyteakettle updated:
+
+ - fixes party pod sprite
+ - fixes red panda head marking
+
+
+
06 November 2021
+
Putnam3145 updated:
+
+ - Ashwalkers should no longer suffocate on lavaland (and hypothetical other future problems)
+ - A gas mix with 0 oxygen should now properly suffocate you (or 0 plasma, for ashwalkers)
+
+
+
05 November 2021
+
keronshb updated:
+
+ - removes required enemies
+ - Lowers assassination threat threshold
+
+
31 October 2021
DeltaFire15 updated:
@@ -443,51 +464,6 @@
- Adds a toggle option for the parade outfits
- Observers can no longer highlight your items
-
-
07 September 2021
-
bunny232 updated:
-
- - fixed some jank in pubby's xenobiological secure pen
-
-
keronshb updated:
-
- - Gremlins no longer have AA when dead
-
-
zeroisthebiggay updated:
-
-
-
05 September 2021
-
DeltaFire15 updated:
-
- - Unreadied player gamemode votes now actually get ignored (if the config for this is enabled).
-
-
-
04 September 2021
-
Putnam3145 updated:
-
- - Might've fixed some ghost sprite oddities nobody even knew about
-
-
WanderingFox95 updated:
-
- - Lavaland architects don't screw up so badly anymore and do in fact not somehow leave holes through the planet surface all the way into space under their bookshelves.
- - Snow was removed from Lavaland Ruins.
-
-
keronshb updated:
-
- - Fixes entering an occupied VR sleeper bug
-
-
timothyteakettle updated:
-
- - makes the arm/leg markings for synthetic lizards appear as an option again
-
-
-
03 September 2021
-
timothyteakettle updated:
-
- - fixes losing your additional language upon changing species
-