From d1edbab264a4e1492c6c0897fa19d473d5987bb5 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:39:40 -0700 Subject: [PATCH 1/3] Update life.dm --- code/modules/mob/living/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index fb71693534..89321082c9 100644 --- a/code/modules/mob/living/life.dm +++ b/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) From f8de31695c98e8fb99718acc965d5fb7b0913022 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jul 2020 17:48:50 -0500 Subject: [PATCH 2/3] Automatic changelog generation for PR #12988 [ci skip] --- html/changelogs/AutoChangeLog-pr-12988.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12988.yml diff --git a/html/changelogs/AutoChangeLog-pr-12988.yml b/html/changelogs/AutoChangeLog-pr-12988.yml new file mode 100644 index 0000000000..cdd447a564 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12988.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "being on fire works again." From be0740a2e737c20ebea3d2737b7046c7f4151c47 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 1 Aug 2020 00:11:48 +0000 Subject: [PATCH 3/3] Automatic changelog compile [ci skip] --- html/changelog.html | 17 +++++++++++++++++ html/changelogs/.all_changelog.yml | 11 +++++++++++ html/changelogs/AutoChangeLog-pr-12952.yml | 5 ----- html/changelogs/AutoChangeLog-pr-12962.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12964.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12967.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12988.yml | 4 ---- 7 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-12952.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12962.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12964.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12967.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12988.yml diff --git a/html/changelog.html b/html/changelog.html index 8c93566692..d8b47ed043 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,23 @@ -->
+

01 August 2020

+

dapnee updated:

+
    +
  • added cake hat to bar, adds another atmostech spawn
    • +
  • sinks point in the right direction, APC won't spawn off the wall in circuits
    • +
  • changes commissary APC so it actually powers the room, adds a missing AIR alarm, arrivals no longer has active atmos tiles.
    • +
+

silicons updated:

+
    +
  • toy shotguns no longer need 2 hands to fire
    • +
  • being on fire works again.
    • +
+

timothyteakettle updated:

+
    +
  • monkeys no longer continuously bleed everywhere
    • +
+

30 July 2020

Adelphon updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 6f8b79bb80..7658991cbc 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -26650,3 +26650,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. the laws of physics - tweak: beepskys hats now follow the laws of gravity and move up/down when he bobs up and down +2020-08-01: + dapnee: + - tweak: added cake hat to bar, adds another atmostech spawn + - bugfix: sinks point in the right direction, APC won't spawn off the wall in circuits + - bugfix: changes commissary APC so it actually powers the room, adds a missing + 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 diff --git a/html/changelogs/AutoChangeLog-pr-12952.yml b/html/changelogs/AutoChangeLog-pr-12952.yml deleted file mode 100644 index f8a26d739c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12952.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - tweak: "added cake hat to bar, adds another atmostech spawn" - - bugfix: "sinks point in the right direction, APC won't spawn off the wall in circuits" diff --git a/html/changelogs/AutoChangeLog-pr-12962.yml b/html/changelogs/AutoChangeLog-pr-12962.yml deleted file mode 100644 index ccb9512673..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12962.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - bugfix: "changes commissary APC so it actually powers the room, adds a missing AIR alarm, arrivals no longer has active atmos tiles." diff --git a/html/changelogs/AutoChangeLog-pr-12964.yml b/html/changelogs/AutoChangeLog-pr-12964.yml deleted file mode 100644 index ec4b8016d1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12964.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "monkeys no longer continuously bleed everywhere" diff --git a/html/changelogs/AutoChangeLog-pr-12967.yml b/html/changelogs/AutoChangeLog-pr-12967.yml deleted file mode 100644 index 3297232e76..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12967.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - tweak: "toy shotguns no longer need 2 hands to fire" diff --git a/html/changelogs/AutoChangeLog-pr-12988.yml b/html/changelogs/AutoChangeLog-pr-12988.yml deleted file mode 100644 index cdd447a564..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12988.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "being on fire works again."