From 486cd1e78dcf68c922bc450811b8a8fed387fe97 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 13 Apr 2020 23:33:57 -0300 Subject: [PATCH 1/4] 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 2/4] "[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 3/4] 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 4/4] "[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