From 87cccdad64f9fdd55c430b9bb9f5aff9e9d728ca Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:44:25 -0500 Subject: [PATCH] Adds Missing Science Holopads (#20181) Adds missing holopads to Research Director Officer, Xenobiology, and Xenobotany. --------- Co-authored-by: Ben10083 --- html/changelogs/Ben10083 - RD_Holo.yml | 58 ++++++++++++++++++++++++++ maps/sccv_horizon/sccv_horizon.dmm | 40 +++++++++++------- 2 files changed, 82 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/Ben10083 - RD_Holo.yml diff --git a/html/changelogs/Ben10083 - RD_Holo.yml b/html/changelogs/Ben10083 - RD_Holo.yml new file mode 100644 index 00000000000..d8329dd92c5 --- /dev/null +++ b/html/changelogs/Ben10083 - RD_Holo.yml @@ -0,0 +1,58 @@ +################################ +# 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: 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, 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: + - qol: "Holopads added to Xenobiology, Xenobotany, and Research Director's Office." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index e054fb2ba2c..2614749f242 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -5388,7 +5388,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/transport1) "aMD" = ( -/obj/structure/bed/stool/chair/office/light{ +/obj/structure/bed/stool/chair/office/bridge{ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -13428,6 +13428,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) +"bRT" = ( +/obj/structure/bed/stool/chair/office/bridge{ + dir = 8 + }, +/turf/simulated/floor/carpet/purple, +/area/crew_quarters/heads/hor) "bRU" = ( /obj/machinery/light{ dir = 1 @@ -77902,6 +77908,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "lnA" = ( @@ -96389,10 +96396,10 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/wood, /area/crew_quarters/heads/hor) "oba" = ( @@ -115262,10 +115269,6 @@ }, /turf/space/dynamic, /area/horizon/exterior) -"qNs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hor) "qNE" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -121938,7 +121941,7 @@ /turf/unsimulated/floor, /area/antag/raider) "rMd" = ( -/obj/structure/bed/stool/chair/office/dark, +/obj/machinery/hologram/holopad, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/hor) "rMk" = ( @@ -136892,6 +136895,12 @@ }, /turf/space/dynamic, /area/horizon/exterior) +"tYE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/carpet/purple, +/area/crew_quarters/heads/hor) "tYJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -139339,12 +139348,6 @@ }, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) -"upz" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/carpet/purple, -/area/crew_quarters/heads/hor) "upA" = ( /obj/item/modular_computer/console/preset/command/captain{ dir = 1 @@ -155922,6 +155925,10 @@ /obj/machinery/alarm/east, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) +"wLk" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hor) "wLn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate, @@ -159407,6 +159414,7 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "xjr" = ( @@ -274846,7 +274854,7 @@ wRk rDO dSd dSd -qNs +wLk nAk vPK dRK @@ -275108,7 +275116,7 @@ oqJ rIR cFS imu -upz +tYE dNS ixx wWT @@ -275617,7 +275625,7 @@ tru dGr cuk rMd -cuk +bRT hBJ oaT lCv