Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master

code/game/world.dm

@@ -20,8 +20,6 @@ GLOBAL_LIST(topic_status_cache)
 
 	log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
 
-	SetupExternalRSC()
-
 	GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl
 
 	make_datum_references_lists()	//initialises global lists for referencing frequently used datums (so that we only ever do it once)
@@ -87,17 +85,6 @@ GLOBAL_LIST(topic_status_cache)
 #endif
 	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, cb, 10 SECONDS))
 
-/world/proc/SetupExternalRSC()
-#if (PRELOAD_RSC == 0)
-	GLOB.external_rsc_urls = world.file2list("[global.config.directory]/external_rsc_urls.txt","\n")
-	var/i=1
-	while(i<=GLOB.external_rsc_urls.len)
-		if(GLOB.external_rsc_urls[i])
-			i++
-		else
-			GLOB.external_rsc_urls.Cut(i,i+1)
-#endif
-
 /world/proc/SetupLogs()
 	var/override_dir = params[OVERRIDE_LOG_DIRECTORY_PARAMETER]
 	if(!override_dir)

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -106,6 +106,7 @@
 	set_colour(new_colour)
 	. = ..()
 	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_SLIME, 7.5)
+	set_nutrition(rand(650, 800))
 
 /mob/living/simple_animal/slime/Destroy()
 	for (var/A in actions)

html/changelog.html

@@ -50,6 +50,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 September 2020</h2>
+			<h3 class="author">BlueWildrose updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixed slimes starting off hungry</li>
+			</ul>
+
 			<h2 class="date">31 August 2020</h2>
 			<h3 class="author">Arturlang updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -27275,3 +27275,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - refactor: tongue speech handling is now done by accent datums
   zeroisthebiggay:
   - rscdel: waffleco
+2020-09-01:
+  BlueWildrose:
+  - bugfix: fixed slimes starting off hungry