John Ginnane ac1b2f76ef Fixed alt-click not working with stacks (#34396) ...

* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()

2018-01-14 22:05:07 -06:00

..

__DATASTRUCTURES

Add /datum prefix to custom root types (#34294)

2018-01-11 21:28:02 -06:00

__DEFINES

Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276

2018-01-14 03:12:31 -06:00

__HELPERS

Replaces cached get_area vars for names (#34338)

2018-01-13 20:56:11 -06:00

_globalvars

Merge pull request #33958 from XDTM/Morpheus

2018-01-13 04:21:50 -06:00

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Replaces cached get_area vars for names (#34338)

2018-01-13 20:56:11 -06:00

citadel

donate fix

2018-01-12 20:05:50 -06:00

controllers

Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123)

2018-01-14 13:39:01 -06:00

datums

Merge pull request #34407 from optimumtact/anturredtextsmyevent

2018-01-13 23:21:46 -06:00

game

Fixed alt-click not working with stacks (#34396)

2018-01-14 22:05:07 -06:00

modules

Fixed alt-click not working with stacks (#34396)

2018-01-14 22:05:07 -06:00

_compile_options.dm

…

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00