testing fix for nui resources

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
fixes #6299

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #6709 from Mloc/bs12-server

testing fix for nui resources
Merge pull request #6707 from Mloc/bs12-overflow

fixes #6299
fix an issue with ZAS geometry not re-forming

Signed-off-by: Mloc <colmohici@gmail.com>
Prevent stacks multiplier href exploit
Merge pull request #6712 from Mloc/bs12-overflow

fix an issue with ZAS geometry not re-forming
Merge pull request #6715 from Menshin/stacks_href_exploit_fix

Prevent stacks multiplier href exploit
Ambiguous expression readded.
Who thought it was a good idea to omit multiplier for 1x ?!?
Merge pull request #6717 from Menshin/ambiguous_expression_fix

Fixes being unable to craft 1x multiplier items from stacks
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi