diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index ea30992284b..c4640806ae0 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -80,7 +80,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked priority_announcement.Announce(txt,"SUPERMATTER CASCADE DETECTED") for(var/obj/machinery/computer/shuttle_control/C in SSmachinery.processing_machines) - if(istype(C, /obj/machinery/computer/shuttle_control/research) || istype(C, /obj/machinery/computer/shuttle_control/mining)) + if(istype(C, /obj/machinery/computer/shuttle_control/multi/research) || istype(C, /obj/machinery/computer/shuttle_control/mining)) C.req_access = list() C.req_one_access = list() diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm index 277a14944c6..ee31aa1c472 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm @@ -105,7 +105,7 @@ /obj/item/circuitboard/research_shuttle name = T_BOARD("research shuttle console") - build_path = /obj/machinery/computer/shuttle_control/research + build_path = /obj/machinery/computer/shuttle_control/multi/research origin_tech = list(TECH_DATA = 2) /obj/item/circuitboard/area_atmos diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index ddf17d57922..54008daf5ee 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -12,12 +12,12 @@ name = "research shuttle control console" shuttle_tag = "Research Shuttle" req_access = list(access_research) - circuit = /obj/item/circuitboard/research_shuttle /obj/machinery/computer/shuttle_control/multi/research name = "research shuttle control computer" shuttle_tag = "Research Shuttle" req_access = list(access_research) + circuit = /obj/item/circuitboard/research_shuttle /datum/shuttle/autodock/multi/research_aurora var/triggered_away_sites = FALSE @@ -34,4 +34,4 @@ /obj/machinery/computer/shuttle_control/merchant name = "merchant shuttle control console" req_access = list(access_merchant) - shuttle_tag = "Merchant Shuttle" \ No newline at end of file + shuttle_tag = "Merchant Shuttle" diff --git a/html/changelogs/arrow768-deconstructable-research-shuttle-console.yml b/html/changelogs/arrow768-deconstructable-research-shuttle-console.yml new file mode 100644 index 00000000000..88a9b558836 --- /dev/null +++ b/html/changelogs/arrow768-deconstructable-research-shuttle-console.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: arrow768 + +# 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: + - bugfix: "The research shuttle console can be deconstructed again." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 6041e7c8ce1..396b7fb94e7 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -34180,6 +34180,7 @@ }, /obj/item/circuitboard/arcade/battle, /obj/item/circuitboard/arcade/orion_trail, +/obj/item/circuitboard/research_shuttle, /turf/simulated/floor/plating, /area/storage/tech) "bhj" = (