From fc1c2fcf5d6564cfb74d76f56a224fc39b1ecaaf Mon Sep 17 00:00:00 2001
From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Date: Wed, 27 Dec 2023 17:39:40 +0100
Subject: [PATCH] a (#18054)

Co-authored-by: DreamySkrell <>
---
 code/modules/cargo/delivery/package.dm        |  1 +
 .../DreamySkrell-scc-scout-ship-packages.yml  | 42 +++++++++++++++++++
 maps/away/ships/scc/scc_scout_ship.dmm        | 41 ++++++++++++++++--
 3 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/DreamySkrell-scc-scout-ship-packages.yml

diff --git a/code/modules/cargo/delivery/package.dm b/code/modules/cargo/delivery/package.dm
index 832d52cb093..13a0734f6c8 100644
--- a/code/modules/cargo/delivery/package.dm
+++ b/code/modules/cargo/delivery/package.dm
@@ -27,6 +27,7 @@
 		pay_amount = rand(12, 17) * 1000
 	if(delivery_point)
 		setup_delivery_point(delivery_point)
+	color = pick("#FFFFFF", "#EEEEEE", "#DDDDDD", "#CCCCCC", "#BBBBBB", "#FFDDDD", "#DDDDFF", "#FFFFDD", "#886600")
 
 /obj/item/cargo_package/proc/setup_delivery_point(var/obj/structure/cargo_receptacle/delivery_point)
 	associated_delivery_point = WEAKREF(delivery_point)
diff --git a/html/changelogs/DreamySkrell-scc-scout-ship-packages.yml b/html/changelogs/DreamySkrell-scc-scout-ship-packages.yml
new file mode 100644
index 00000000000..4d45929f6fb
--- /dev/null
+++ b/html/changelogs/DreamySkrell-scc-scout-ship-packages.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds OX packages and delivery point to the SCC Scout Ship."
+  - rscadd: "OX packages randomly pick a color from a limited selection."
diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm
index 28e2f5c9525..de37a300b5f 100644
--- a/maps/away/ships/scc/scc_scout_ship.dmm
+++ b/maps/away/ships/scc/scc_scout_ship.dmm
@@ -3608,6 +3608,19 @@
 /obj/random/dirt_75,
 /turf/simulated/floor/tiled/white,
 /area/ship/scc_scout_ship/medbay)
+"wI" = (
+/obj/random/dirt_75,
+/obj/item/cargo_package/offship/to_horizon{
+	pixel_y = 10;
+	pixel_x = -3
+	},
+/obj/item/cargo_package/offship{
+	pixel_y = -2;
+	pixel_x = 3
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/scc_scout_ship/engineering_cargo)
 "wM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -4184,13 +4197,13 @@
 /turf/simulated/floor/marble,
 /area/ship/scc_scout_ship/mess)
 "Bk" = (
-/obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/random/dirt_75,
 /obj/random/dirt_75,
+/obj/structure/cargo_receptacle,
 /turf/simulated/floor/tiled/dark,
 /area/ship/scc_scout_ship/engineering_cargo)
 "Bm" = (
@@ -4527,6 +4540,19 @@
 	},
 /turf/space/dynamic,
 /area/ship/scc_scout_ship/exterior)
+"DX" = (
+/obj/random/dirt_75,
+/obj/item/cargo_package/offship{
+	pixel_y = 10;
+	pixel_x = -3
+	},
+/obj/item/cargo_package/offship{
+	pixel_y = -2;
+	pixel_x = 3
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/scc_scout_ship/engineering_cargo)
 "Ed" = (
 /obj/structure/lattice,
 /obj/effect/landmark/entry_point/fore{
@@ -5214,7 +5240,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/scc_scout_ship/eva)
 "Js" = (
-/obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
@@ -5224,6 +5249,14 @@
 	},
 /obj/random/dirt_75,
 /obj/random/dirt_75,
+/obj/item/cargo_package/offship{
+	pixel_y = 10;
+	pixel_x = -3
+	},
+/obj/item/cargo_package/offship/to_horizon{
+	pixel_y = -2;
+	pixel_x = 3
+	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/scc_scout_ship/engineering_cargo)
 "JB" = (
@@ -44410,8 +44443,8 @@ Wx
 Oz
 pP
 wm
-cW
-cW
+wI
+DX
 WR
 bZ
 bZ