Skip to content

Botany Bags' Hotkeys Fix #29248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+8 −3
Open

Botany Bags' Hotkeys Fix #29248

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5383cf1
Update bags.dm
ostrkrs May 7, 2025
6248e9a
Merge branch 'master' into SeedSortingTrayFix
ostrkrs May 9, 2025
26565e9
Merge branch 'master' into SeedSortingTrayFix
ostrkrs May 14, 2025
415a688
Merge branch 'master' into SeedSortingTrayFix
ostrkrs May 17, 2025
aaeb6e4
Merge branch 'master' into SeedSortingTrayFix
ostrkrs May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions code/game/objects/items/weapons/storage/bags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
/obj/item/storage/bag/plants/portaseeder/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "<span class='notice'>You can <b>Alt-Shift-Click</b> to convert the plants inside to seeds.</span>"
. += "<span class='notice'>You can <b>Ctrl-Shift-Click</b> to convert the plants inside to seeds.</span>"

/obj/item/storage/bag/plants/portaseeder/proc/process_plants(mob/user)
if(!length(contents))
Expand All @@ -291,7 +291,7 @@
to_chat(user, "<span class='warning'>[src] whirrs a bit but stops. Doesn't seem like it could convert anything inside.</span>")
playsound(user, "sound/machines/ding.ogg", 25)

/obj/item/storage/bag/plants/portaseeder/AltShiftClick(mob/user)
/obj/item/storage/bag/plants/portaseeder/CtrlShiftClick(mob/user)
if(Adjacent(user) && ishuman(user) && !user.incapacitated(FALSE, TRUE))
process_plants(user)

Expand All @@ -304,14 +304,19 @@
/obj/item/seeds,
/obj/item/unsorted_seeds)

/obj/item/storage/bag/plants/seed_sorting_tray/attack_self__legacy__attackchain(mob/user)
/obj/item/storage/bag/plants/seed_sorting_tray/CtrlShiftClick(mob/user)
var/depth = 0
for(var/obj/item/unsorted_seeds/unsorted in src)
if(!do_after(user, 1 SECONDS, TRUE, src, must_be_held = TRUE))
break
depth = min(8, depth + 1)
unsorted.sort(depth)

/obj/item/storage/bag/plants/seed_sorting_tray/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "<span class='notice'>You can <b>Ctrl-Shift-Click</b> to sort seeds inside.</span>"

////////////////////////////////////////
// MARK: Cash bag
////////////////////////////////////////
Expand Down