From d0ae3a61d92b37aeb7b447b9035a612c4d617930 Mon Sep 17 00:00:00 2001
From: DexterDude <endermite7@Gmail.com>
Date: Tue, 20 Aug 2024 15:14:05 -0400
Subject: [PATCH 1/9] Cherokee kill (#398)

Co-authored-by: AndroBetel <44546836+AndroBetel@users.noreply.github.com>
---
 maps/shuttles/dropship_cherokee.dmm | 258 ----------------------------
 1 file changed, 258 deletions(-)
 delete mode 100644 maps/shuttles/dropship_cherokee.dmm

diff --git a/maps/shuttles/dropship_cherokee.dmm b/maps/shuttles/dropship_cherokee.dmm
deleted file mode 100644
index 56a4f62239..0000000000
--- a/maps/shuttles/dropship_cherokee.dmm
+++ /dev/null
@@ -1,258 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/area/space,
-/turf/open/space/basic)
-
-(1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(3,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(8,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(9,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(10,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(11,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}

From fb00d553b653af38763e0dd26ee1f5771e1172c8 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 20 Aug 2024 20:14:24 +0100
Subject: [PATCH 2/9] Automatic changelog for PR #398 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-398.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-398.yml

diff --git a/html/changelogs/AutoChangeLog-pr-398.yml b/html/changelogs/AutoChangeLog-pr-398.yml
new file mode 100644
index 0000000000..e5464ba85e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-398.yml
@@ -0,0 +1,4 @@
+author: "DexterDude"
+delete-after: True
+changes:
+  - rscadd: "Added something"
\ No newline at end of file

From d2b8ad95b71d5aa59f6cb645f583bdbfd9c1133a Mon Sep 17 00:00:00 2001
From: DexterDude <endermite7@Gmail.com>
Date: Tue, 20 Aug 2024 17:16:48 -0400
Subject: [PATCH 3/9] Delete shuttle_size.dmm (#400)

---
 maps/shuttles/shuttle_size.dmm | 258 ---------------------------------
 1 file changed, 258 deletions(-)
 delete mode 100644 maps/shuttles/shuttle_size.dmm

diff --git a/maps/shuttles/shuttle_size.dmm b/maps/shuttles/shuttle_size.dmm
deleted file mode 100644
index 56a4f62239..0000000000
--- a/maps/shuttles/shuttle_size.dmm
+++ /dev/null
@@ -1,258 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/area/space,
-/turf/open/space/basic)
-
-(1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(3,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(8,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(9,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(10,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(11,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}

From cb17863ec61ecb777b4096954e62dbed46db85c4 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 20 Aug 2024 22:18:58 +0100
Subject: [PATCH 4/9] Automatic changelog for PR #400 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-400.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-400.yml

diff --git a/html/changelogs/AutoChangeLog-pr-400.yml b/html/changelogs/AutoChangeLog-pr-400.yml
new file mode 100644
index 0000000000..e5464ba85e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-400.yml
@@ -0,0 +1,4 @@
+author: "DexterDude"
+delete-after: True
+changes:
+  - rscadd: "Added something"
\ No newline at end of file

From 27b2e81006395bbad18344c271c6d917163a5733 Mon Sep 17 00:00:00 2001
From: DexterDude <endermite7@Gmail.com>
Date: Tue, 20 Aug 2024 17:21:26 -0400
Subject: [PATCH 5/9] fixes dropship icon states (#401)

---
 maps/shuttles/dropship_midway.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm
index d5b269fe39..a1e0627e88 100644
--- a/maps/shuttles/dropship_midway.dmm
+++ b/maps/shuttles/dropship_midway.dmm
@@ -39,7 +39,7 @@
 /area/shuttle/midway)
 "dE" = (
 /turf/closed/shuttle/midway{
-	icon_state = "42"
+	icon_state = "36"
 	},
 /area/shuttle/midway)
 "eu" = (

From 5ac05e725c2cf3c497ea9ac7f28b57ff19728aeb Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 20 Aug 2024 22:23:15 +0100
Subject: [PATCH 6/9] Automatic changelog for PR #401 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-401.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-401.yml

diff --git a/html/changelogs/AutoChangeLog-pr-401.yml b/html/changelogs/AutoChangeLog-pr-401.yml
new file mode 100644
index 0000000000..e5464ba85e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-401.yml
@@ -0,0 +1,4 @@
+author: "DexterDude"
+delete-after: True
+changes:
+  - rscadd: "Added something"
\ No newline at end of file

From aa243fbff94e54feb12612ea80c29648f6d9e9bd Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 21 Aug 2024 01:17:40 +0000
Subject: [PATCH 7/9] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-398.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-400.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-401.yml | 4 ----
 html/changelogs/archive/2024-08.yml      | 3 +++
 4 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-398.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-400.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-401.yml

diff --git a/html/changelogs/AutoChangeLog-pr-398.yml b/html/changelogs/AutoChangeLog-pr-398.yml
deleted file mode 100644
index e5464ba85e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-398.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DexterDude"
-delete-after: True
-changes:
-  - rscadd: "Added something"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-400.yml b/html/changelogs/AutoChangeLog-pr-400.yml
deleted file mode 100644
index e5464ba85e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-400.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DexterDude"
-delete-after: True
-changes:
-  - rscadd: "Added something"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-401.yml b/html/changelogs/AutoChangeLog-pr-401.yml
deleted file mode 100644
index e5464ba85e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-401.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DexterDude"
-delete-after: True
-changes:
-  - rscadd: "Added something"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
index eec1de5ffe..cf1ba0eca3 100644
--- a/html/changelogs/archive/2024-08.yml
+++ b/html/changelogs/archive/2024-08.yml
@@ -84,3 +84,6 @@
   - bugfix: Fixed the 88 Mod 4 pistol's holster sprite.
   - admin: bitfields for MODE_NO_XENO_EVOLVE, MODE_HARDCORE_PERMA, and MODE_NO_JOIN_AS_XENO
       now work
+2024-08-21:
+  DexterDude:
+  - rscadd: Added something

From d764b1a7174e943ea8f2512b6cee8398de074eec Mon Sep 17 00:00:00 2001
From: Pandora <pandora_29@outlook.com>
Date: Wed, 21 Aug 2024 20:05:54 +0100
Subject: [PATCH 8/9] Galley Gaming (#388)

---
 maps/map_files/golden_arrow/golden_arrow.dmm | 98 +++++++++++++-------
 1 file changed, 66 insertions(+), 32 deletions(-)

diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 37c6f5290e..ea4c79dfd9 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -1285,6 +1285,19 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
+"eM" = (
+/obj/structure/surface/table/almayer,
+/obj/item/tool/kitchen/rollingpin{
+	pixel_y = 4;
+	pixel_x = -6
+	},
+/obj/item/tool/kitchen/knife{
+	pixel_x = 9
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/golden_arrow/cryo_cells)
 "eN" = (
 /obj/structure/machinery/gear{
 	id = "supply_elevator_gear"
@@ -3644,11 +3657,27 @@
 	},
 /area/golden_arrow/hangar)
 "nD" = (
+/obj/structure/surface/rack{
+	pixel_y = 14;
+	pixel_x = 4
+	},
 /obj/structure/reagent_dispensers/water_cooler/stacks{
 	density = 0;
 	pixel_x = -10;
 	pixel_y = 6
 	},
+/obj/item/reagent_container/food/condiment/peppermill{
+	pixel_y = 26;
+	pixel_x = 1
+	},
+/obj/item/reagent_container/food/condiment/saltshaker{
+	pixel_y = 26;
+	pixel_x = -3
+	},
+/obj/item/storage/box/drinkingglasses{
+	pixel_x = 10;
+	pixel_y = 28
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -6992,23 +7021,19 @@
 	},
 /area/golden_arrow/cryo_cells)
 "AV" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_x = -5;
-	pixel_y = 6
-	},
-/obj/item/trash/plate{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/trash/plate{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/trash/plate{
-	pixel_x = -4;
-	pixel_y = 9
+/obj/structure/closet/secure_closet/freezer{
+	name = "Industrial Freezer";
+	desc = "An industrial-grade deep-freezer designed to keep ingredients within 'fresh' over the course of faster-than-light travel. Might impact the taste somewhat. Don't leave the door open too long!"
 	},
+/obj/item/reagent_container/food/condiment/sugar,
+/obj/item/reagent_container/food/condiment/enzyme,
+/obj/item/reagent_container/food/drinks/milk,
+/obj/item/reagent_container/food/drinks/milk,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
+/obj/item/reagent_container/food/snacks/flour,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -7535,9 +7560,6 @@
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
 "Dn" = (
-/obj/structure/surface/rack{
-	pixel_y = 19
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/medical/ointment{
 	pixel_x = 2;
@@ -8018,17 +8040,29 @@
 /area/golden_arrow/prep_hallway)
 "Fl" = (
 /obj/structure/surface/table/almayer,
+/obj/item/tool/kitchen/tray{
+	pixel_x = -3;
+	pixel_y = 3
+	},
 /obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 7;
-	pixel_y = 14
+	pixel_x = 12;
+	pixel_y = 18
 	},
-/obj/item/paper_bin{
-	pixel_x = -7;
+/obj/item/trash/plate{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/trash/plate{
+	pixel_x = -3;
 	pixel_y = 5
 	},
 /obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 6;
-	pixel_y = 6
+	pixel_y = 18;
+	pixel_x = 2
+	},
+/obj/item/trash/plate{
+	pixel_x = -4;
+	pixel_y = 7
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
@@ -21955,12 +21989,12 @@ EG
 EG
 EG
 Wh
-Nz
+nD
 HF
 rQ
 HF
 Fl
-og
+AV
 og
 CM
 Bf
@@ -22111,8 +22145,8 @@ fl
 HF
 rQ
 HF
-AV
-og
+HF
+HF
 og
 Va
 TB
@@ -22263,8 +22297,8 @@ zG
 aA
 vN
 nW
-nD
-og
+Nz
+eM
 og
 Dq
 Ms
@@ -22417,7 +22451,7 @@ Ir
 Ir
 Ir
 Ir
-Vi
+og
 og
 Hv
 Iz

From 4923ab5601251b92d77bee44c23af82a00a8037a Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 21 Aug 2024 20:06:16 +0100
Subject: [PATCH 9/9] Automatic changelog for PR #388 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-388.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-388.yml

diff --git a/html/changelogs/AutoChangeLog-pr-388.yml b/html/changelogs/AutoChangeLog-pr-388.yml
new file mode 100644
index 0000000000..ec1aef75ea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-388.yml
@@ -0,0 +1,4 @@
+author: "BonniePandora"
+delete-after: True
+changes:
+  - maptweak: "Expanded the galley of the Golden Arrow."
\ No newline at end of file