Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25130
Fluffy-Frontier · Nov 21, 2023 · 4b14069 · 4b14069
2 parents cf9d216 + f59c9ac
commit 4b14069
Show file tree

Hide file tree

Showing 8 changed files with 558 additions and 501 deletions.
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
diff --git a/code/modules/mob/living/basic/pets/parrot/poly.dm b/code/modules/mob/living/basic/pets/parrot/poly.dm
@@ -129,7 +129,7 @@
 	else
 		var/json_file = file("data/npc_saves/Poly.json")
 		if(!fexists(json_file))
-			return
+			return list()
 		var/list/json = json_decode(file2text(json_file))
 		returnable_list = json["phrases"]
 		rounds_survived = json["roundssurvived"]

diff --git a/html/changelogs/AutoChangeLog-pr-753.yml b/html/changelogs/AutoChangeLog-pr-753.yml
@@ -0,0 +1,4 @@
+author: "EuSouAFazer"
+delete-after: True
+changes:
+  - bugfix: "Meta's recycler works again"
diff --git a/html/changelogs/AutoChangeLog-pr-758.yml b/html/changelogs/AutoChangeLog-pr-758.yml
@@ -0,0 +1,4 @@
+author: "dieamond13"
+delete-after: True
+changes:
+  - bugfix: "removes a duplicate bookcase in icebox permabrig library"
diff --git a/html/changelogs/AutoChangeLog-pr-759.yml b/html/changelogs/AutoChangeLog-pr-759.yml
@@ -0,0 +1,5 @@
+author: "JohnFulpWillard"
+delete-after: True
+changes:
+  - bugfix: "[Icebox] Atmos techs have access to the Engineering front desk windoor."
+  - qol: "[Icebox] Security's lower floor is not as easily cut off from the powernet anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-760.yml b/html/changelogs/AutoChangeLog-pr-760.yml
@@ -0,0 +1,4 @@
+author: "dieamond13"
+delete-after: True
+changes:
+  - bugfix: "adds back one way exits to Tramstation science's entrance"