From a7892bff0c07bbde0c6ecb5a3deda7abdfec8c54 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Sun, 11 Feb 2024 16:02:30 -0500 Subject: [PATCH] Trinary holodeck (#18368) * Trinary Holodeck Tweaks * Changelog --------- Co-authored-by: Ben10083 --- html/changelogs/Ben10083 - Trinary_Holo.yml | 41 +++++++++++++++++++ maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 10 +++-- 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Ben10083 - Trinary_Holo.yml diff --git a/html/changelogs/Ben10083 - Trinary_Holo.yml b/html/changelogs/Ben10083 - Trinary_Holo.yml new file mode 100644 index 00000000000..c7ae4c48c08 --- /dev/null +++ b/html/changelogs/Ben10083 - Trinary_Holo.yml @@ -0,0 +1,41 @@ +################################ +# 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: Ben10083 + +# 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: + - maptweak: "Trinary Holodeck template tweaked with additional items." diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index aa9fc159391..5bd1a2bfa74 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -38978,12 +38978,16 @@ /area/horizon/holodeck/source_emptycourt) "pgL" = ( /obj/structure/table/rack, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/trinary, /obj/effect/floor_decal/corner/red{ dir = 5; icon_state = "corner_white" }, +/obj/item/device/versebook/trinary, +/obj/item/device/versebook/trinary, +/obj/item/clothing/mask/trinary_mask, +/obj/item/clothing/mask/trinary_mask, +/obj/item/clothing/mask/trinary_mask, +/obj/item/clothing/mask/trinary_mask, /turf/simulated/floor/marble, /area/horizon/holodeck/source_trinary) "pic" = ( @@ -39336,13 +39340,13 @@ }, /obj/item/clothing/mask/trinary_mask, /obj/item/clothing/mask/trinary_mask, +/obj/item/clothing/mask/trinary_mask, /obj/item/flame/candle{ pixel_x = 6 }, /obj/item/flame/candle{ pixel_x = -6 }, -/obj/item/clothing/mask/trinary_mask, /turf/simulated/floor/bluegrid, /area/horizon/holodeck/source_trinary) "qHU" = (