From 64ffa5398efcd9fbf4e4ad093250be3664b74991 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Mon, 3 Jun 2024 09:19:47 -0400 Subject: [PATCH] Unathi Hiskyn Revanchists Ship Fixes (#19321) Fixes https://github.com/Aurorastation/Aurora.3/issues/19147 Fixes https://github.com/Aurorastation/Aurora.3/issues/19130 Hiskyn Revanchists now have telecomms, tarwa telecomms accessible --------- Co-authored-by: Ben10083 --- html/changelogs/Ben10083 - Unathi Pirate.yml | 60 +++++++++++++++++++ .../hiskyn/unathi_pirate_hiskyn.dmm | 46 +++++++++----- .../tarwa/unathi_pirate_tarwa.dmm | 10 +++- 3 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/Ben10083 - Unathi Pirate.yml diff --git a/html/changelogs/Ben10083 - Unathi Pirate.yml b/html/changelogs/Ben10083 - Unathi Pirate.yml new file mode 100644 index 00000000000..79df26c5be7 --- /dev/null +++ b/html/changelogs/Ben10083 - Unathi Pirate.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: 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: + - bugfix: "Hiskyn Revanchists have successfully stolen and installed telecommunications equipment for their vessels." + - bugfix: "Hiskyn Pirate ship missing fuel pipe placed." + - bugfix: "Tarwa Pirate ship telecommunications now accessible." diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm index 5f5a0ace6fb..3e0ed9b6686 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm @@ -3612,6 +3612,9 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, /turf/simulated/floor/plating, /area/hiskyn_ship/thrusts) "ixC" = ( @@ -4279,6 +4282,9 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/hiskyn_revanchists) +"mkA" = ( +/turf/simulated/floor/tiled/dark, +/area/hiskyn_ship/armory) "mmy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5144,12 +5150,17 @@ /turf/simulated/wall/shuttle/dark/cardinal/red, /area/hiskyn_ship/blaster) "rIK" = ( -/obj/random/dirt_75, -/obj/random/contraband, -/obj/item/trash/kokobar, -/obj/item/trash/kokobar, -/obj/item/trash/kokobar, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Telecomms" + }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "TELECOMMS ROOM - COLD!"; + pixel_y = 32 + }, +/obj/structure/plasticflaps/airtight, +/turf/simulated/floor/plating, /area/hiskyn_ship/armory) "rKq" = ( /obj/structure/bed/stool/chair/office/bridge/pilot{ @@ -5882,9 +5893,14 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/hiskyn_revanchists) "vSl" = ( -/obj/item/trash/kokobar, -/obj/item/trash/kokobar, -/turf/simulated/floor/tiled/dark, +/obj/machinery/telecomms/allinone/ship, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + name = "cooled floor"; + temperature = 278 + }, /area/hiskyn_ship/armory) "vSA" = ( /turf/simulated/wall/shuttle/space_ship{ @@ -36194,8 +36210,8 @@ aEV beV gdc gdc -vSl -rIK +vIY +vIY acL nGu aao @@ -36451,7 +36467,7 @@ lKU kbm gdc nPJ -xsr +vIY vSl acL tYI @@ -36709,7 +36725,7 @@ abw gdc gdc gdc -vIY +rIK acL acL aHf @@ -36964,9 +36980,9 @@ aVy eoo kxd mSr -mSr -tcX mqx +tcX +mkA uZs aRt aai diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index 450b5987966..519a4687c8c 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -2120,7 +2120,12 @@ name = "TELECOMMS ROOM - COLD!"; pixel_y = -32 }, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Telecomms"; + req_one_access = list(210) + }, +/turf/simulated/floor/plating, /area/tarwa_ship/engineering1) "Ef" = ( /obj/machinery/shipsensors, @@ -3202,6 +3207,9 @@ /area/tarwa_ship/diona) "Qa" = ( /obj/machinery/telecomms/allinone/ship, +/obj/machinery/light/small/emergency{ + dir = 4 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278