From 566aeaa2da87d82a1146643a65508cb13b8657cb Mon Sep 17 00:00:00 2001 From: naut <55491249+nauticall@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:14:53 +0800 Subject: [PATCH] Relay fixes (#19374) Fixed certain bugs on the sensor relay as well as tidied up and moved a few things around. Also added a generic version of the sensor relay's large sensor suite, for use by other away sites/ships. See IDB for the sprite. CL: - bugfix: Fixed the sensor relay away site having locked airlocks and undeconstructable windows, alongside other misc changes. - rscadd: Performed other various map tweaks and cleanup to the sensor relay. - imageadd: Added a generic variant of the sensor relay's sensor suite, intended for other away sites. Replaced the sensor relay's Solarian paintjob into its own variant. --- .../overmap/ships/computers/sensors.dm | 8 +- html/changelogs/nauticall-relayfixes.yml | 60 + icons/obj/machinery/sensors_relay.dmi | Bin 3580 -> 3492 bytes icons/obj/machinery/sensors_relay_sol.dmi | Bin 0 -> 3576 bytes .../away_site/sensor_relay/sensor_relay.dm | 20 +- .../away_site/sensor_relay/sensor_relay.dmm | 2307 +++++++++-------- 6 files changed, 1255 insertions(+), 1140 deletions(-) create mode 100644 html/changelogs/nauticall-relayfixes.yml create mode 100644 icons/obj/machinery/sensors_relay_sol.dmi diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 374b50008b1..2d42624ec43 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -654,7 +654,7 @@ /obj/machinery/shipsensors/strong/relay name = "\improper S-24 Beacon sensor array" - desc = "A vintage sensor array found on Solarian beacon relays throughout the galaxy. While it lacks deep scanning capabilities, it does have a high heat capacity." + desc = "A vintage sensor array of Solarian design. While it lacks deep scanning capabilities, it does have a high heat capacity." icon = 'icons/obj/machinery/sensors_relay.dmi' density = 1 layer = ABOVE_HUMAN_LAYER @@ -673,3 +673,9 @@ ) pixel_x = -32 pixel_y = -16 + +/obj/machinery/shipsensors/strong/relay/sol + name = "\improper S-24M Beacon sensor array" + desc = "A vintage sensor array found on Solarian sensor relays throughout the galaxy. While it lacks deep scanning capabilities, it does have a high heat capacity. This one is emblazoned with the fading flag of the pre-war Solarian Alliance." + icon = 'icons/obj/machinery/sensors_relay_sol.dmi' + desc_extended = "" diff --git a/html/changelogs/nauticall-relayfixes.yml b/html/changelogs/nauticall-relayfixes.yml new file mode 100644 index 00000000000..d9fedb7afd8 --- /dev/null +++ b/html/changelogs/nauticall-relayfixes.yml @@ -0,0 +1,60 @@ +################################ +# 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: nauticall + +# 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: + - bugfix: "Fixed the sensor relay away site having locked airlocks and undeconstructable windows, alongside other misc changes." + - rscadd: "Performed other various map tweaks and cleanup to the sensor relay." + - imageadd: "Added a generic variant of the sensor relay's sensor suite, intended for other away sites. Replaced the sensor relay's Solarian paintjob into its own variant." diff --git a/icons/obj/machinery/sensors_relay.dmi b/icons/obj/machinery/sensors_relay.dmi index 2ff751ccef676e21d612cbcd7809daee2dc3844c..1f4d45430cb623806f4d56ecd74bed18642305d9 100644 GIT binary patch delta 3155 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 delta 3243 zcmX|@2{_bS_{V2V++=JaCcCCXcXBgHDeiO=0E-K|NhT;p7*@xea?B#`+d%HKIg@Y9*Jh0J%h2furneOiSlx4 z5kNv&W2c>q*A*SZY;M?s^py~DAwFOU+kK9uDWtLLISUo(oElbFi?n=DL z3*uABiIlgv{R{+x`kNW*+eNl=S;KZ9^-;hv!T*e z&CHuZUli6(QRwwWdz#a@0CW!L1z1-^*2LO$^4Rq^+%Y)IvGobuZM6POtm4jFTMRM? zK>RtM(Fu(9BE#3FaNfiZ>e5AxxBI6X`99x<6->@jV=gf&%+nd_kW|18N3dtZg_+Z& zMI%ThR!GD{{x?l*uXUIYeg$QDIHMgZBpdD^+@h!?m&M+e6?W6_-@lW|1cVh87sdcp zUnhS%S@VXnUSP#nJ7){3Muj@c>TQg-=ZRM zGt$7fxci-9H+fEN$@N zc@F#t8>UB=Ts!4*_#9MiM;`Mewsq2WE?2Xk^VIYdEe zD(rcE4uz()_5&KMPw*kS&=OP>iR$j*IUm251i#m^JqD+#`kK@813Z8FFp8)1|RqV6u$L;k}+t&WD?zeK zl2)aDSPvVtL$z|%!dqHX&)<}gb9;wY5B!re9wdxFO@KlAuh5;Ud`Hb8RJ8%<*uOF(0m(+^${aWAXk&OtrdF90kjf^PyJrn<* zbwk%}ByjHTI)FURO0Kc^PoM4p@?UEgI`XLBF{Iqx=2w$u;XY0WQ5M(9-C22k^p(l- z==~KUj2-BhlD_9nf)w&FF>~YnNRe5r z@z=-?TJo4=IdZ66^)hcnyW_;H%NeF02bk`8<+7G7kXfnDwE2FK#}L{qs^$Sj}+3jA=g+FpfZe&G-Vh+D*w?rEQ;OYn;VR7KA(d$wE0xu!je z#OFQF#U6@6TTkv5?5!}{eMJ)M4&N#5ARb>l=D8QwgASD5jI9$1G2TQ(rj7JQ)3rEW z@T+L&t7mqhgJt4ZCXIiJjB#_g!l13HA|XB(7Y2{ca|G==r+pHuZ!(@b@VPv1_J^Mx z0AH{G+NT3HmBiCDRE0zc_Q>~fPw*-*c8Deg9$noV%jxk~n#FNZQRb_L1qFX^;}5Kd ztB9<;^MG(rmOLBZ#`py8V6VoH!}74Jnp8QgtHX_^Z|Jowfl)1^{hr~bl|lI!4|eR)Iy0acYw%sNJvOP_ftY_%;q#N$JJKl6>=&h0QA`(eOf60$3DV)2)!>}&fJ-&& zR5-O3LQf~4ZP#EFuqbk?A8T0)FFDMFxi;!|DXaX_azT z2Iz){*JtQh?$mcpAR(qf9_z!gR-FUT`n0Y*>0;{ijV6az5WH2w{aAN{&`=H~s@mOh zkHXF|KiK0$5>k5vyzDo| zL0hDQo3&;a8cgfz({%u-m>yN3bCZ2p-}Dput=cGj_Jf;FKnJ53YI-X-C1IUQn7O5B zveABL_-jh?Sh+Q1r1UPJ4o__LQ8}M(rL2t8%^oeybb6ZNTrE~r%g{0gsEOSpb|pz; zX5rL-F=|vc7&!;%UUFSC&mbT{}@oCZ- zOOt3!MS+J_5zu7+*9f6FuhUy3w3- zl!f9~qiN#>`@!t+$p54 z42m>{cQPpL_4B7w7e|4u)0&L8`wyrn_NVF}o;5PJzE038P1H-P{@;~k`L#m|tUEjk z(DR6eoFXB0y}sBxR_v$ diff --git a/icons/obj/machinery/sensors_relay_sol.dmi b/icons/obj/machinery/sensors_relay_sol.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0b71d1ecaecee8e8fb9f25d76803097a64e023a6 GIT binary patch literal 3576 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