deathride58 571ad489d4 Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479 ...

[MIRROR] Fixed chemical recipe conflicts

2018-02-11 00:50:15 +00:00

..

__DEFINES

RESETS AGE_MIN TO 18

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

__HELPERS

Fix a runtime if someone is deleted on the arrivals shuttle (#35459)

2018-02-10 10:28:18 -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

Removes runlevels spec from SSoverlays (#35455)

2018-02-10 11:02:20 -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

…