From 5b70898b5880e11109f61ff69aac8f25089adadb Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:33:57 +0100 Subject: [PATCH 1/7] Fixes --- .../items/circuitboards/computer_circuitboards.dm | 2 ++ code/modules/research/rdconsole.dm | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index bf9e6ab616d7..32ee802d8443 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -352,6 +352,8 @@ /obj/item/circuitboard/computer/rdconsole/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) + if(build_path == /obj/machinery/computer/rdconsole/production) + return if(build_path == /obj/machinery/computer/rdconsole/core) name = "R&D Console - Robotics (Computer Board)" build_path = /obj/machinery/computer/rdconsole/robotics diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 81ceddbcace4..29bd3ffdc3d0 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -699,6 +699,13 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/proc/machine_icon(atom/item) return icon2html(initial(item.icon), usr, initial(item.icon_state), SOUTH) +/obj/machinery/computer/rdconsole/proc/can_research(mob/user) + var/obj/item/card/id/C = user.get_idcard(TRUE) + if(C) + if(!check_access(C)) + return FALSE + return TRUE + /obj/machinery/computer/rdconsole/proc/ui_techweb_single_node(datum/techweb_node/node, selflink=TRUE, minimal=FALSE) var/list/l = list() if (stored_research.hidden_nodes[node.id]) @@ -974,6 +981,9 @@ Nothing else in the console has ID requirements. if(ls["disk_slot"]) disk_slot_selected = text2num(ls["disk_slot"]) if(ls["research_node"]) + if(!can_research) + to_chat(usr, "ACCESS DENIED") + return if(!research_control) return //honestly should call them out for href exploiting :^) if(!SSresearch.science_tech.available_nodes[ls["research_node"]]) From 344e4842476ead22b713baab2cd9bd15d3f0276c Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:41:16 +0100 Subject: [PATCH 2/7] Map --- _maps/map_files/YogStation/YogStation.dmm | 339 ++++++++++------------ 1 file changed, 160 insertions(+), 179 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1a63f6e988f0..47d467ab8e9c 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -15869,17 +15869,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"bpp" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Research Division Delivery"; - req_access_txt = "47" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/science/lab) "bpq" = ( /obj/machinery/light_switch{ pixel_y = -23 @@ -16084,17 +16073,6 @@ "bqe" = ( /turf/closed/wall/r_wall, /area/science/explab) -"bqf" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/white, -/area/science/lab) "bqi" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -16103,25 +16081,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"bqk" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "bqo" = ( /obj/machinery/computer/cargo{ dir = 1 @@ -16256,13 +16215,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"brr" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/science/explab) "brs" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ @@ -16316,14 +16268,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"brx" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/lab) "brz" = ( /obj/item/flashlight/flare/signal, /turf/open/floor/plating, @@ -20516,10 +20460,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) -"bMr" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/xenobiology) "bMs" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -21103,10 +21043,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space/basic, /area/engine/atmos_distro) -"bPK" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/misc_lab) "bPN" = ( /turf/closed/wall, /area/science/misc_lab) @@ -23948,14 +23884,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"ctu" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plating, -/area/medical/sleeper) "ctv" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -25381,18 +25309,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/quartermaster/office) -"cQe" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "surgery_shutters"; - name = "Surgery Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/surgery) "cQr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -32575,6 +32491,13 @@ /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"gHT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/explab) "gIc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34632,6 +34555,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/quartermaster/warehouse) +"hFP" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "surgery_shutters"; + name = "Surgery Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/surgery) "hGf" = ( /obj/machinery/conveyor{ dir = 4; @@ -34906,16 +34841,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"hNl" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/computer/rdconsole/production{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "hNs" = ( /obj/effect/landmark/stationroom/maint/fivexthree, /turf/template_noop, @@ -36335,14 +36260,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) -"iuo" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/sleeper) "iuR" = ( /obj/machinery/door/window/southleft{ base_state = "right"; @@ -37720,18 +37637,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"iYd" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "surgery_shutters"; - name = "Surgery Shutters" - }, -/turf/open/floor/plating, -/area/medical/surgery) "iYj" = ( /obj/machinery/meter{ target_layer = 4 @@ -47921,6 +47826,29 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"oeK" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/research{ + name = "R&D Lab"; + req_access_txt = "7" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "ogh" = ( /obj/structure/lattice/catwalk, /obj/machinery/camera{ @@ -48351,6 +48279,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"oqI" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "ord" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -48368,14 +48304,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"orq" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plating, -/area/medical/medbay/lobby) "orC" = ( /obj/structure/grille, /obj/structure/lattice, @@ -50650,6 +50578,17 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"pAx" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/computer/rdconsole/production{ + dir = 8; + req_access = list(32) + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "pAL" = ( /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) @@ -52455,18 +52394,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) -"qzJ" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "surgery_shutters"; - name = "Surgery Shutters" - }, -/turf/open/floor/plating, -/area/medical/surgery) "qAb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53358,14 +53285,6 @@ /obj/effect/turf_decal/trimline/white, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"qYz" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics2"; - name = "robotics lab shutters" - }, -/turf/open/floor/plating, -/area/science/robotics/lab) "qZu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -56022,6 +55941,14 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"slR" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/lab) "sma" = ( /obj/structure/chair{ dir = 1 @@ -56736,6 +56663,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sCr" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "robotics2"; + name = "robotics lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/robotics/lab) "sCs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -57537,6 +57472,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"sYU" = ( +/obj/machinery/door/window/eastright{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Research Division Delivery"; + req_access_txt = "7" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/lab) "sZg" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -57855,6 +57801,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"tfy" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/sleeper) "tfC" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden{ dir = 5 @@ -63553,14 +63507,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"wci" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics2"; - name = "robotics lab shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/robotics/lab) "wcw" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -64670,6 +64616,18 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"wIY" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "surgery_shutters"; + name = "Surgery Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/surgery) "wJm" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -65541,6 +65499,21 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"xjt" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/research{ + name = "R&D Lab"; + req_access_txt = "7" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "xjN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -67111,6 +67084,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"xXt" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "xXT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -100058,7 +100039,7 @@ ahi ajs uxH akB -hNl +pAx cMv uQS gNd @@ -103626,7 +103607,7 @@ bfF ocA opn wiA -ctu +tfy kJb oCO bZg @@ -104140,7 +104121,7 @@ cfu uYq ogm pZK -ctu +tfy mtT lvO bDR @@ -104393,7 +104374,7 @@ aco dIW rJo hIu -mgH +xXt oQi aBB vle @@ -104654,7 +104635,7 @@ gtC mKN kub tva -ctu +tfy tzC rUG bDR @@ -104911,7 +104892,7 @@ gtC sxa kub tva -iuo +tfy iTR vXI gaU @@ -105935,11 +105916,11 @@ fCh dlx vMp wtY -orq +oqI sxa kub hLI -ctu +tfy sTb mxh sgE @@ -106453,7 +106434,7 @@ orY hHy pjc hLI -qzJ +wIY qmI xOh shN @@ -106710,7 +106691,7 @@ gtC iBZ kub tva -cQe +hFP jbq vvK vvK @@ -106967,7 +106948,7 @@ bEi mvC cXg tva -iYd +hFP bdw urv uMu @@ -107224,7 +107205,7 @@ luE uSW rTC tva -iYd +hFP jbq lMh uuV @@ -107481,7 +107462,7 @@ bEi hoP kub hLI -iYd +hFP dDo gQe doF @@ -112878,7 +112859,7 @@ sUL jna cIb hlz -wci +sCr bgp sRl byf @@ -113135,7 +113116,7 @@ dEU bTv cIb rOz -wci +sCr bgp pYr lcM @@ -113392,7 +113373,7 @@ bkr cHW cId hkd -wci +sCr nlD bnH byf @@ -114420,7 +114401,7 @@ biN cHX buj buj -wci +sCr sGm uCv byj @@ -114934,7 +114915,7 @@ bov bpU brq bsW -wci +sCr bgp bnx byk @@ -115188,7 +115169,7 @@ bfV bfV bfV box -qYz +sCr brs box box @@ -115205,9 +115186,9 @@ bsn bDc bDc bLe -bMr +piv uBi -bMr +piv bDb bDb bDb @@ -115465,7 +115446,7 @@ bHK bzE bID bHI -bPK +bZZ bQO bSb bOu @@ -115979,7 +115960,7 @@ bHL aPO bBD bJo -bPK +bZZ bWr bWr aiW @@ -116731,7 +116712,7 @@ blK bnp boA boQ -brx +slR bro bmU bvJ @@ -116988,7 +116969,7 @@ blJ bno bkt biW -bqf +xjt bgp bmU bvK @@ -117245,7 +117226,7 @@ bka bka aCl bpo -bqk +oeK brp bmW bvK @@ -117502,7 +117483,7 @@ blL biW bnh biW -brx +slR bte bmX bvK @@ -118015,9 +117996,9 @@ bgc bgc bgc bgc -bpp +sYU bgc -brr +gHT bmZ bvK bvK From 908f938b25e1149dc312dea7a6f2deb3d828eebf Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:43:58 +0100 Subject: [PATCH 3/7] Emag --- code/modules/research/rdconsole.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 29bd3ffdc3d0..063df9202649 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -700,6 +700,8 @@ Nothing else in the console has ID requirements. return icon2html(initial(item.icon), usr, initial(item.icon_state), SOUTH) /obj/machinery/computer/rdconsole/proc/can_research(mob/user) + if(locked == FALSE) + return TRUE var/obj/item/card/id/C = user.get_idcard(TRUE) if(C) if(!check_access(C)) From 83b046740f2fb8cb72c2d837cc911699fb6c1c8f Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:52:45 +0100 Subject: [PATCH 4/7] I dont know how to code --- code/modules/research/rdconsole.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 063df9202649..9f892248e033 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -983,7 +983,7 @@ Nothing else in the console has ID requirements. if(ls["disk_slot"]) disk_slot_selected = text2num(ls["disk_slot"]) if(ls["research_node"]) - if(!can_research) + if(!can_research(usr)) to_chat(usr, "ACCESS DENIED") return if(!research_control) From 9c4c26d2323394ba91ca2d42e779613dec92cb18 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:58:42 +0100 Subject: [PATCH 5/7] Glass --- _maps/map_files/YogStation/YogStation.dmm | 312 +++++++++++----------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 47d467ab8e9c..1511d38f6531 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -31437,6 +31437,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"giP" = ( +/obj/machinery/door/window/eastright{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Research Division Delivery"; + req_access_txt = "7" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/lab) "gjl" = ( /turf/closed/wall, /area/quartermaster/warehouse) @@ -31769,6 +31780,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) +"gsd" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -32491,13 +32510,6 @@ /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"gHT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/explab) "gIc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33210,6 +33222,18 @@ }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) +"hcZ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "surgery_shutters"; + name = "Surgery Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/surgery) "hdd" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -34555,18 +34579,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/quartermaster/warehouse) -"hFP" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "surgery_shutters"; - name = "Surgery Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/surgery) "hGf" = ( /obj/machinery/conveyor{ dir = 4; @@ -38515,6 +38527,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"jte" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "surgery_shutters"; + name = "Surgery Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/surgery) "jtq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ @@ -42766,6 +42790,14 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"lEQ" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "robotics2"; + name = "robotics lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/robotics/lab) "lFb" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -46277,6 +46309,21 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"npe" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/research/glass{ + name = "R&D Lab"; + req_access_txt = "7" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "npo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/help_others{ @@ -47688,6 +47735,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"obM" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "ocq" = ( /obj/machinery/door/poddoor{ id = "trash"; @@ -47826,29 +47881,6 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) -"oeK" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "ogh" = ( /obj/structure/lattice/catwalk, /obj/machinery/camera{ @@ -48279,14 +48311,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"oqI" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/medbay/lobby) "ord" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -49925,6 +49949,14 @@ /obj/effect/turf_decal/box, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) +"piL" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/sleeper) "piV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -50578,17 +50610,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"pAx" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/computer/rdconsole/production{ - dir = 8; - req_access = list(32) - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "pAL" = ( /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) @@ -55941,14 +55962,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) -"slR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/lab) "sma" = ( /obj/structure/chair{ dir = 1 @@ -56663,14 +56676,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"sCr" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics2"; - name = "robotics lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/robotics/lab) "sCs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -56789,6 +56794,29 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"sGR" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/research/glass{ + name = "R&D Lab"; + req_access_txt = "7" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "sGW" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 5 @@ -57472,17 +57500,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"sYU" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Research Division Delivery"; - req_access_txt = "7" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/science/lab) "sZg" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -57801,14 +57818,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"tfy" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/sleeper) "tfC" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden{ dir = 5 @@ -63097,6 +63106,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) +"vPZ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "vQq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -64616,18 +64633,6 @@ }, /turf/open/floor/plasteel, /area/security/processing) -"wIY" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "surgery_shutters"; - name = "Surgery Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/surgery) "wJm" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -64798,6 +64803,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"wMP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/explab) "wNo" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -65499,21 +65511,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"xjt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/research{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "xjN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -67084,14 +67081,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"xXt" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/medbay/lobby) "xXT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -67148,6 +67137,17 @@ /obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel, /area/engine/engineering) +"xYI" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/computer/rdconsole/production{ + dir = 8; + req_access = list(32) + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "xYW" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, @@ -100039,7 +100039,7 @@ ahi ajs uxH akB -pAx +xYI cMv uQS gNd @@ -103607,7 +103607,7 @@ bfF ocA opn wiA -tfy +piL kJb oCO bZg @@ -104121,7 +104121,7 @@ cfu uYq ogm pZK -tfy +piL mtT lvO bDR @@ -104374,7 +104374,7 @@ aco dIW rJo hIu -xXt +vPZ oQi aBB vle @@ -104635,7 +104635,7 @@ gtC mKN kub tva -tfy +piL tzC rUG bDR @@ -104892,7 +104892,7 @@ gtC sxa kub tva -tfy +piL iTR vXI gaU @@ -105916,11 +105916,11 @@ fCh dlx vMp wtY -oqI +obM sxa kub hLI -tfy +piL sTb mxh sgE @@ -106434,7 +106434,7 @@ orY hHy pjc hLI -wIY +hcZ qmI xOh shN @@ -106691,7 +106691,7 @@ gtC iBZ kub tva -hFP +jte jbq vvK vvK @@ -106948,7 +106948,7 @@ bEi mvC cXg tva -hFP +jte bdw urv uMu @@ -107205,7 +107205,7 @@ luE uSW rTC tva -hFP +jte jbq lMh uuV @@ -107462,7 +107462,7 @@ bEi hoP kub hLI -hFP +jte dDo gQe doF @@ -112859,7 +112859,7 @@ sUL jna cIb hlz -sCr +lEQ bgp sRl byf @@ -113116,7 +113116,7 @@ dEU bTv cIb rOz -sCr +lEQ bgp pYr lcM @@ -113373,7 +113373,7 @@ bkr cHW cId hkd -sCr +lEQ nlD bnH byf @@ -114401,7 +114401,7 @@ biN cHX buj buj -sCr +lEQ sGm uCv byj @@ -114915,7 +114915,7 @@ bov bpU brq bsW -sCr +lEQ bgp bnx byk @@ -115169,7 +115169,7 @@ bfV bfV bfV box -sCr +lEQ brs box box @@ -116712,7 +116712,7 @@ blK bnp boA boQ -slR +gsd bro bmU bvJ @@ -116969,7 +116969,7 @@ blJ bno bkt biW -xjt +npe bgp bmU bvK @@ -117226,7 +117226,7 @@ bka bka aCl bpo -oeK +sGR brp bmW bvK @@ -117483,7 +117483,7 @@ blL biW bnh biW -slR +gsd bte bmX bvK @@ -117996,9 +117996,9 @@ bgc bgc bgc bgc -sYU +giP bgc -gHT +wMP bmZ bvK bvK From 535bb1ea6a8f9ea07f5d7762e192920b1ec073ba Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:03:58 +0100 Subject: [PATCH 6/7] Update code/modules/research/rdconsole.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> --- code/modules/research/rdconsole.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 9f892248e033..36ee9b48d12d 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -700,7 +700,7 @@ Nothing else in the console has ID requirements. return icon2html(initial(item.icon), usr, initial(item.icon_state), SOUTH) /obj/machinery/computer/rdconsole/proc/can_research(mob/user) - if(locked == FALSE) + if(!locked) return TRUE var/obj/item/card/id/C = user.get_idcard(TRUE) if(C) From 7b38851ec6754753a44be7c5034f40898b7f8495 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Tue, 28 Jun 2022 20:20:12 +0100 Subject: [PATCH 7/7] Fixes shitty code --- code/modules/research/rdconsole.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 36ee9b48d12d..7240543c879c 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -700,13 +700,9 @@ Nothing else in the console has ID requirements. return icon2html(initial(item.icon), usr, initial(item.icon_state), SOUTH) /obj/machinery/computer/rdconsole/proc/can_research(mob/user) - if(!locked) - return TRUE - var/obj/item/card/id/C = user.get_idcard(TRUE) - if(C) - if(!check_access(C)) - return FALSE + if(!locked || allowed(user)) return TRUE + return FALSE /obj/machinery/computer/rdconsole/proc/ui_techweb_single_node(datum/techweb_node/node, selflink=TRUE, minimal=FALSE) var/list/l = list()