From 666973a231000dd62d169f9ba7f54c2ab6f9b744 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Sun, 12 Jan 2020 20:16:30 -0600 Subject: [PATCH] Fixes Genetics access on Box and Pubby (#48713) * Moves Geneticist to a purely Science job * lmao map conflicts * [Ready] Adds a new RnD method, the B.E.P.I.S. (#48040) * Squashes Commits, has BEPIS, Techs, TGUIs, Rewards, and fixes. * Makes rewardable techs a variable in all_nodes, and removes RnD Points rewards from the minor reward pool. * Fixes conflict with pubby and beam icon. * Review comments and basic cleanup A * Review Comments and basic cleanup B, also cleans up icon states to work fluidly. * Map Update * Indentation, flipped Update_decal_path, and rebuilds tgui * One last clean up of icon_state, adds the last bit of changes from review, and that should be everything. * Alright last change for real I swear 105% * Last change, adds simple sanity check for silicons. * Moved Human and card variables into ui_interact. * Fixes map conflict * Alright Review Round 2 Part A, Fixes Grammar, splits polycircuit into it's own file, UI QOL improvements, Withdrawing credits, changes from arbitary values on the mini RLD, etc. * More review bits, Part 2:B. Easier returns for less processing, Defines, fixes the merge conflict and updates the UI with new buttons. Just need to figure out Button Mapping for the UI and Duplicate prevention. * Implemented duplicate tech protection. Yeet. * Get back in there you * Alright why are you breaking on me god damnit. * It's optimized, closer to god, nearly perfect, all together it's ready to ship. * Cleans up all of the decal painter, shorter, cleaner, works around all the turf_decal quirks. * Tab spacing on github will look fucky * More review changes. * Uses use_power == ACTIVE_POWER_USE instead of powered except for the UI * Fixes access issues on Box and PubbyStation Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- _maps/map_files/BoxStation/BoxStation.dmm | 3 +-- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 426ea8b6a03..93df6599a9e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -52418,9 +52418,8 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - abandoned = "47, 9"; name = "Genetics Lab"; - req_access_txt = "47" + req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e2220a49e3c..31085410f19 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -27981,7 +27981,7 @@ }, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "55" + req_one_access_txt = "55, 9" }, /obj/structure/cable, /turf/open/floor/plasteel/dark,