John Ginnane 6720fc3713 Newly crafted stacks are merged with held stacks of the same type (#33971) ...

* Merge newly crafted stacks with held stacks

* Update code

2018-01-07 20:28:46 -06:00

..

__DATASTRUCTURES

…

__DEFINES

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

__HELPERS

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

_globalvars

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574

2018-01-01 14:14:06 -06:00

_js

…

_onclick

Update adjacent.dm

2018-01-05 17:25:41 -05:00

citadel

woo

2018-01-01 07:30:50 -06:00

controllers

Adds more observation messages in deadchat (#34075)

2018-01-04 15:16:58 -06:00

datums

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

game

Merge pull request #4692 from Citadel-Station-13/upstream-merge-34140

2018-01-07 20:39:29 +00:00

modules

Newly crafted stacks are merged with held stacks of the same type (#33971)

2018-01-07 20:28:46 -06:00

_compile_options.dm

…

world.dm

…