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/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/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/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/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 047e37ba34e..92a9fe58423 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -389,8 +389,8 @@ Command action procs to_chat(user, SPAN_WARNING("The emergency shuttle cannot be sent at this time. Please try again later.")) return FALSE - if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE - to_chat(user, SPAN_WARNING("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/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/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/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/changelog.html b/html/changelog.html index 014c8937fd2..3974e422101 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,32 @@ -->
+

14 April 2020

+

Alberyk updated:

+ +

Geeves updated:

+ +

Goret updated:

+ +

MattAtlas updated:

+ + +

12 April 2020

+

Geeves updated:

+ +

11 April 2020

Ferner updated: