From deaac3647910b3ae92983d06d03950050e5f4588 Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Thu, 12 May 2016 19:19:28 -0400 Subject: [PATCH 1/2] Clicking a stack no longer transfers one sheet at a time. --- code/game/objects/items/stacks/stack.dm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 83ce6d3f49..ee1cc1b078 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -298,14 +298,16 @@ /obj/item/stack/attack_hand(mob/user as mob) if (user.get_inactive_hand() == src) - var/obj/item/stack/F = src.split(1) - if (F) - user.put_in_hands(F) - src.add_fingerprint(user) - F.add_fingerprint(user) - spawn(0) - if (src && usr.machine==src) - src.interact(usr) + var/N = input("How many stacks of [src] would you like to split off?", "Split stacks", 1) as num|null + if(N) + var/obj/item/stack/F = src.split(N) + if (F) + user.put_in_hands(F) + src.add_fingerprint(user) + F.add_fingerprint(user) + spawn(0) + if (src && usr.machine==src) + src.interact(usr) else ..() return @@ -313,10 +315,7 @@ /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/stack)) var/obj/item/stack/S = W - if (user.get_inactive_hand()==src) - src.transfer_to(S, 1) - else - src.transfer_to(S) + src.transfer_to(S) spawn(0) //give the stacks a chance to delete themselves if necessary if (S && usr.machine==S) From 91e34344bce2a16262dee4451e5c6bd406461a70 Mon Sep 17 00:00:00 2001 From: Patch Date: Mon, 27 Jun 2016 13:09:51 -0500 Subject: [PATCH 2/2] Added a changelog for stack update. --- html/changelogs/Aztectornado_Stack.yml | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Aztectornado_Stack.yml diff --git a/html/changelogs/Aztectornado_Stack.yml b/html/changelogs/Aztectornado_Stack.yml new file mode 100644 index 0000000000..1a1db85656 --- /dev/null +++ b/html/changelogs/Aztectornado_Stack.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Aztectornado + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Clicking a stack of sheets (Metal, phoron...) in your other hand now asks how many you want to split off the stack, courtesy of Baycode"