From 4551b8b7bc0e0fe2d1fc318c4afc6e73d2ec6ccf Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 28 Aug 2020 16:15:08 +0200 Subject: [PATCH] Cargo Fluff (#9781) --- code/__defines/misc.dm | 1 + code/controllers/subsystems/cargo.dm | 7 ++++--- code/datums/cargo.dm | 2 ++ html/changelogs/geeves-cargo_stuff.yml | 7 +++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-cargo_stuff.yml diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 992915bcc92..c1c7bed40f0 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -340,6 +340,7 @@ #define CARGO_CONTAINER_CRATE "crate" #define CARGO_CONTAINER_FREEZER "freezer" #define CARGO_CONTAINER_BOX "box" +#define CARGO_CONTAINER_BODYBAG "bodybag" // We should start using these. #define ITEMSIZE_TINY 1 diff --git a/code/controllers/subsystems/cargo.dm b/code/controllers/subsystems/cargo.dm index 198f539d1b1..8faf7998a70 100644 --- a/code/controllers/subsystems/cargo.dm +++ b/code/controllers/subsystems/cargo.dm @@ -296,7 +296,7 @@ var/datum/controller/subsystem/cargo/SScargo return path_error //Check if a valid container is specified - if(!(ci.container_type == CARGO_CONTAINER_CRATE || ci.container_type == CARGO_CONTAINER_FREEZER || ci.container_type == CARGO_CONTAINER_BOX)) + if(!(ci.container_type in list(CARGO_CONTAINER_CRATE, CARGO_CONTAINER_FREEZER, CARGO_CONTAINER_BOX, CARGO_CONTAINER_BODYBAG))) log_debug("SScargo: Invalid container type specified for item [name] - [id]: Aborting") qdel(ci) return "Invalid container type specified for item [name] - [id]" @@ -676,8 +676,9 @@ var/datum/controller/subsystem/cargo/SScargo var/obj/A = new containertype(pickedloc) //Label the crate - //TODO-CARGO: Look into wrapping it in a the suppliers paper - A.name = "[co.order_id] - [co.ordered_by]" + A.name_unlabel = A.name + A.name = "[A.name] ([co.order_id] - [co.ordered_by])" + A.verbs += /atom/proc/remove_label //Set the access requirement if(co.required_access.len > 0) diff --git a/code/datums/cargo.dm b/code/datums/cargo.dm index 279b6000663..7c694ad61c2 100644 --- a/code/datums/cargo.dm +++ b/code/datums/cargo.dm @@ -265,6 +265,8 @@ return /obj/structure/largecrate if(CARGO_CONTAINER_FREEZER) return /obj/structure/closet/crate/freezer + if(CARGO_CONTAINER_BODYBAG) + return /obj/structure/closet/body_bag else log_debug("Cargo: Tried to get container type for invalid container [container_type]") return /obj/structure/largecrate diff --git a/html/changelogs/geeves-cargo_stuff.yml b/html/changelogs/geeves-cargo_stuff.yml new file mode 100644 index 00000000000..fc8f271fd5c --- /dev/null +++ b/html/changelogs/geeves-cargo_stuff.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Certain cargo items, such as protohumans, now arrive in bodybags instead of crates." + - rscadd: "Cargo containers now arrive labeled, which allows you to take the label off. The paper inside the container will still hold the owner's info." \ No newline at end of file