From 2238cde58cc9a120a156b3717382aa1aa2845e89 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 12 Apr 2020 19:36:27 +0200 Subject: [PATCH 01/12] Runtime Runtime Fix (#8647) --- code/controllers/subsystems/emergency_shuttle.dm | 8 +++++--- html/changelogs/geeves-runtime_shuttle_fix.yml | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-runtime_shuttle_fix.yml diff --git a/code/controllers/subsystems/emergency_shuttle.dm b/code/controllers/subsystems/emergency_shuttle.dm index 51efb3684a4..d96b1a410e8 100644 --- a/code/controllers/subsystems/emergency_shuttle.dm +++ b/code/controllers/subsystems/emergency_shuttle.dm @@ -225,11 +225,13 @@ var/datum/controller/subsystem/emergency_shuttle/emergency_shuttle //returns 1 if the shuttle is not idle at centcom /datum/controller/subsystem/emergency_shuttle/proc/online() + if (isnull(shuttle)) + return FALSE if (!shuttle.location) //not at centcom - return 1 + return TRUE if (wait_for_launch || shuttle.moving_status != SHUTTLE_IDLE) - return 1 - return 0 + return TRUE + return FALSE //returns 1 if the shuttle is currently in transit (or just leaving) to the station /datum/controller/subsystem/emergency_shuttle/proc/going_to_station() diff --git a/html/changelogs/geeves-runtime_shuttle_fix.yml b/html/changelogs/geeves-runtime_shuttle_fix.yml new file mode 100644 index 00000000000..0999c4f015f --- /dev/null +++ b/html/changelogs/geeves-runtime_shuttle_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed null emergency shuttles causing runtime errors when the game checks for status displays." From e4f99d90237a6035ad7e2d29ca2a1b2c791ffd7b Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Sun, 12 Apr 2020 17:37:00 +0000 Subject: [PATCH 02/12] "[ci skip] Automatic Build - 2020.04.12.17.37.00" --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/geeves-runtime_shuttle_fix.yml | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/geeves-runtime_shuttle_fix.yml diff --git a/html/changelog.html b/html/changelog.html index 014c8937fd2..07db29e94b2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
+

12 April 2020

+

Geeves updated:

+
    +
  • Fixed null emergency shuttles causing runtime errors when the game checks for status displays.
    • +
+

11 April 2020

Ferner updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d8ad3e37cb4..e16865cd043 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12684,3 +12684,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. spices are shaken. Wowzewow (Wezzy): - imageadd: Adds inhands for some welders, drills, and combitools. +2020-04-12: + Geeves: + - bugfix: Fixed null emergency shuttles causing runtime errors when the game checks + for status displays. diff --git a/html/changelogs/geeves-runtime_shuttle_fix.yml b/html/changelogs/geeves-runtime_shuttle_fix.yml deleted file mode 100644 index 0999c4f015f..00000000000 --- a/html/changelogs/geeves-runtime_shuttle_fix.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Geeves - -delete-after: True - -changes: - - bugfix: "Fixed null emergency shuttles causing runtime errors when the game checks for status displays." From 486cd1e78dcf68c922bc450811b8a8fed387fe97 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 13 Apr 2020 23:33:57 -0300 Subject: [PATCH 03/12] Changes that the emergency shuttle can only be called after one hour (#8639) --- code/controllers/configuration.dm | 5 +++++ .../modular_computers/file_system/programs/command/comm.dm | 4 ++-- config/example/config.txt | 3 +++ html/changelogs/alberyk-shuttle.yml | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-shuttle.yml diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index c721006b358..b5ed8cd6f61 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -301,6 +301,8 @@ var/list/gamemode_cache = list() var/fail2topic_rule_name = "_DD_Fail2topic" var/fail2topic_enabled = FALSE + var/time_to_call_emergency_shuttle = 36000 //how many time until the crew can call the transfer shuttle. One hour by default. + /datum/configuration/New() var/list/L = typesof(/datum/game_mode) - /datum/game_mode for (var/T in L) @@ -863,6 +865,9 @@ var/list/gamemode_cache = list() if("merchant_chance") config.merchant_chance = text2num(value) + if("time_to_call_emergency_shuttle") + config.time_to_call_emergency_shuttle = text2num(value) + if("force_map") override_map = value diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 8da42feb197..fb48d69aab4 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -383,8 +383,8 @@ Command action procs to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") return 0 - if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE - to_chat(user, "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again.") + if(world.time < config.time_to_call_emergency_shuttle) + to_chat(user, "The emergency shuttle is refueling. Please wait another [round((config.time_to_call_emergency_shuttle-world.time)/600)] minute\s before trying again.") return 0 if(emergency_shuttle.going_to_centcom()) diff --git a/config/example/config.txt b/config/example/config.txt index e42f30f86d9..938c3d6de48 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -400,6 +400,9 @@ STARLIGHT 0 ## Chance, in percentage, of the merchant job slot being open at round start MERCHANT_CHANCE 20 +## How long before the crew can call the emergency shuttle. One hour by default. +TIME_TO_CALL_EMERGENCY_SHUTTLE 36000 + ## Defines which races are allowed to join as ERT, in singular form. If unset, defaults to only human. Casing matters, separate using ; ## Example races include: Human, Tajara, Skrell, Unathi # ERT_SPECIES Human;Skrell;Unathi diff --git a/html/changelogs/alberyk-shuttle.yml b/html/changelogs/alberyk-shuttle.yml new file mode 100644 index 00000000000..abcb51467a1 --- /dev/null +++ b/html/changelogs/alberyk-shuttle.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "The emergency shuttle can only be called after one hour into the round. This can be changed on the config file." From 2f0d55750b117cf1d6251f6d9260624355699594 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Tue, 14 Apr 2020 02:34:36 +0000 Subject: [PATCH 04/12] "[ci skip] Automatic Build - 2020.04.14.02.34.36" --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/alberyk-shuttle.yml | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/alberyk-shuttle.yml diff --git a/html/changelog.html b/html/changelog.html index 07db29e94b2..d69c43b3937 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
    +

    14 April 2020

    +

    Alberyk updated:

    +
      +
    • The emergency shuttle can only be called after one hour into the round. This can be changed on the config file.
      • +
    +

    12 April 2020

    Geeves updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e16865cd043..eabc660dab5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12688,3 +12688,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Geeves: - bugfix: Fixed null emergency shuttles causing runtime errors when the game checks for status displays. +2020-04-14: + Alberyk: + - tweak: The emergency shuttle can only be called after one hour into the round. + This can be changed on the config file. diff --git a/html/changelogs/alberyk-shuttle.yml b/html/changelogs/alberyk-shuttle.yml deleted file mode 100644 index abcb51467a1..00000000000 --- a/html/changelogs/alberyk-shuttle.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Alberyk - -delete-after: True - -changes: - - tweak: "The emergency shuttle can only be called after one hour into the round. This can be changed on the config file." From 9958c4a8942ce67f883e34d1659e5db4da0c60af Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 14 Apr 2020 12:02:31 +0200 Subject: [PATCH 05/12] Slime Core Fix (#8645) --- code/game/objects/items/weapons/power_cells.dm | 5 +++-- html/changelogs/geeves-slime_core_fix.yml | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-slime_core_fix.yml diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 861c9347ef6..79bf98110c6 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -126,10 +126,11 @@ /obj/item/cell/slime name = "charged slime core" desc = "A yellow slime core infused with phoron, it crackles with power." + description_info = "This slime core is energized with powerful bluespace energies, allowing it to regenerate ten percent of its charge every minute." origin_tech = list(TECH_POWER = 2, TECH_BIO = 4) icon = 'icons/mob/npc/slimes.dmi' icon_state = "yellow slime extract" - maxcharge = 10000 + maxcharge = 15000 matter = null var/next_recharge @@ -143,7 +144,7 @@ /obj/item/cell/slime/process() if(next_recharge < world.time) - charge += maxcharge / 10 + charge = min(charge + (maxcharge / 10), maxcharge) next_recharge = world.time + 1 MINUTE /obj/item/cell/device/emergency_light diff --git a/html/changelogs/geeves-slime_core_fix.yml b/html/changelogs/geeves-slime_core_fix.yml new file mode 100644 index 00000000000..e09548a3154 --- /dev/null +++ b/html/changelogs/geeves-slime_core_fix.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed slime core batteries from charging over their maxcharge cap." + - tweak: "Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core." \ No newline at end of file From c0c7c98dc512bb952c88d657b1e408836ad02066 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Tue, 14 Apr 2020 10:03:09 +0000 Subject: [PATCH 06/12] "[ci skip] Automatic Build - 2020.04.14.10.03.09" --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/geeves-slime_core_fix.yml | 7 ------- 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 html/changelogs/geeves-slime_core_fix.yml diff --git a/html/changelog.html b/html/changelog.html index d69c43b3937..8c29b3df6b1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -40,6 +40,11 @@
      • The emergency shuttle can only be called after one hour into the round. This can be changed on the config file.
      +

      Geeves updated:

      +
        +
      • Fixed slime core batteries from charging over their maxcharge cap.
        • +
      • Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core.
        • +

      12 April 2020

      Geeves updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index eabc660dab5..1d08c2dadf6 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12692,3 +12692,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Alberyk: - tweak: The emergency shuttle can only be called after one hour into the round. This can be changed on the config file. + Geeves: + - bugfix: Fixed slime core batteries from charging over their maxcharge cap. + - tweak: Increased the slime core battery maxcharge cap from 10K to 15K. Added an + informational description to the core. diff --git a/html/changelogs/geeves-slime_core_fix.yml b/html/changelogs/geeves-slime_core_fix.yml deleted file mode 100644 index e09548a3154..00000000000 --- a/html/changelogs/geeves-slime_core_fix.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Geeves - -delete-after: True - -changes: - - bugfix: "Fixed slime core batteries from charging over their maxcharge cap." - - tweak: "Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core." \ No newline at end of file From 7be65635fe5ec40afaf19c6b81e474eee9622d0e Mon Sep 17 00:00:00 2001 From: TheGoret Date: Tue, 14 Apr 2020 19:11:31 +0200 Subject: [PATCH 07/12] Crystal artifact icon fix (#8664) --- .../artifact/artifact_crystal.dm | 2 +- html/changelogs/thegoret-missing-crystals.yml | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/thegoret-missing-crystals.yml diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm index 165374fb610..9d8273027a7 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm @@ -8,7 +8,7 @@ /obj/structure/crystal/New() ..() - icon_state = pick("ano70","ano80") + icon_state = pick("crystal","crystal2") desc = pick(\ "It shines faintly as it catches the light.",\ diff --git a/html/changelogs/thegoret-missing-crystals.yml b/html/changelogs/thegoret-missing-crystals.yml new file mode 100644 index 00000000000..c462d371489 --- /dev/null +++ b/html/changelogs/thegoret-missing-crystals.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Goret + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Crystal artifacts don't show a missing sprite anymore." From 28fa070e4af36e144e6b69bcfc53c07882240362 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Tue, 14 Apr 2020 17:12:03 +0000 Subject: [PATCH 08/12] "[ci skip] Automatic Build - 2020.04.14.17.12.03" --- html/changelog.html | 4 ++ html/changelogs/.all_changelog.yml | 2 + html/changelogs/thegoret-missing-crystals.yml | 41 ------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/thegoret-missing-crystals.yml diff --git a/html/changelog.html b/html/changelog.html index 8c29b3df6b1..b2050fbd5f1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -45,6 +45,10 @@
    • Fixed slime core batteries from charging over their maxcharge cap.
    • Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core.
    +

    Goret updated:

    +
      +
    • Crystal artifacts don't show a missing sprite anymore.
      • +

    12 April 2020

    Geeves updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 1d08c2dadf6..84723b7afc9 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12696,3 +12696,5 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Fixed slime core batteries from charging over their maxcharge cap. - tweak: Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core. + Goret: + - bugfix: Crystal artifacts don't show a missing sprite anymore. diff --git a/html/changelogs/thegoret-missing-crystals.yml b/html/changelogs/thegoret-missing-crystals.yml deleted file mode 100644 index c462d371489..00000000000 --- a/html/changelogs/thegoret-missing-crystals.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: Goret - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "Crystal artifacts don't show a missing sprite anymore." From 857746adcbf2045216c64c3d6c38605bdce140d8 Mon Sep 17 00:00:00 2001 From: TheGoret Date: Tue, 14 Apr 2020 19:38:23 +0200 Subject: [PATCH 09/12] Thetamycin works again (#8667) --- .../Chemistry-Reagents-Medicine.dm | 1 + html/changelogs/thegoret-fix-theta.yml | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 html/changelogs/thegoret-fix-theta.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 18acdce8c6f..104f3ff2d80 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -569,6 +569,7 @@ description = "A theta-lactam antibiotic, effective against wound and organ bacterial infections." reagent_state = LIQUID color = "#41C141" + metabolism = REM * 0.05 breathe_met = REM * 2 // .4 units per tick // touch is slow overdose = REAGENTS_OVERDOSE diff --git a/html/changelogs/thegoret-fix-theta.yml b/html/changelogs/thegoret-fix-theta.yml new file mode 100644 index 00000000000..39fd326251b --- /dev/null +++ b/html/changelogs/thegoret-fix-theta.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Goret + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Thetamycin now metabolise at 0.01u per tick, as it used to be." \ No newline at end of file From 012af7fcc37aa75a7aca8676a8e4cc1f86295abc Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Tue, 14 Apr 2020 17:38:56 +0000 Subject: [PATCH 10/12] "[ci skip] Automatic Build - 2020.04.14.17.38.55" --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/thegoret-fix-theta.yml | 41 -------------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/thegoret-fix-theta.yml diff --git a/html/changelog.html b/html/changelog.html index b2050fbd5f1..f13e033524c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,7 @@

    Goret updated:

    • Crystal artifacts don't show a missing sprite anymore.
      • +
    • Thetamycin now metabolise at 0.01u per tick, as it used to be.

    12 April 2020

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 84723b7afc9..3e0f85eedd1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12698,3 +12698,4 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. informational description to the core. Goret: - bugfix: Crystal artifacts don't show a missing sprite anymore. + - bugfix: Thetamycin now metabolise at 0.01u per tick, as it used to be. diff --git a/html/changelogs/thegoret-fix-theta.yml b/html/changelogs/thegoret-fix-theta.yml deleted file mode 100644 index 39fd326251b..00000000000 --- a/html/changelogs/thegoret-fix-theta.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: Goret - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "Thetamycin now metabolise at 0.01u per tick, as it used to be." \ No newline at end of file From 808337043c03472d9b6713012e2f20152e33ca4c Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Tue, 14 Apr 2020 22:40:44 +0200 Subject: [PATCH 11/12] fix the CCIA shuttle launch verb (#8666) --- code/modules/cciaa/cciaa.dm | 2 +- html/changelogs/mattatlas-tinybrain.yml | 41 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-tinybrain.yml diff --git a/code/modules/cciaa/cciaa.dm b/code/modules/cciaa/cciaa.dm index d3c191ce1c9..e6129ba4f4e 100644 --- a/code/modules/cciaa/cciaa.dm +++ b/code/modules/cciaa/cciaa.dm @@ -106,5 +106,5 @@ set desc = "Launches the CCIA Shuttle." set category = "Special Verbs" - var/datum/shuttle/autodock/ferry/S = SSshuttle.shuttles["Centcom"] + var/datum/shuttle/autodock/ferry/S = SSshuttle.shuttles["Agent Shuttle"] S.launch(usr) diff --git a/html/changelogs/mattatlas-tinybrain.yml b/html/changelogs/mattatlas-tinybrain.yml new file mode 100644 index 00000000000..d5a8cfd4028 --- /dev/null +++ b/html/changelogs/mattatlas-tinybrain.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The launch CCIA shuttle verb actually works now." From 05923c4a5b77697631ea018ae8acf8f0b002ed07 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Tue, 14 Apr 2020 20:41:19 +0000 Subject: [PATCH 12/12] "[ci skip] Automatic Build - 2020.04.14.20.41.19" --- html/changelog.html | 4 +++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/mattatlas-tinybrain.yml | 41 ------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/mattatlas-tinybrain.yml diff --git a/html/changelog.html b/html/changelog.html index f13e033524c..3974e422101 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,10 @@
  • Crystal artifacts don't show a missing sprite anymore.
  • Thetamycin now metabolise at 0.01u per tick, as it used to be.
+

MattAtlas updated:

+
    +
  • The launch CCIA shuttle verb actually works now.
    • +

12 April 2020

Geeves updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3e0f85eedd1..2d0f6f7f7da 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -12699,3 +12699,5 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Goret: - bugfix: Crystal artifacts don't show a missing sprite anymore. - bugfix: Thetamycin now metabolise at 0.01u per tick, as it used to be. + MattAtlas: + - bugfix: The launch CCIA shuttle verb actually works now. diff --git a/html/changelogs/mattatlas-tinybrain.yml b/html/changelogs/mattatlas-tinybrain.yml deleted file mode 100644 index d5a8cfd4028..00000000000 --- a/html/changelogs/mattatlas-tinybrain.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: MattAtlas - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "The launch CCIA shuttle verb actually works now."