Jordan Brown bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions ...

Fixed chemical recipe conflicts

2018-02-10 11:04:34 -06: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 pull request #5323 from Raeschen/Raes_miscreanttweak

2018-02-09 07:47:09 -06:00

controllers

Fixes map configuration values for nonexistent maps applying to box

2018-02-09 18:13:12 -06:00

datums

Fixes geiger counters on engiborgs (#35423)

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

game

Fixes limbgrower having max volume of 0 (#35491)

2018-02-10 09:56:56 -06:00

modules

Merge pull request #35479 from Cruix/chem_collisions

2018-02-10 11:04:34 -06:00

_compile_options.dm

…

world.dm

…