diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 421c9feded..c6a40f8223 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) icon = 'icons/obj/Cryogenic2.dmi' icon_state = "cellconsole_1" icon_keyboard = null - // circuit = /obj/item/circuitboard/cryopodcontrol + circuit = /obj/item/circuitboard/cryopodcontrol density = FALSE interaction_flags_machine = INTERACT_MACHINE_OFFLINE req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) // Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. @@ -321,7 +321,6 @@ GLOBAL_LIST_EMPTY(cryopod_computers) if(caught_string) tgui_alert(target, "You're a [english_list(caught_string)]! [AHELP_FIRST_MESSAGE][addendum]") target.client.cryo_warned = world.time - return if(!istype(target) || !can_interact(user) || !target.Adjacent(user) || !ismob(target) || isanimal(target) || !istype(user.loc, /turf) || target.buckled) return @@ -350,3 +349,13 @@ GLOBAL_LIST_EMPTY(cryopod_computers) return // Sorta gamey, but we don't really want these to be destroyed. #undef AHELP_FIRST_MESSAGE + +/obj/item/circuitboard/cryopodcontrol + name = "Circuit board (Cryogenic Oversight Console)" + build_path = /obj/machinery/computer/cryopod + +/obj/machinery/computer/cryopod/contents_explosion() + return + +/obj/machinery/computer/cryopod/contents_explosion() + return //don't blow everyone's shit up. diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index df122c8165..24a0b78037 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -910,11 +910,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb if(usr.client.prefs.enable_tips) var/timedelay = usr.client.prefs.tip_delay/100 usr.client.tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. - // if(usr.client.prefs.itemoutline_pref) - if(istype(L) && L.incapacitated()) - apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now - else - apply_outline() //if the player's alive and well we send the command with no color set, so it uses the theme's color + if(usr.client.prefs.itemoutline_pref) + if(istype(L) && L.incapacitated()) + apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now + else + apply_outline() //if the player's alive and well we send the command with no color set, so it uses the theme's color /obj/item/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params) . = ..() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cb262e57f3..7454b815a0 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -51,6 +51,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/ooccolor = "#c43b23" var/aooccolor = "#ce254f" var/enable_tips = TRUE + var/itemoutline_pref = TRUE var/tip_delay = 500 //tip delay in milliseconds //Antag preferences diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 96ffd09af8..f9beafd8b7 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -416,6 +416,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["hud_toggle_color"] >> hud_toggle_color S["menuoptions"] >> menuoptions S["enable_tips"] >> enable_tips + S["itemoutline_pref"] >> itemoutline_pref S["tip_delay"] >> tip_delay S["pda_style"] >> pda_style S["pda_color"] >> pda_color @@ -591,6 +592,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["hud_toggle_color"], hud_toggle_color) WRITE_FILE(S["menuoptions"], menuoptions) WRITE_FILE(S["enable_tips"], enable_tips) + WRITE_FILE(S["itemoutline_pref"], itemoutline_pref) WRITE_FILE(S["tip_delay"], tip_delay) WRITE_FILE(S["pda_style"], pda_style) WRITE_FILE(S["pda_color"], pda_color) diff --git a/code/modules/client/verbs/etips.dm b/code/modules/client/verbs/etips.dm index d4ebc899ae..ce14bfdc6a 100644 --- a/code/modules/client/verbs/etips.dm +++ b/code/modules/client/verbs/etips.dm @@ -18,3 +18,12 @@ prefs.tip_delay = max(indelay, 0.01) prefs.save_preferences() to_chat(usr, "Tooltip delay set to [indelay] milliseconds.") + +/client/verb/toggle_hover_outline() + set name = "Toggle hover outline" + set desc = "Toggles hover-over item outline" + set category = "Preferences" + + prefs.itemoutline_pref = !prefs.itemoutline_pref + prefs.save_preferences() + to_chat(usr, "Item outline [prefs.itemoutline_pref ? "en" : "dis"]abled.") diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 3e29c8bff4..94ce7d2ccb 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -468,7 +468,7 @@ const VoreUserPreferences = (props, context) => { + (allowmobvore ? "Click here to prevent being eaten by mobs." : "Click here to allow being eaten by mobs.")} - tooltipPosition="bottom-right" + tooltipPosition="bottom-start" content={allowmobvore ? "Mobs eating you allowed" : "No Mobs eating you"} /> @@ -491,7 +491,7 @@ const VoreUserPreferences = (props, context) => { fluid tooltip={"This button is for those who don't like being digested. It can make you undigestable." + (digestable ? " Click here to prevent digestion." : " Click here to allow digestion.")} - tooltipPosition="bottom-right" + tooltipPosition="bottom-start" content={digestable ? "Digestion Allowed" : "No Digestion"} /> @@ -538,7 +538,7 @@ const VoreUserPreferences = (props, context) => { + (lickable ? "Click here to turn off being able to be licked." : "Click here to turn on being able to be licked.")} - tooltipPosition="bottom-right" + tooltipPosition="bottom-start" content={lickable ? "Lickable" : "Unlickable"} />