diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 6c254dbdb36..6d67f45872a 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -39,7 +39,6 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/all_nighter, /datum/quirk/heavy_sleeper), list(/datum/quirk/light_drinker, /datum/quirk/drunkhealing), list(/datum/quirk/oversized, /datum/quirk/freerunning), - list(/datum/quirk/oversized, /datum/quirk/item_quirk/settler), list(/datum/quirk/echolocation, /datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/nearsighted, /datum/quirk/item_quirk/deafness), //SKYRAT EDIT ADDITION END //BUBBER EDIT ADDITION BEGIN diff --git a/code/modules/escape_menu/home_page.dm b/code/modules/escape_menu/home_page.dm index 7a224621128..0ab16e9ab37 100644 --- a/code/modules/escape_menu/home_page.dm +++ b/code/modules/escape_menu/home_page.dm @@ -6,7 +6,7 @@ /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Resume", - /* offset = */ list(-136, -260), + /* offset = */ list(-136, 30), /* font_size = */ 24, /* on_click_callback = */ CALLBACK(src, PROC_REF(home_resume)), ) @@ -18,7 +18,7 @@ /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Character", - /* offset = */ list(-171, -262), + /* offset = */ list(-171, 28), /* font_size = */ 24, /* on_click_callback = */ CALLBACK(src, PROC_REF(home_open_character_settings)), ) @@ -30,7 +30,7 @@ /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Settings", - /* offset = */ list(-206, -260), + /* offset = */ list(-206, 30), /* font_size = */ 24, /* on_click_callback = */ CALLBACK(src, PROC_REF(home_open_game_settings)), ) @@ -42,24 +42,21 @@ /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Admin Help", - /* offset = */ list(-241, -260), + /* offset = */ list(-241, 30), ) ) - //SKYRAT EDIT REMOVAL BEGIN - /* + page_holder.give_screen_object( new /atom/movable/screen/escape_menu/text/clickable/leave_body( null, /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Leave Body", - /* offset = */ list(-276, -260), + /* offset = */ list(-276, 30), /* font_size = */ 24, /* on_click_callback = */ CALLBACK(src, PROC_REF(open_leave_body)), ) ) - */ - // SKYRAT EDIT REMOVAL END //Bottom right buttons, from right to left, starting with the button to open the list. page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small( @@ -67,7 +64,7 @@ /* hud_owner = */ null, "Resources", "Open/Close list of resources", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(src, PROC_REF(toggle_resources)), /* button_overlay = */ "resources", )) @@ -100,7 +97,7 @@ /* hud_owner = */ null, "Report Bug", "Report a bug/issue", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, reportissue)), /* button_overlay = */ "bug", /* end_point */ offset_order[1], @@ -111,7 +108,7 @@ /* hud_owner = */ null, "Github", "Open the repository for the game", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, github)), /* button_overlay = */ "github", /* end_point */ offset_order[1], @@ -125,7 +122,7 @@ /* hud_owner = */ null, "Forums", "Visit the server's forums", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, forum)), /* button_overlay = */ "forums", /* end_point */ offset_order[1], @@ -139,7 +136,7 @@ /* hud_owner = */ null, "Rules", "View the server rules", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, rules)), /* button_overlay = */ "rules", /* end_point */ offset_order[1], @@ -153,7 +150,7 @@ /* hud_owner = */ null, "Wiki", "See the wiki for the game", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, wiki)), /* button_overlay = */ "wiki", /* end_point */ offset_order[1], @@ -165,117 +162,7 @@ /* hud_owner = */ null, "Change Log", "See all changes to the server", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, changelog)), - /* button_overlay = */ "changelog", - /* end_point */ offset_order[1], - )) - - //Bottom right buttons, from right to left, starting with the button to open the list. - page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small( - null, - /* hud_owner = */ null, - "Resources", - "Open/Close list of resources", - /* pixel_offset = */ list(260, -190), - CALLBACK(src, PROC_REF(toggle_resources)), - /* button_overlay = */ "resources", - )) - -/datum/escape_menu/proc/toggle_resources() - show_resources = !show_resources - if(!show_resources) - //collapsing it - for(var/atom/movable/screen/escape_menu/lobby_button/small/collapsible/button as anything in resource_panels) - button.collapse(page_holder) - resource_panels.Cut() - return - //list of offsets we give, so missing icons don't leave a random gap. - var/list/offset_order = list( - -60, - -120, - -180, - -240, - -300, - -360, - -420, - -480, - ) - resource_panels = list() - - var/githuburl = CONFIG_GET(string/githuburl) - if(githuburl) - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Report Bug", - "Report a bug/issue", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, reportissue)), - /* button_overlay = */ "bug", - /* end_point */ offset_order[1], - )) - offset_order -= offset_order[1] - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Github", - "Open the repository for the game", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, github)), - /* button_overlay = */ "github", - /* end_point */ offset_order[1], - )) - offset_order -= offset_order[1] - - var/forumurl = CONFIG_GET(string/forumurl) - if(forumurl) - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Forums", - "Visit the server's forums", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, forum)), - /* button_overlay = */ "forums", - /* end_point */ offset_order[1], - )) - offset_order -= offset_order[1] - - var/rulesurl = CONFIG_GET(string/rulesurl) - if(rulesurl) - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Rules", - "View the server rules", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, rules)), - /* button_overlay = */ "rules", - /* end_point */ offset_order[1], - )) - offset_order -= offset_order[1] - - var/wikiurl = CONFIG_GET(string/wikiurl) - if(wikiurl) - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Wiki", - "See the wiki for the game", - /* pixel_offset = */ list(260, -190), - CALLBACK(client, TYPE_VERB_REF(/client, wiki)), - /* button_overlay = */ "wiki", - /* end_point */ offset_order[1], - )) - offset_order -= offset_order[1] - - resource_panels += page_holder.give_screen_object(new /atom/movable/screen/escape_menu/lobby_button/small/collapsible( - null, - /* hud_owner = */ null, - "Change Log", - "See all changes to the server", - /* pixel_offset = */ list(260, -190), + /* button_screen_loc */ "BOTTOM:30,RIGHT:-20", CALLBACK(client, TYPE_VERB_REF(/client, changelog)), /* button_overlay = */ "changelog", /* end_point */ offset_order[1], diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index 143b24de52c..e45f4c39988 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/map_icons/clothing/suit/_suit.dmi b/icons/map_icons/clothing/suit/_suit.dmi index 60df595e2aa..b77469d5c42 100644 Binary files a/icons/map_icons/clothing/suit/_suit.dmi and b/icons/map_icons/clothing/suit/_suit.dmi differ diff --git a/icons/map_icons/clothing/under/costume.dmi b/icons/map_icons/clothing/under/costume.dmi index a395e3a981f..ad3bc42dde3 100644 Binary files a/icons/map_icons/clothing/under/costume.dmi and b/icons/map_icons/clothing/under/costume.dmi differ diff --git a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm index a6aecc20d95..d2c8f7c05ca 100644 --- a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm +++ b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm @@ -50,7 +50,7 @@ body_parts_covered = HEAD flags_inv = HIDEFACE|HIDEHAIR|HIDEEARS flags_cover = HEADCOVERSEYES - armor_type = /datum/armor/helmet_chaplain + armor_type = /datum/armor/chaplainsuit_armor /obj/item/storage/box/holy/narsian name = "ancient kit" diff --git a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm index 985e6c0e41e..ab74c19c411 100644 --- a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm +++ b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm @@ -53,11 +53,11 @@ products.Add(gun.spawn_magazine_type) //Add our items to the list of products - build_inventory(products, product_records, FALSE) + deprecated_build_inventory(products, product_records, FALSE) filled = TRUE -/obj/machinery/vending/assaultops_ammo/build_inventory(list/productlist, list/recordlist, start_empty = FALSE, premium = FALSE) +/obj/machinery/vending/assaultops_ammo/proc/deprecated_build_inventory(list/productlist, list/recordlist, start_empty = FALSE, premium = FALSE) default_price = 0 extra_price = 0 for(var/typepath in productlist) diff --git a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm index 88e9cb615bb..5e228ec5715 100644 --- a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm +++ b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm @@ -26,7 +26,7 @@ var/is_valid_item = istype(attacking_item, /obj/item/gbp_puncher) if(!is_valid_item && istype(attacking_item, /obj/item/modular_computer/pda)) var/obj/item/modular_computer/pda/pda = attacking_item - is_valid_item = check_access(pda.computer_id_slot) + is_valid_item = check_access(pda.stored_id) if (!is_valid_item) balloon_alert(user, "no access!") diff --git a/modular_skyrat/modules/company_imports/code/armament_component.dm b/modular_skyrat/modules/company_imports/code/armament_component.dm index f647a3fe1bd..60b3671ddf0 100644 --- a/modular_skyrat/modules/company_imports/code/armament_component.dm +++ b/modular_skyrat/modules/company_imports/code/armament_component.dm @@ -39,7 +39,7 @@ var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR) if(console_state == IRN_CONSOLE) - id_card = parent_prog.computer.computer_id_slot?.GetID() + id_card = parent_prog.computer.stored_id?.GetID() else if(istype(the_person)) id_card = the_person.get_idcard(TRUE) @@ -159,7 +159,7 @@ var/obj/item/card/id/id_card if(console_state == IRN_CONSOLE) - id_card = parent_prog.computer.computer_id_slot?.GetID() + id_card = parent_prog.computer.stored_id?.GetID() else id_card = the_person.get_idcard(TRUE) @@ -223,7 +223,7 @@ else if(possible_downloader) var/datum/computer_file/program/budgetorders/parent_file = parent_prog - if((parent_file.requestonly && !self_paid) || !(possible_downloader.computer_id_slot?.GetID())) + if((parent_file.requestonly && !self_paid) || !(possible_downloader.stored_id?.GetID())) reason = tgui_input_text(user, "Reason", name) if(isnull(reason)) return @@ -288,7 +288,7 @@ return if(console_state == IRN_CONSOLE) - id_card = parent_prog.computer.computer_id_slot?.GetID() + id_card = parent_prog.computer.stored_id?.GetID() else id_card = the_person.get_idcard(TRUE) diff --git a/modular_skyrat/modules/lorecaster/code/subsystem.dm b/modular_skyrat/modules/lorecaster/code/subsystem.dm index 87cb3b1a5ab..5c7ee0d9aa4 100644 --- a/modular_skyrat/modules/lorecaster/code/subsystem.dm +++ b/modular_skyrat/modules/lorecaster/code/subsystem.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(lorecaster) var/list/stories /datum/controller/subsystem/lorecaster/Initialize() - GLOB.news_network.create_feed_channel("Nanotrasen News Network", "NNN", "Get the latest stories from the frontier, here! For the not-quite-latest stories, download the \"News Archive\" app to any NTOS-based device today!", locked = TRUE, hardset_channel = 1001) + GLOB.news_network.create_feed_channel("Nanotrasen News Network", "NNN", "Get the latest stories from the frontier, here! For the not-quite-latest stories, download the \"News Archive\" app to any NTOS-based device today!", locked = TRUE) var/config_delay = CONFIG_GET(number/lorecaster_delay) if(config_delay) wait = config_delay diff --git a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm index f8373458db4..fcf428fe86e 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm @@ -35,9 +35,9 @@ GLOBAL_LIST_INIT(purchasable_nifsofts, list( /datum/computer_file/program/nifsoft_downloader/ui_data(mob/user) var/list/data = list() - paying_account = computer.computer_id_slot?.registered_account || null + paying_account = computer.stored_id?.registered_account || null data["paying_account"] = paying_account - data["current_balance"] = computer.computer_id_slot?.registered_account?.account_balance + data["current_balance"] = computer.stored_id?.registered_account?.account_balance var/rewards_points = 0 diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm index 79fa540009e..a5712d06072 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm @@ -58,7 +58,6 @@ ammo_type = /obj/item/ammo_casing/shotgun caliber = CALIBER_SHOTGUN max_ammo = 4 - multiload = FALSE // AMR magazine diff --git a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm index 11865885480..0f564989296 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm @@ -79,20 +79,20 @@ Various overrides necessary to get the persocom working, namely ui status, power var/obj/item = synth.wear_id if(item) if(istype(item, /obj/item/card/id)) - computer_id_slot = item + stored_id = item else if(istype(item, /obj/item/modular_computer)) var/obj/item/modular_computer/pda = item - computer_id_slot = pda.computer_id_slot + stored_id = pda.stored_id else if(istype(item, /obj/item/storage/wallet)) var/obj/item/storage/wallet/wallet = item - computer_id_slot = wallet.front_id + stored_id = wallet.front_id else - computer_id_slot = null + stored_id = null else - computer_id_slot = null + stored_id = null -/obj/item/modular_computer/pda/synth/RemoveID(mob/user, silent = TRUE) - return +/* /obj/item/modular_computer/pda/synth/RemoveID(mob/user, silent = TRUE) + return */ // Fix this if we need it. /obj/item/modular_computer/pda/synth/get_ntnet_status() . = ..() diff --git a/modular_zubbers/code/modules/modular_computers/computer.dm b/modular_zubbers/code/modules/modular_computers/computer.dm index 3c718ec5fbc..f745c4c2d4f 100644 --- a/modular_zubbers/code/modules/modular_computers/computer.dm +++ b/modular_zubbers/code/modules/modular_computers/computer.dm @@ -4,22 +4,22 @@ /obj/item/modular_computer/get_security_level_relevancy() switch(SSsecurity_level.get_current_level_as_number()) if(SEC_LEVEL_VIOLET) - if(ACCESS_MEDICAL in computer_id_slot?.access) + if(ACCESS_MEDICAL in stored_id?.access) return ALERT_RELEVANCY_PERTINENT else return ALERT_RELEVANCY_WARN if(SEC_LEVEL_ORANGE) - if(ACCESS_ENGINEERING in computer_id_slot?.access) + if(ACCESS_ENGINEERING in stored_id?.access) return ALERT_RELEVANCY_PERTINENT else return ALERT_RELEVANCY_SAFE if(SEC_LEVEL_AMBER) - if(ACCESS_SECURITY in computer_id_slot?.access) + if(ACCESS_SECURITY in stored_id?.access) return ALERT_RELEVANCY_PERTINENT else return ALERT_RELEVANCY_WARN if(SEC_LEVEL_BLUE) // do this even though the base function already covers blue -- this is cause we operate differently from blue (blue = sec prep on bubber, = sec active on tg) - if(ACCESS_SECURITY in computer_id_slot?.access) + if(ACCESS_SECURITY in stored_id?.access) return ALERT_RELEVANCY_PERTINENT else return ALERT_RELEVANCY_SAFE diff --git a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm index 0147b9e9267..a16999d5672 100644 --- a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm +++ b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm @@ -12,7 +12,7 @@ /datum/computer_file/program/silicon_management/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() - var/obj/item/card/id/user_id = computer.computer_id_slot + var/obj/item/card/id/user_id = computer.stored_id if(!user_id || !(ACCESS_ROBOTICS in user_id.access)) return TRUE @@ -30,7 +30,7 @@ var/list/data = list() var/authed = FALSE - var/obj/item/card/id/user_id = computer.computer_id_slot + var/obj/item/card/id/user_id = computer.stored_id if(user_id && (ACCESS_ROBOTICS in user_id.access)) authed = TRUE diff --git a/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/sakhno_concern/magazines.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/sakhno_concern/magazines.dm index e6e8dcbfcb3..f21bbc1eceb 100644 --- a/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/sakhno_concern/magazines.dm +++ b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/sakhno_concern/magazines.dm @@ -3,4 +3,3 @@ ammo_type = /obj/item/ammo_casing/strilka310 caliber = CALIBER_STRILKA310 max_ammo = 2 - multiload = FALSE diff --git a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm index c8727102743..54f8834f40f 100644 --- a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm +++ b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm @@ -14,7 +14,7 @@ continue for(var/id in illegal_mech_node.design_ids) var/datum/design/illegal_mech_design = SSresearch.techweb_design_by_id(id) - illegal_local_designs |= illegal_mech_design +// illegal_local_designs |= illegal_mech_design // Fix this if it's broken after. cached_designs |= illegal_mech_design say("R$c!i&ed ERROR de#i$ns. C@n%ec$%ng to ~NULL~ se%ve$s.") playsound(src, 'sound/machines/uplink/uplinkerror.ogg', 50, TRUE) diff --git a/modular_zubbers/modules/plexagon_selfserve/code/plexagon_selfserve.dm b/modular_zubbers/modules/plexagon_selfserve/code/plexagon_selfserve.dm index 085f1968aae..579585c764d 100644 --- a/modular_zubbers/modules/plexagon_selfserve/code/plexagon_selfserve.dm +++ b/modular_zubbers/modules/plexagon_selfserve/code/plexagon_selfserve.dm @@ -30,8 +30,8 @@ computer.crew_manifest_update = TRUE register_signals() - if(computer.computer_id_slot) - authenticate(id_card = computer.computer_id_slot) + if(computer.stored_id) + authenticate(id_card = computer.stored_id) return TRUE @@ -46,7 +46,7 @@ /datum/computer_file/program/crew_self_serve/proc/id_changed(source, obj/item/card/id/id_card, mob/user) SIGNAL_HANDLER - authenticate(id_card = computer.computer_id_slot) + authenticate(id_card = computer.stored_id) /** * Authenticates the program based on the specific ID card. @@ -277,16 +277,16 @@ computer.update_static_data_for_all_viewers() playsound(computer, 'sound/machines/ping.ogg', 50, FALSE) - computer.RemoveID(human_user, silent = TRUE) - authenticate(id_card = computer.computer_id_slot) + computer.remove_id(human_user, silent = TRUE) + authenticate(id_card = computer.stored_id) return TRUE if("PRG_eject_id") var/mob/living/carbon/human/human_user = usr if(human_user) - computer.RemoveID(human_user, silent = TRUE) - authenticate(id_card = computer.computer_id_slot) + computer.remove_id(human_user, silent = TRUE) + authenticate(id_card = computer.stored_id) return TRUE diff --git a/modular_zubbers/modules/plexagon_selfserve/code/shame_box.dm b/modular_zubbers/modules/plexagon_selfserve/code/shame_box.dm index aa20fa2df65..db296265427 100644 --- a/modular_zubbers/modules/plexagon_selfserve/code/shame_box.dm +++ b/modular_zubbers/modules/plexagon_selfserve/code/shame_box.dm @@ -42,7 +42,7 @@ var/obj/item/card/id/access_card if(istype(crew_id, /obj/item/modular_computer/pda)) var/obj/item/modular_computer/pda/crew_pda = crew_id - access_card = crew_pda.computer_id_slot + access_card = crew_pda.stored_id else access_card = crew_id