From bd38b5f24a75a2b864cee70c3a33f39eccfa7f61 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sun, 3 Feb 2019 06:51:07 +0000 Subject: [PATCH 1/4] Automatic changelog compile, [ci skip] --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-10800.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10817.yml | 4 ---- 4 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10800.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10817.yml diff --git a/html/changelog.html b/html/changelog.html index 036bf01e24b..118db987e6b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,11 @@ +

Tayyyyyyy, TaukaUsanake updated:

+

02 February 2019

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 71aa56d60ac..377fe0a0a76 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9003,3 +9003,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Fox McCloud: - bugfix: Fixes a few edge cases of being able to create immunity to a few diseases - rscadd: Adds suspiciously Voxy outfit to the game + - tweak: Lack of breathing will render you unable to speak + Tayyyyyyy, TaukaUsanake: + - rscadd: pAI units now have access to a flashlight module, which can be obtained + with 5 RAM points. diff --git a/html/changelogs/AutoChangeLog-pr-10800.yml b/html/changelogs/AutoChangeLog-pr-10800.yml deleted file mode 100644 index 1b8288356ab..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10800.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fox McCloud" -delete-after: True -changes: - - tweak: "Lack of breathing will render you unable to speak" diff --git a/html/changelogs/AutoChangeLog-pr-10817.yml b/html/changelogs/AutoChangeLog-pr-10817.yml deleted file mode 100644 index 20f365cb393..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10817.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Tayyyyyyy, TaukaUsanake" -delete-after: True -changes: - - rscadd: "pAI units now have access to a flashlight module, which can be obtained with 5 RAM points." From 516b7e0144ce37fd9c87354249565771ac2331ea Mon Sep 17 00:00:00 2001 From: MINIMAN10000 Date: Sun, 3 Feb 2019 00:53:46 -0800 Subject: [PATCH 2/4] Boom function now checks for fuel before fuel tank boom. --- code/modules/reagents/reagent_dispenser.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 4f4277980e0..da9f408a7c3 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -85,12 +85,13 @@ boom() /obj/structure/reagent_dispensers/fueltank/boom(var/rigtrigger = FALSE) // Prevent case where someone who rigged the tank is blamed for the explosion when the rig isn't what triggered the explosion - if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder - message_admins("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank - log_game("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") - investigate_log("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]", INVESTIGATE_BOMB) - explosion(loc, 0, 1, 5, 7, 10, flame_range = 5) - qdel(src) + if(reagents.has_reagent("fuel")) + if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder + message_admins("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank + log_game("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") + investigate_log("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]", INVESTIGATE_BOMB) + explosion(loc, 0, 1, 5, 7, 10, flame_range = 5) + qdel(src) /obj/structure/reagent_dispensers/fueltank/blob_act() boom() From 62f0b6af58f41d09fc6096f19129ff268f7f72e5 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sun, 3 Feb 2019 04:22:17 -0500 Subject: [PATCH 3/4] Automatic changelog generation for PR #10820 [ci skip] --- html/changelogs/AutoChangeLog-pr-10820.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10820.yml diff --git a/html/changelogs/AutoChangeLog-pr-10820.yml b/html/changelogs/AutoChangeLog-pr-10820.yml new file mode 100644 index 00000000000..b367c8694fa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10820.yml @@ -0,0 +1,4 @@ +author: "MINIMAN10000" +delete-after: True +changes: + - bugfix: "Boom function now properly checks for fuel" From e24f671e1436f16c1f7549687401edfdaf9610cd Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sun, 3 Feb 2019 11:30:21 +0000 Subject: [PATCH 4/4] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-10820.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10820.yml diff --git a/html/changelog.html b/html/changelog.html index 118db987e6b..b224258d3f4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -63,6 +63,10 @@
  • Adds suspiciously Voxy outfit to the game
  • Lack of breathing will render you unable to speak
    • +

    MINIMAN10000 updated:

    +
      +
    • Boom function now properly checks for fuel
      • +

    Tayyyyyyy, TaukaUsanake updated:

    • pAI units now have access to a flashlight module, which can be obtained with 5 RAM points.
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 377fe0a0a76..b156dfa211f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9004,6 +9004,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Fixes a few edge cases of being able to create immunity to a few diseases - rscadd: Adds suspiciously Voxy outfit to the game - tweak: Lack of breathing will render you unable to speak + MINIMAN10000: + - bugfix: Boom function now properly checks for fuel Tayyyyyyy, TaukaUsanake: - rscadd: pAI units now have access to a flashlight module, which can be obtained with 5 RAM points. diff --git a/html/changelogs/AutoChangeLog-pr-10820.yml b/html/changelogs/AutoChangeLog-pr-10820.yml deleted file mode 100644 index b367c8694fa..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10820.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MINIMAN10000" -delete-after: True -changes: - - bugfix: "Boom function now properly checks for fuel"