Merge branch 'animations' of https://github.com/EtSL33py/Paradise-SS2…

…20_SL into animations
ss220club · Nov 11, 2023 · 890c6b0 · 890c6b0
2 parents e887c68 + b2995ee
commit 890c6b0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/auto_translate.yml b/.github/workflows/auto_translate.yml
@@ -51,6 +51,6 @@ jobs:
         run: |
           git checkout translate
           git config --local user.email "[email protected]"
-          git config --local user.name "SS220Manager"
+          git config --local user.name "ss220bot"
           git commit -m "Generate translation file"
           git push origin translate:translate
diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -8394,8 +8394,7 @@
 	},
 /obj/item/reagent_containers/food/drinks/flask/detflask{
 	pixel_x = 16;
-	pixel_y = 4;
-	initialized = 1
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"

diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
@@ -139281,7 +139281,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+dWf
 aaa
 aaa
 aaa
@@ -140324,7 +140324,7 @@ aaa
 aaa
 aaa
 aaa
-dWf
+aaa
 aaa
 aaa
 aaa

diff --git a/config/example/config.toml b/config/example/config.toml
@@ -566,6 +566,11 @@ overflow_server = "byond://yourdomain.com:1111"
 # List of ckeys who will not get rerouted to the overflow server
 overflow_whitelist = ["keyhere", "anotherhere"]
 
+# SS220 addition
+# Slot saving  time for client reconnection (in seconds)
+reservation_time = 10
+
+
 
 ################################################################
 

diff --git a/modular_ss220/queue/_queue.dme b/modular_ss220/queue/_queue.dme
@@ -2,3 +2,4 @@
 
 #include "code/new_player_procs.dm"
 #include "code/queue_bypass.dm"
+#include "code/overflow_configuration.dm"
diff --git a/modular_ss220/queue/code/new_player_procs.dm b/modular_ss220/queue/code/new_player_procs.dm
@@ -16,12 +16,13 @@
 			SSqueue.queue_bypass_list |= ckey
 			return
 
-		src << link("byond://[GLOB.configuration.overflow.overflow_server_location]")
+		src << link(GLOB.configuration.overflow.overflow_server_location)
 
 /mob/new_player/Logout()
 	. = ..()
 
-	addtimer(CALLBACK(SSqueue, TYPE_PROC_REF(/datum/controller/subsystem/queue, reserve_queue_slot), last_known_ckey), 10 MINUTES)
+	if(SSqueue.queue_enabled)
+		addtimer(CALLBACK(SSqueue, TYPE_PROC_REF(/datum/controller/subsystem/queue, reserve_queue_slot), last_known_ckey), GLOB.configuration.overflow.reservation_time)
 
 
 /datum/controller/subsystem/queue/proc/reserve_queue_slot(reserved_ckey)

diff --git a/modular_ss220/queue/code/overflow_configuration.dm b/modular_ss220/queue/code/overflow_configuration.dm
@@ -0,0 +1,7 @@
+/datum/configuration_section/overflow_configuration
+	var/reservation_time = 1 MINUTES
+
+/datum/configuration_section/overflow_configuration/load_data(list/data)
+	. = ..()
+
+	CONFIG_LOAD_NUM(reservation_time, data["reservation_time"])
diff --git a/tools/changelog/check_changelog.py b/tools/changelog/check_changelog.py
@@ -11,7 +11,7 @@
 import os
 import re
 from pathlib import Path
-from ruamel import yaml
+from ruamel.yaml import YAML
 from github import Github
 import json
 
@@ -88,7 +88,8 @@
     print("There are spaces or tabs instead of author username")
 
 with open(Path.cwd().joinpath("tags.yml")) as file:
-    tags = yaml.safe_load(file)
+    yaml = YAML(typ='safe',pure=True)
+    tags = yaml.load(file)
 
 write_cl['changes'] = []
-Original file line number
+Diff line change
@@ Expand Up / @@ -139281,7 +139281,7 @@ aaa @@
     aaa
     aaa
     aaa
-    aaa
+    dWf
     aaa
     aaa
     aaa
@@ Expand Down Expand Up / @@ -140324,7 +140324,7 @@ aaa @@
     aaa
     aaa
     aaa
-    dWf
+    aaa
     aaa
     aaa
     aaa
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		#include "code/new_player_procs.dm"
		#include "code/queue_bypass.dm"
		#include "code/overflow_configuration.dm"