Merge remote-tracking branch 'Updato/master'

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
 

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

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())

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

html/changelog.html

@@ -35,6 +35,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 April 2020</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The emergency shuttle can only be called after one hour into the round. This can be changed on the config file.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed slime core batteries from charging over their maxcharge cap.</li>
+				<li class="tweak">Increased the slime core battery maxcharge cap from 10K to 15K. Added an informational description to the core.</li>
+			</ul>
+
 			<h2 class="date">12 April 2020</h2>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -12688,3 +12688,11 @@ 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.
+  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.