diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 817ef95de4..002753c5d4 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -178,7 +178,7 @@ "id" = D.id, "subCategory" = sub_category, "categoryOverride" = category_override, - "searchMeta" = D.search_metadata + "searchMeta" = "UNKNOWN"//D.search_metadata ) return part @@ -356,7 +356,7 @@ */ /obj/machinery/mecha_part_fabricator/proc/dispense_built_part(datum/design/D) var/obj/item/I = new D.build_path(src) - I.material_flags |= MATERIAL_NO_EFFECTS //Find a better way to do this. + // I.material_flags |= MATERIAL_NO_EFFECTS //Find a better way to do this. I.set_custom_materials(build_materials) being_built = null diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 9953fe4bc5..cc59fe10ab 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -78,10 +78,15 @@ close_machine(target) ui_interact(user) -/obj/machinery/vr_sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_contained_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/vr_sleeper/ui_state(mob/user) + if(user == occupant) + return GLOB.contained_state + return GLOB.default_state + +/obj/machinery/vr_sleeper/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, ui_key, "VrSleeper", "VR Sleeper", 475, 340, master_ui, state) + ui = new(user, src, "VrSleeper", "VR Sleeper") ui.open() /obj/machinery/vr_sleeper/ui_act(action, params) diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 1567944dd0..f06f4fe68a 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -23,6 +23,12 @@ var/obj/machinery/abductor/pad/pad var/obj/machinery/computer/camera_advanced/abductor/camera var/list/datum/icon_snapshot/disguises = list() + /// Currently selected gear category + var/selected_cat + /// Dictates if the compact mode of the interface is on or off + var/compact_mode = FALSE + /// Possible gear to be dispensed + var/list/possible_gear /obj/machinery/abductor/console/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(!HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING) && !HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 408bc020ae..4ca97a13a5 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -99,7 +99,7 @@ if(D) data["points"] = D.account_balance data["locked"] = locked//swipe an ID to unlock - data["siliconUser"] = user.has_unlimited_silicon_privilege + data["siliconUser"] = hasSiliconAccessInArea(user) data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui data["usingBeacon"] = usingBeacon //is the mode set to deliver to the beacon or the cargobay? data["canBeacon"] = !usingBeacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location? diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index d450c6d97a..35fa40e15d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -468,7 +468,7 @@ /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/spray, - /obj/item/reagent_containers/medigel, + // /obj/item/reagent_containers/medigel, /obj/item/reagent_containers/chem_pack )) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 3b6d693ed2..e5cd36cad6 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -65,12 +65,13 @@ return else linked.linked = src + /* var/area/my_area = get_area(src) if(my_area) linked.power_usage = my_area.power_usage else linked.power_usage = new /list(AREA_USAGE_LEN) - + */ generate_program_list() load_program(offline_program, FALSE, FALSE) @@ -78,7 +79,7 @@ emergency_shutdown() if(linked) linked.linked = null - linked.power_usage = new /list(AREA_USAGE_LEN) + //linked.power_usage = new /list(AREA_USAGE_LEN) return ..() /obj/machinery/computer/holodeck/power_change() diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 00381069bf..71701d9637 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -130,7 +130,7 @@ * * O - seed to generate the string from */ /obj/machinery/seed_extractor/proc/generate_seed_string(obj/item/seeds/O) - return "name=[O.name];lifespan=[O.lifespan];endurance=[O.endurance];maturation=[O.maturation];production=[O.production];yield=[O.yield];potency=[O.potency];instability=[O.instability]" + return "name=[O.name];lifespan=[O.lifespan];endurance=[O.endurance];maturation=[O.maturation];production=[O.production];yield=[O.yield];potency=[O.potency];instability=0" /** Add Seeds Proc. diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index d8d80951bf..429dc98e8a 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -118,7 +118,7 @@ GLOBAL_LIST(labor_sheet_values) /obj/machinery/mineral/stacking_machine/laborstacker force_connect = TRUE var/points = 0 //The unclaimed value of ore stacked. - damage_deflection = 21 + //damage_deflection = 21 /obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp) points += inp.point_value * inp.amount ..() diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 3e6754637a..86e12084d7 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -177,7 +177,7 @@ var/list/data = list() data["on"] = on data["locked"] = locked - data["siliconUser"] = user.has_unlimited_silicon_privilege + data["siliconUser"] = hasSiliconAccessInArea(user) data["mode"] = mode ? mode_name[mode] : "Ready" data["modeStatus"] = "" switch(mode) @@ -201,11 +201,11 @@ return data /mob/living/simple_animal/bot/mulebot/ui_act(action, params) - if(..() || (locked && !usr.has_unlimited_silicon_privilege)) + if(..() || (locked && hasSiliconAccessInArea(user))) return switch(action) if("lock") - if(usr.has_unlimited_silicon_privilege) + if(hasSiliconAccessInArea(user)) locked = !locked . = TRUE if("power") diff --git a/tgui/packages/tgui/interfaces/VrSleeper.js b/tgui/packages/tgui/interfaces/VrSleeper.js index c25a56174d..64a4defb07 100644 --- a/tgui/packages/tgui/interfaces/VrSleeper.js +++ b/tgui/packages/tgui/interfaces/VrSleeper.js @@ -5,7 +5,9 @@ import { Window } from '../layouts'; export const VrSleeper = (props, context) => { const { act, data } = useBackend(context); return ( - + {!!data.emagged && (