diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index a78efc94af2..77d21deaf86 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -216,12 +216,14 @@ A.CtrlClick(src) return /atom/proc/CtrlClick(var/mob/user) + user.stop_pulling() return /atom/movable/CtrlClick(var/mob/user) if(Adjacent(user)) user.start_pulling(src) + /* Alt click Unused except for AI diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 4eae508a7ec..0f0158c00f8 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -79,6 +79,15 @@ icon_state = "evidenceobj" return +obj/item/weapon/evidencebag/attackby(obj/item/weapon/W as obj, mob/living/user as mob) + if(istype(W, /obj/item/weapon/pen)) + var/new_label = sanitize(trim(input("What should the new label be", "") as null|text)) + if(new_label) + name = "bag ([new_label])" + user << "\blue You write on the label of the bag." + else + ..(W, user) + /obj/item/weapon/storage/box/evidence name = "evidence bag box" desc = "A box claiming to contain evidence bags." diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index d59f695faac..8a27684dc34 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -84,7 +84,7 @@ /obj/structure/bookcase/attack_hand(var/mob/user as mob) if(contents.len) - var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") in contents as obj|null + var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") as null|obj in contents if(choice) if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) return @@ -322,4 +322,4 @@ user << "Computer has been associated with this unit." else user << "No associated computer found. Only local scans will function properly." - user << "\n" \ No newline at end of file + user << "\n" diff --git a/html/changelogs/angeliteentyshak_baglabel.yml b/html/changelogs/angeliteentyshak_baglabel.yml new file mode 100644 index 00000000000..ffb742c3d2e --- /dev/null +++ b/html/changelogs/angeliteentyshak_baglabel.yml @@ -0,0 +1,9 @@ +author: Angelite Entyshak + + delete-after: True + + changes: + - tweak: You can now label evidence and sample bags with a pen. + - bugfix: Dialogue for library shelves now have a cancel button. + - bugfix: Kinda fixed Ctrl + Clicking for releasing a pulled object, it behaves slightly differently now. Ctrl + click something unmovable (the floor) or something out of range to stop pulling the object. +