Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master

code/modules/mob/living/life.dm

@@ -139,7 +139,7 @@
 		ExtinguishMob()
 		return
 	var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
-	if(G.get_moles(/datum/gas/oxygen, 1))
+	if(!G.get_moles(/datum/gas/oxygen, 1))
 		ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
 		return
 	var/turf/location = get_turf(src)

html/changelog.html

@@ -60,6 +60,7 @@
 			<h3 class="author">silicons updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">toy shotguns no longer need 2 hands to fire</li>
+				<li class="bugfix">being on fire works again.</li>
 			</ul>
 			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -26664,5 +26664,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       AIR alarm, arrivals no longer has active atmos tiles.
   silicons:
   - tweak: toy shotguns no longer need 2 hands to fire
+  - bugfix: being on fire works again.
   timothyteakettle:
   - bugfix: monkeys no longer continuously bleed everywhere