Werner baa9c475c1 Merge branch 'upstream-master' into development-upstream ...

# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm

2017-10-07 15:13:33 +02:00

..

__defines

Xenomorphs fixes and improvements (#3548)

2017-10-07 13:10:18 +03:00

_helpers

Fixes to getFlatIcon and more. (#3353)

2017-09-19 15:43:01 +03:00

_onclick

Better stamina meter (#3551)

2017-10-07 13:11:43 +03:00

ATMOSPHERICS

Fixes(3557, 3560) (#3563)

2017-10-07 13:08:00 +03:00

controllers

Adds the sarlaccs and some golden slime fixes (#3533)

2017-10-07 13:15:34 +03:00

datums

More stats (#3562)

2017-10-06 19:39:15 +02:00

defines

makes N2O an oxidizer. (#3569)

2017-10-07 12:42:49 +02:00

game

Merge branch 'upstream-master' into development-upstream

2017-10-07 15:13:33 +02:00

js

…

modules

Merge branch 'upstream-master' into development-upstream

2017-10-07 15:13:33 +02:00

unit_tests

DEvent, Mk II (#3241)

2017-09-06 18:08:44 +02:00

ZAS

More ZAS performance stuff (#3186)

2017-09-14 21:19:07 +03:00

global.dm

Bug fixes (#3493, #3428, #3444) (#3494)

2017-09-25 10:59:52 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

Adds the Ya'ssa language (#3547)

2017-10-04 19:23:35 +02:00

world.dm

…