From 3d06ada1778bc41772852773bedfe9f14dc2fd77 Mon Sep 17 00:00:00 2001 From: SyndiCat <134767881+syndicatecat@users.noreply.github.com> Date: Sat, 21 Sep 2024 22:36:12 +0500 Subject: [PATCH 1/5] qol: toggle item tips (#5909) * item tips * fix * Update * fiiiix * fiiiix * dots --- code/__DEFINES/preferences.dm | 17 +++++++++-------- code/game/objects/items.dm | 15 ++++++++------- .../client/preference/preferences_toggles.dm | 10 ++++++++++ 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 9804d4bae56..01a0dbd5f88 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -58,16 +58,17 @@ #define PREFTOGGLE_2_MC_TAB (1<<11) // 2048 #define PREFTOGGLE_2_DISABLE_TGUI_INPUT (1<<12) // 4096 #define PREFTOGGLE_2_PARALLAX_MULTIZ (1<<13) // 8192 -#define PREFTOGGLE_2_DISABLE_VOTE_POPUPS (1<<14) // 16384 -#define PREFTOGGLE_2_SWAP_INPUT_BUTTONS (1<<15) // 32768 -#define PREFTOGGLE_2_LARGE_INPUT_BUTTONS (1<<16) // 65536 -#define PREFTOGGLE_2_BIG_STRIP_MENU (1<<17) // 131072 -#define PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE (1<<18) // 262144 -#define PREFTOGGLE_2_PIXELATED_MENU (1<<19) // 524288 +#define PREFTOGGLE_2_DISABLE_VOTE_POPUPS (1<<14) // 16384 +#define PREFTOGGLE_2_SWAP_INPUT_BUTTONS (1<<15) // 32768 +#define PREFTOGGLE_2_LARGE_INPUT_BUTTONS (1<<16) // 65536 +#define PREFTOGGLE_2_BIG_STRIP_MENU (1<<17) // 131072 +#define PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE (1<<18) // 262144 +#define PREFTOGGLE_2_PIXELATED_MENU (1<<19) // 524288 +#define PREFTOGGLE_2_DESC_TIPS (1<<20) // 1048576 -#define TOGGLES_2_TOTAL 1048575 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. +#define TOGGLES_2_TOTAL 2097151 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. -#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_PARALLAX_MULTIZ|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS) +#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_PARALLAX_MULTIZ|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS|PREFTOGGLE_2_DESC_TIPS) // Sanity checks #if TOGGLES_TOTAL > 16777215 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 67b56460f0b..fa6fcfcf307 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1001,18 +1001,19 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g /obj/item/MouseEntered(location, control, params) if(item_flags & (IN_INVENTORY|IN_STORAGE)) - var/timedelay = 8 - var/mob/user = usr - tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), timedelay, TIMER_STOPPABLE) + var/mob/living/user = usr + if(user.client.prefs.toggles2 & PREFTOGGLE_2_DESC_TIPS) + var/timedelay = 8 + tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), timedelay, TIMER_STOPPABLE) + if(QDELETED(src)) return - var/mob/living/L = user if(!(user.client.prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES)) return - if(istype(L) && L.incapacitated()) - apply_outline(L, 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 + if(istype(user) && user.incapacitated()) + apply_outline(user, 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(L) //if the player's alive and well we send the command with no color set, so it uses the theme's color + apply_outline(user) //if the player's alive and well we send the command with no color set, so it uses the theme's color /obj/item/MouseExited() diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index e084dd0a46f..a17aa806114 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -580,3 +580,13 @@ enable_message = "You will see full-size TGUI strip menu." disable_message = "You will see minuature TGUI strip menu." blackbox_message = "Toggle TGUI strip menu size" + +/datum/preference_toggle/toggle_item_descritpion_tips + name = "Toggle item description tips" + description = "Toggles item description tips on hover." + preftoggle_bitflag = PREFTOGGLE_2_DESC_TIPS + preftoggle_toggle = PREFTOGGLE_TOGGLE2 + preftoggle_category = PREFTOGGLE_CATEGORY_LIVING + enable_message = "You will see item description tips now." + disable_message = "You will not see item description tips now." + blackbox_message = "Toggle item description tips on hover" From 50a41363cb0933cae61507f48182748a4a083cf9 Mon Sep 17 00:00:00 2001 From: Valtor <156955117+Samirakis@users.noreply.github.com> Date: Sat, 21 Sep 2024 20:46:17 +0300 Subject: [PATCH 2/5] bugfix: deepfryer is now working (#5919) fix --- code/modules/food_and_drinks/kitchen_machinery/cooker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm index c928ff53211..44f487107c8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm @@ -138,12 +138,12 @@ if(!putIn(I, user)) return ATTACK_CHAIN_PROCEED - addtimer(CALLBACK(src, PROC_REF(cooking_end), I, user)) + addtimer(CALLBACK(src, PROC_REF(cooking_end), I, user), cooktime) return ATTACK_CHAIN_BLOCKED_ALL /obj/machinery/cooker/proc/cooking_end(obj/item/cooking, mob/cook) - if(!QDELETED(cooking) || cooking.loc != src) + if(QDELETED(cooking) || cooking.loc != src) return //New interaction to allow special foods to be made/cooked via deepfryer without removing original functionality //Define the foods/results on the specific machine --FalseIncarnate From 6e7e8e00051a840d2120b1c1c9b51e97448688de Mon Sep 17 00:00:00 2001 From: Valtor <156955117+Samirakis@users.noreply.github.com> Date: Sat, 21 Sep 2024 21:11:14 +0300 Subject: [PATCH 3/5] bugfix: no cyborg wheelchairs (#5925) no cyborg wheelchairs --- code/controllers/subsystem/jobs.dm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 0f655524f88..eefa6194c7d 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -544,18 +544,16 @@ SUBSYSTEM_DEF(jobs) G.upgrade_prescription() H.update_nearsighted_effects() - // Wheelchair necessary? - var/obj/item/organ/external/l_foot = H.get_organ(BODY_ZONE_PRECISE_L_FOOT) - var/obj/item/organ/external/r_foot = H.get_organ(BODY_ZONE_PRECISE_R_FOOT) - if(!l_foot && !r_foot || (H.client.prefs.disabilities & DISABILITY_FLAG_PARAPLEGIA) && !(H.dna.species.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA)) - var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(H.loc) - W.buckle_mob(H, TRUE) + if(!issilicon(H)) + // Wheelchair necessary? + var/obj/item/organ/external/l_foot = H.get_organ(BODY_ZONE_PRECISE_L_FOOT) + var/obj/item/organ/external/r_foot = H.get_organ(BODY_ZONE_PRECISE_R_FOOT) + if(!l_foot && !r_foot || (H.client.prefs.disabilities & DISABILITY_FLAG_PARAPLEGIA) && !(H.dna.species.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA)) + var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(H.loc) + W.buckle_mob(H, TRUE) return H - - - /datum/controller/subsystem/jobs/proc/LoadJobsFile(jobsfile, highpop) //ran during round setup, reads info from jobs.txt -- Urist if(!CONFIG_GET(flag/load_jobs_from_txt)) return From dcb95310389e9627d9fdb63ed7a68ad8ec04b5e2 Mon Sep 17 00:00:00 2001 From: L343-CJ <182340435+L343-CJ@users.noreply.github.com> Date: Sun, 22 Sep 2024 00:19:09 +0300 Subject: [PATCH 4/5] bugfix: fixed the interaction of the holotool with the mechs (#5929) * fixed the interaction of the holotool with the mechs * holotool * Update code/game/mecha/mecha_construction_paths.dm * holotool v2 --------- Co-authored-by: CJ8692 Co-authored-by: Den109G <87372121+Den109G@users.noreply.github.com> --- code/game/mecha/mecha_construction_paths.dm | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 1033f99be14..f71553b6061 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -105,7 +105,7 @@ list("key"=/obj/item/stack/sheet/metal, "backkey"=TOOL_SCREWDRIVER, "desc"="Peripherals control module is secured."), - //7 + //7 list("key"=TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Peripherals control module is installed."), @@ -122,7 +122,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //11 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //12 @@ -346,7 +346,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //18 @@ -601,7 +601,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //12 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //13 @@ -979,7 +979,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //18 @@ -1220,7 +1220,7 @@ "desc"="The bluespace crystal is engaged."), //8 list("key" = TOOL_SCREWDRIVER, - "backkey"=/obj/item/wirecutters, + "backkey"=TOOL_WIRECUTTER, "desc"="The bluespace crystal is connected."), //9 list("key" = /obj/item/stack/cable_coil, @@ -1271,7 +1271,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //21 - list("key" = /obj/item/wirecutters, + list("key" = TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //22 @@ -1549,7 +1549,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //11 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //12 @@ -1754,7 +1754,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //11 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //12 @@ -1980,7 +1980,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //18 @@ -2255,7 +2255,7 @@ "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/wirecutters, + list("key"=TOOL_WIRECUTTER, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //18 From e4c619bdb50aa243bcb5c59ede9b5a4befed52a7 Mon Sep 17 00:00:00 2001 From: Sheya Date: Sun, 22 Sep 2024 07:09:44 +0300 Subject: [PATCH 5/5] tweak: cyber heart stamina regen (#5927) heart --- code/modules/surgery/organs/heart.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 509078ae669..999b0d2e5af 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -214,7 +214,7 @@ owner.AdjustStunned(-2 SECONDS * boost) owner.AdjustWeakened(-2 SECONDS * boost) owner.SetSleeping(0) - owner.adjustStaminaLoss(-1 * boost) + owner.adjustStaminaLoss(-7 * boost) /obj/item/organ/internal/heart/cybernetic/upgraded/proc/message_to_owner(mob/M, message)