This commit is contained in:
LetterN
2021-11-10 10:33:15 +08:00
parent ff71b7602f
commit 9a24f89780
6 changed files with 31 additions and 10 deletions
+11 -2
View File
@@ -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.
+5 -5
View File
@@ -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)
. = ..()
+1
View File
@@ -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
@@ -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)
+9
View File
@@ -18,3 +18,12 @@
prefs.tip_delay = max(indelay, 0.01)
prefs.save_preferences()
to_chat(usr, "<span class='danger'>Tooltip delay set to [indelay] milliseconds.</span>")
/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, "<span class='danger'>Item outline [prefs.itemoutline_pref ? "en" : "dis"]abled.</span>")