From c817d739764ea899c5204abf7b4a68c7cb06e18c Mon Sep 17 00:00:00 2001 From: courierbravo <73250577+courierbravo@users.noreply.github.com> Date: Tue, 3 Sep 2024 05:28:30 -0700 Subject: [PATCH] Shuttle Helpers - Encryption Keys and Bugfix (#19831) removes the encryption key crate and replaces it with the encryption key vending machine. fixes the bathroom on the artemis shuttle --- ...courierbravo-helper-shuttle-encryption.yml | 59 +++++++++++++++++ .../helpers/event_shuttles/sccv_apollo_v1.dmm | 56 +--------------- .../helpers/event_shuttles/sccv_apollo_v2.dmm | 56 +--------------- .../helpers/event_shuttles/sccv_apollo_v3.dmm | 56 +--------------- maps/helpers/event_shuttles/sccv_artemis.dmm | 65 +++---------------- maps/helpers/event_shuttles/sccv_packrat.dmm | 56 +--------------- 6 files changed, 80 insertions(+), 268 deletions(-) create mode 100644 html/changelogs/courierbravo-helper-shuttle-encryption.yml diff --git a/html/changelogs/courierbravo-helper-shuttle-encryption.yml b/html/changelogs/courierbravo-helper-shuttle-encryption.yml new file mode 100644 index 00000000000..cc07a5bdd57 --- /dev/null +++ b/html/changelogs/courierbravo-helper-shuttle-encryption.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CourierBravo + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Replaced the encryption key crates on the event shuttle helpers with the encryption vending machine." + - bugfix: "Fixed the door bolting buttons on the Artemis shuttle helper, allowing the bathroom doors to be bolted shut." diff --git a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm index 33b501d7628..4b75606df7a 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm @@ -901,60 +901,9 @@ /turf/simulated/floor/carpet/rubber, /area/scc_event_shuttle) "mo" = ( -/obj/structure/closet/crate/secure{ - name = "encryption keys crate"; - req_access = list(19) +/obj/machinery/vending/encryption{ + pixel_y = 29 }, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "mp" = ( @@ -3326,6 +3275,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/device/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "XU" = ( diff --git a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm index 9ccc818e77c..5fe9a04e965 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm @@ -356,60 +356,9 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "du" = ( -/obj/structure/closet/crate/secure{ - name = "encryption keys crate"; - req_access = list(19) +/obj/machinery/vending/encryption{ + pixel_y = 29 }, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "dB" = ( @@ -1719,6 +1668,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/device/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "yM" = ( diff --git a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm index 82c10ea4530..39aaacdc505 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm @@ -132,60 +132,9 @@ /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "cz" = ( -/obj/structure/closet/crate/secure{ - name = "encryption keys crate"; - req_access = list(19) +/obj/machinery/vending/encryption{ + pixel_y = 29 }, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "cH" = ( @@ -2665,6 +2614,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/device/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "TJ" = ( diff --git a/maps/helpers/event_shuttles/sccv_artemis.dmm b/maps/helpers/event_shuttles/sccv_artemis.dmm index b1ece2b9041..e29a9420ed5 100644 --- a/maps/helpers/event_shuttles/sccv_artemis.dmm +++ b/maps/helpers/event_shuttles/sccv_artemis.dmm @@ -301,7 +301,8 @@ /area/scc_event_shuttle) "eX" = ( /obj/machinery/door/airlock/freezer{ - name = "Stall 2" + name = "Stall 2"; + id_tag = "shuttle_stall_2" }, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -802,60 +803,9 @@ /turf/simulated/floor/tiled/white, /area/scc_event_shuttle) "oi" = ( -/obj/structure/closet/crate/secure{ - name = "encryption keys crate"; - req_access = list(19) +/obj/machinery/vending/encryption{ + pixel_y = 29 }, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "ov" = ( @@ -1149,7 +1099,8 @@ /area/scc_event_shuttle) "th" = ( /obj/machinery/door/airlock/freezer{ - name = "Stall 3" + name = "Stall 3"; + id_tag = "shuttle_stall_3" }, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -1592,6 +1543,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/device/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "zX" = ( @@ -3278,7 +3230,8 @@ /area/scc_event_shuttle) "WC" = ( /obj/machinery/door/airlock/freezer{ - name = "Stall 1" + name = "Stall 1"; + id_tag = "shuttle_stall_1" }, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) diff --git a/maps/helpers/event_shuttles/sccv_packrat.dmm b/maps/helpers/event_shuttles/sccv_packrat.dmm index cd56088027d..c910450a8d8 100644 --- a/maps/helpers/event_shuttles/sccv_packrat.dmm +++ b/maps/helpers/event_shuttles/sccv_packrat.dmm @@ -212,6 +212,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/device/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "ex" = ( @@ -1586,60 +1587,9 @@ /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "Iq" = ( -/obj/structure/closet/crate/secure{ - name = "encryption keys crate"; - req_access = list(19) +/obj/machinery/vending/encryption{ + pixel_y = 29 }, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/cargo_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/sci_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/med_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/sec_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, -/obj/item/device/encryptionkey/service_spare, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "Ir" = (