Nick 8ef7eea4fa Merge branch 'master' into bunnypack

2018-02-09 07:10:12 +01:00

..

__DEFINES

RESETS AGE_MIN TO 18

2018-02-08 13:56:38 -05:00

__HELPERS

Fixes callbacks and invoke time args failing when pushUsr was used (#35395)

2018-02-07 12:38:36 -06:00

_globalvars

Update genetics.dm

2018-02-08 20:27:46 -05:00

_js

…

_onclick

Squashes silicon HUDs together (#35212)

2018-02-07 02:32:14 -06:00

citadel

Merge branch 'master' into bunnypack

2018-02-09 07:10:12 +01:00

controllers

Atom initialization counter only shows up in TESTING mode (#35428)

2018-02-08 16:12:53 -06:00

datums

Fixes geiger counters on engiborgs (#35423)

2018-02-08 11:21:27 -06:00

game

Fixes geiger counters on engiborgs (#35423)

2018-02-08 11:21:27 -06:00

modules

Merge pull request #5379 from Citadel-Station-13/upstream-merge-35426

2018-02-09 03:01:08 +00:00

_compile_options.dm

Low memory mode

2018-01-19 09:12:37 -06:00

world.dm

…